From 6e8267999754d846aa446c4c4807a6416695071d Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 2 Feb 2015 11:19:11 -0800
Subject: [PATCH] Permanently re-enable audio selection on Windows

---
 interface/src/Audio.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 2bc5aa5023..6dd9b7985c 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -134,23 +134,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<QAudioDevieInfo> 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;
 }