summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2014-02-16 11:44:42 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2014-02-16 11:44:42 -0600
commit919cc741df53b968e9253dd4fbb9bec8e67be10b (patch)
treedbc13f19084ee7757a858f662266e3195b0608c9
parent3dfd149abc593e20f91e0ba1d0a7236a2a450dbf (diff)
downloadk3b-919cc741df53b968e9253dd4fbb9bec8e67be10b.tar.gz
k3b-919cc741df53b968e9253dd4fbb9bec8e67be10b.zip
Fix unintended renaming
-rw-r--r--libk3b/videodvd/k3bvideodvdaudiostream.h4
-rw-r--r--libk3bdevice/k3bdevicemanager.cpp4
-rw-r--r--libk3bdevice/k3bscsicommand_bsd.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/libk3b/videodvd/k3bvideodvdaudiostream.h b/libk3b/videodvd/k3bvideodvdaudiostream.h
index 87d8831..3ce7851 100644
--- a/libk3b/videodvd/k3bvideodvdaudiostream.h
+++ b/libk3b/videodvd/k3bvideodvdaudiostream.h
@@ -43,8 +43,8 @@ namespace K3bVideoDVD
};
enum AudioSampleFrequency {
- AUDIO_SAMPLE_FRETQ_48HZ = 0,
- AUDIO_SAMPLE_FRETQ_96HZ = 1
+ AUDIO_SAMPLE_FREQ_48HZ = 0,
+ AUDIO_SAMPLE_FREQ_96HZ = 1
};
enum AudioCodeExtension {
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index 3677f67..611dbb4 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -380,7 +380,7 @@ void K3bDevice::DeviceManager::BSDDeviceScan()
break;
}
- if ((ccb.ccb_h.status != CAM_RETQ_CMP)
+ if ((ccb.ccb_h.status != CAM_REQ_CMP)
|| ((ccb.cdm.status != CAM_DEV_MATCH_LAST) && (ccb.cdm.status != CAM_DEV_MATCH_MORE))) {
k3bDebug() << "(BSDDeviceScan) got CAM error " << ccb.ccb_h.status << ", CDM error %d" << ccb.cdm.status << endl;
break;
@@ -454,7 +454,7 @@ void K3bDevice::DeviceManager::BSDDeviceScan()
}
}
- } while ((ccb.ccb_h.status == CAM_RETQ_CMP)
+ } while ((ccb.ccb_h.status == CAM_REQ_CMP)
&& (ccb.cdm.status == CAM_DEV_MATCH_MORE));
if (need_close)
diff --git a/libk3bdevice/k3bscsicommand_bsd.cpp b/libk3bdevice/k3bscsicommand_bsd.cpp
index eb7f3a3..a346f4b 100644
--- a/libk3bdevice/k3bscsicommand_bsd.cpp
+++ b/libk3bdevice/k3bscsicommand_bsd.cpp
@@ -118,7 +118,7 @@ int K3bDevice::ScsiCommand::transport( TransportDirection dir,
return result ? result : ret;
}
- else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_RETQ_CMP) {
+ else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
if( needToClose )
m_device->close();
m_device->usageUnlock();
@@ -165,7 +165,7 @@ int K3bDevice::ScsiCommand::transport( TransportDirection dir,
return -1;
}
- if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_RETQ_CMP)
+ if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_REQ_CMP)
{
k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (3): " << ret << endl;
errno=EIO,-1;