replace "None" with DeviceNone in ALSA/Coreaudio

[ardour.git] / libs / backends / coreaudio / coreaudio_pcmio_aggregate.cc

diff --git a/libs/backends/coreaudio/coreaudio_pcmio_aggregate.cc b/libs/backends/coreaudio/coreaudio_pcmio_aggregate.cc
index 84e373206eb08ff87787851369397aba84780900..7c2d0fe19694a73783e19ce26070a49503b01fac 100644 (file)
--- a/libs/backends/coreaudio/coreaudio_pcmio_aggregate.cc
+++ b/libs/backends/coreaudio/coreaudio_pcmio_aggregate.cc
@@ -32,7 +32,7 @@ CoreAudioPCM::destroy_aggregate_device ()
        property_address.mSelector = kAudioPlugInDestroyAggregateDevice;
        property_address.mScope = kAudioObjectPropertyScopeGlobal;
        property_address.mElement = kAudioObjectPropertyElementMaster;
-       UInt32 outDataSize;
+       UInt32 outDataSize = 0;
 
        err = AudioObjectGetPropertyDataSize(_aggregate_plugin_id, &property_address, 0, NULL, &outDataSize);
        if (err != noErr) {
@@ -223,17 +223,19 @@ CoreAudioPCM::create_aggregate_device (
        pluginAOPA.mSelector = kAudioPlugInCreateAggregateDevice;
        pluginAOPA.mScope = kAudioObjectPropertyScopeGlobal;
        pluginAOPA.mElement = kAudioObjectPropertyElementMaster;
-       UInt32 outDataSize;
+       UInt32 outDataSize = 0;
 
        err = AudioObjectGetPropertyDataSize(_aggregate_plugin_id, &pluginAOPA, 0, NULL, &outDataSize);
        if (err != noErr) {
-               fprintf(stderr, "AggregateDevice: AudioObjectGetPropertyDataSize error\n");
+               char *rv = (char*)&err;
+               fprintf(stderr, "AggregateDevice: AudioObjectGetPropertyDataSize error '%c%c%c%c' 0x%08x\n", rv[0], rv[1], rv[2], rv[3], err);
                goto error;
        }
 
        err = AudioObjectGetPropertyData(_aggregate_plugin_id, &pluginAOPA, sizeof(aggDeviceDict), &aggDeviceDict, &outDataSize, created_device);
        if (err != noErr) {
-               fprintf(stderr, "AggregateDevice: AudioObjectGetPropertyData error\n");
+               char *rv = (char*)&err;
+               fprintf(stderr, "AggregateDevice: AudioObjectGetPropertyData error '%c%c%c%c' 0x%08x\n", rv[0], rv[1], rv[2], rv[3], err);
                goto error;
        }