diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-02-20 13:21:44 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-02-20 13:21:44 -0500 |
commit | dcf69ab3e6795604c17bd8a21cebecfe4448df20 (patch) | |
tree | 8a3828caaa3e9dbcdb40def2afc35d824d0fdedf /libs | |
parent | d5e375f7847b580d06a28f688f5d919d82bab16d (diff) |
fix erroneous merge for wavesaudio backend
Diffstat (limited to 'libs')
-rw-r--r-- | libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp index e12bba3370..347cf6d483 100644 --- a/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp +++ b/libs/backends/wavesaudio/wavesapi/devicemanager/WCMRCoreAudioDeviceManager.cpp @@ -266,68 +266,6 @@ WTErr WCMRCoreAudioDevice::UpdateDeviceInfo () return retVal; } -WTErr WCMRCoreAudioDevice::UpdateDeviceId() -{ - //Get device count... - UInt32 propSize = 0; - WTErr retVal = eNoErr; - OSStatus osErr = AudioHardwareGetPropertyInfo (kAudioHardwarePropertyDevices, &propSize, NULL); - ASSERT_ERROR(osErr, "AudioHardwareGetProperty 1"); - if (WUIsError(osErr)) - throw osErr; - - size_t numDevices = propSize / sizeof (AudioDeviceID); - AudioDeviceID* deviceIDs = new AudioDeviceID[numDevices]; - - //retrieve the device IDs - propSize = numDevices * sizeof (AudioDeviceID); - osErr = AudioHardwareGetProperty (kAudioHardwarePropertyDevices, &propSize, deviceIDs); - ASSERT_ERROR(osErr, "Error while getting audio devices: AudioHardwareGetProperty 2"); - if (WUIsError(osErr)) - throw osErr; - - //now add the ones that are not there... - for (size_t deviceIndex = 0; deviceIndex < numDevices; deviceIndex++) - { - DeviceInfo* pDevInfo = 0; - - //Get device name and create new DeviceInfo entry - //Get property name size. - osErr = AudioDeviceGetPropertyInfo(deviceIDs[deviceIndex], 0, 0, kAudioDevicePropertyDeviceName, &propSize, NULL); - if (osErr == kAudioHardwareNoError) - { - //Get property: name. - char* deviceName = new char[propSize]; - osErr = AudioDeviceGetProperty(deviceIDs[deviceIndex], 0, 0, kAudioDevicePropertyDeviceName, &propSize, deviceName); - if (osErr == kAudioHardwareNoError) - { - if ( (m_DeviceName == deviceName) && - (m_DeviceID != deviceIDs[deviceIndex]) ) { - - m_DeviceID = deviceIDs[deviceIndex]; - - m_pMyManager->NotifyClient (WCMRAudioDeviceManagerClient::DeviceDebugInfo, (void *)"Current device has changed it's id."); - } - } - else - { - retVal = eCoreAudioFailed; - DEBUG_MSG("Failed to get device name. Device ID: " << m_DeviceID); - } - - delete [] deviceName; - } - else - { - retVal = eCoreAudioFailed; - DEBUG_MSG("Failed to get device name prop Info. Device ID: " << m_DeviceID); - } - } - - delete [] deviceIDs; - return retVal; -} - //********************************************************************************************** // WCMRCoreAudioDevice::UpdateDeviceName // |