coreaudio: correctly clear MIDI port buffers

[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 c50911221ee87fc0174befa406fde104450f7aa2..7c2d0fe19694a73783e19ce26070a49503b01fac 100644 (file)
--- a/libs/backends/coreaudio/coreaudio_pcmio_aggregate.cc
+++ b/libs/backends/coreaudio/coreaudio_pcmio_aggregate.cc
@@ -183,12 +183,10 @@ CoreAudioPCM::create_aggregate_device (
        CFDictionaryAddValue(aggDeviceDict, CFSTR(kAudioAggregateDeviceNameKey), AggregateDeviceNameRef);
        CFDictionaryAddValue(aggDeviceDict, CFSTR(kAudioAggregateDeviceUIDKey), AggregateDeviceUIDRef);
 
-#ifndef NDEBUG
        // hide from list
        int value = 1;
        CFNumberRef AggregateDeviceNumberRef = CFNumberCreate(NULL, kCFNumberIntType, &value);
        CFDictionaryAddValue(aggDeviceDict, CFSTR(kAudioAggregateDeviceIsPrivateKey), AggregateDeviceNumberRef);
-#endif
 
        //-------------------------------------------------
        // Create a CFMutableArray for our sub-device list
@@ -228,16 +226,16 @@ CoreAudioPCM::create_aggregate_device (
        UInt32 outDataSize = 0;
 
        err = AudioObjectGetPropertyDataSize(_aggregate_plugin_id, &pluginAOPA, 0, NULL, &outDataSize);
-#ifdef WE_DONT_CARE_ABOUT_SOME_ODD_MAVERICKS_I386_ODDITITY
        if (err != noErr) {
-               fprintf(stderr, "AggregateDevice: AudioObjectGetPropertyDataSize error %d\n", err);
+               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;
        }
-#endif
 
        err = AudioObjectGetPropertyData(_aggregate_plugin_id, &pluginAOPA, sizeof(aggDeviceDict), &aggDeviceDict, &outDataSize, created_device);
        if (err != noErr) {
-               fprintf(stderr, "AggregateDevice: AudioObjectGetPropertyData error %d\n", (int) err);
+               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;
        }
 
@@ -337,10 +335,8 @@ CoreAudioPCM::create_aggregate_device (
        // Clean up
        //----------
 
-#ifndef NDEBUG
        // release the private AD key
        CFRelease(AggregateDeviceNumberRef);
-#endif
 
        // release the CF objects we have created - we don't need them any more
        CFRelease(aggDeviceDict);