diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index fde16737a2..89f297187a 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -139,23 +139,13 @@ void Audio::audioMixerKilled() { QAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) { QAudioDeviceInfo result; -// Temporarily enable audio device selection in Windows again to test how it behaves now -//#ifdef WIN32 -#if FALSE - // NOTE - // this is a workaround for a windows only QtBug https://bugreports.qt-project.org/browse/QTBUG-16117 - // static QAudioDeviceInfo objects get deallocated when QList objects go out of scope - result = (mode == QAudio::AudioInput) ? - QAudioDeviceInfo::defaultInputDevice() : - QAudioDeviceInfo::defaultOutputDevice(); -#else foreach(QAudioDeviceInfo audioDevice, QAudioDeviceInfo::availableDevices(mode)) { if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) { result = audioDevice; break; } } -#endif + return result; }