diff --git a/common/JackDriverLoader.cpp b/common/JackDriverLoader.cpp index 2fbd3b29..bf4fde94 100644 --- a/common/JackDriverLoader.cpp +++ b/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; diff --git a/macosx/coreaudio/JackCoreAudioAdapter.cpp b/macosx/coreaudio/JackCoreAudioAdapter.cpp index 47b4ac57..b0ff171d 100644 --- a/macosx/coreaudio/JackCoreAudioAdapter.cpp +++ b/macosx/coreaudio/JackCoreAudioAdapter.cpp @@ -1466,7 +1466,7 @@ OSStatus JackCoreAudioAdapter::CreateAggregateDeviceAux(vector 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); diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp index 95b00e94..f6bc5f0d 100644 --- a/macosx/coreaudio/JackCoreAudioDriver.cpp +++ b/macosx/coreaudio/JackCoreAudioDriver.cpp @@ -1149,7 +1149,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector 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);