From 205e5ca74fa7740fe274ca919bdda5e0729c0692 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 27 Dec 2013 10:21:59 +0000 Subject: [PATCH] Fixed a typo in CoreAudio device opening. --- .../juce_audio_devices/native/juce_mac_CoreAudio.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp index 685f8e9c8e..798bd5155c 100644 --- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp +++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp @@ -1827,14 +1827,10 @@ public: const int inputIndex = inputDeviceNames.indexOf (inputDeviceName); const int outputIndex = outputDeviceNames.indexOf (outputDeviceName); - String deviceName (outputDeviceName); - if (deviceName.isEmpty()) - deviceName = inputDeviceName; - - AudioDeviceID inputDeviceID = inputIds [inputIndex]; + AudioDeviceID inputDeviceID = inputIds [inputIndex]; AudioDeviceID outputDeviceID = outputIds [outputIndex]; - if (inputDeviceID == 0 && inputDeviceID == 0) + if (inputDeviceID == 0 && outputDeviceID == 0) return nullptr; if (inputDeviceID == outputDeviceID) @@ -1851,7 +1847,8 @@ public: if (in == nullptr) return out.release(); if (out == nullptr) return in.release(); - ScopedPointer combo (new AudioIODeviceCombiner (deviceName)); + ScopedPointer combo (new AudioIODeviceCombiner (outputDeviceName.isEmpty() ? inputDeviceName + : outputDeviceName)); combo->addDevice (in.release()); combo->addDevice (out.release()); return combo.release();