From 77b767ae5b2f3b77752ffa1343c0b43f59fde9e1 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Fri, 7 Sep 2018 22:51:56 -0700
Subject: [PATCH] Hide autodetect option for audio configuration since it's
 broken on macOS and Linux (and to some extent, Windows)

---
 app/gui/SettingsView.qml              | 8 ++++++--
 app/settings/streamingpreferences.cpp | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml
index 1f979921..fdfc6bd9 100644
--- a/app/gui/SettingsView.qml
+++ b/app/gui/SettingsView.qml
@@ -341,10 +341,14 @@ ScrollView {
                     textRole: "text"
                     model: ListModel {
                         id: audioListModel
-                        ListElement {
+                        // Detection of audio channels only works on Windows
+                        // and even so, it's still unreliable because audio devices
+                        // lie about how many channels they can support. Hide the
+                        // option to autodetect until this is resolved.
+                        /*ListElement {
                             text: "Autodetect"
                             val: StreamingPreferences.AC_AUTO
-                        }
+                        }*/
                         ListElement {
                             text: "Stereo"
                             val: StreamingPreferences.AC_FORCE_STEREO
diff --git a/app/settings/streamingpreferences.cpp b/app/settings/streamingpreferences.cpp
index c153aff7..341ee74b 100644
--- a/app/settings/streamingpreferences.cpp
+++ b/app/settings/streamingpreferences.cpp
@@ -37,7 +37,7 @@ void StreamingPreferences::reload()
     playAudioOnHost = settings.value(SER_HOSTAUDIO, false).toBool();
     multiController = settings.value(SER_MULTICONT, true).toBool();
     audioConfig = static_cast<AudioConfig>(settings.value(SER_AUDIOCFG,
-                                                  static_cast<int>(AudioConfig::AC_AUTO)).toInt());
+                                                  static_cast<int>(AudioConfig::AC_FORCE_STEREO)).toInt());
     videoCodecConfig = static_cast<VideoCodecConfig>(settings.value(SER_VIDEOCFG,
                                                   static_cast<int>(VideoCodecConfig::VCC_AUTO)).toInt());
     videoDecoderSelection = static_cast<VideoDecoderSelection>(settings.value(SER_VIDEODEC,