Correct CoreAudio devices aggregation code.

common/JackDriverLoader.cpp

@@ -928,7 +928,7 @@ jack_constraint_add_enum(
                 sizeof(jack_driver_param_value_enum_t) * array_size);
         if (possible_value_ptr == NULL)
         {
-            jack_error("calloc() failed to (re)allocate memory for possible values array");
+            jack_error("realloc() failed to (re)allocate memory for possible values array");
             return false;
         }
         constraint_ptr->constraint.enumeration.possible_values_array = possible_value_ptr;

macosx/coreaudio/JackCoreAudioAdapter.cpp

@@ -1466,7 +1466,7 @@ OSStatus JackCoreAudioAdapter::CreateAggregateDeviceAux(vector<AudioDeviceID> ca
     pluginAOPA.mScope = kAudioObjectPropertyScopeGlobal;
     pluginAOPA.mElement = kAudioObjectPropertyElementMaster;
     outDataSize = sizeof(CFStringRef);
-    osErr = AudioObjectSetPropertyData(*outAggregateDevice, &pluginAOPA, 0, NULL, outDataSize, &captureDeviceUID[0]);  // First capture is master...
+    osErr = AudioObjectSetPropertyData(*outAggregateDevice, &pluginAOPA, 0, NULL, outDataSize, &playbackDeviceUID[0]);  // First playback is master...
     if (osErr != noErr) {
         jack_error("JackCoreAudioAdapter::CreateAggregateDevice : AudioObjectSetPropertyData for master device error");
         printError(osErr);

macosx/coreaudio/JackCoreAudioDriver.cpp

@@ -1149,7 +1149,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
     pluginAOPA.mScope = kAudioObjectPropertyScopeGlobal;
     pluginAOPA.mElement = kAudioObjectPropertyElementMaster;
     outDataSize = sizeof(CFStringRef);
-    osErr = AudioObjectSetPropertyData(*outAggregateDevice, &pluginAOPA, 0, NULL, outDataSize, &captureDeviceUID[0]);  // First capture is master...
+    osErr = AudioObjectSetPropertyData(*outAggregateDevice, &pluginAOPA, 0, NULL, outDataSize, &playbackDeviceUID[0]);  // First playback is master...
     if (osErr != noErr) {
         jack_error("CreateAggregateDeviceAux : AudioObjectSetPropertyData for master device error");
         printError(osErr);