[WIN32] changed: use the new settings system instead of hardcoded values.

diff --git a/system/settings/win32.xml b/system/settings/win32.xml
index 76bc2bf..1e0a97b 100644 (file)
--- a/system/settings/win32.xml
+++ b/system/settings/win32.xml
@@ -39,5 +39,33 @@
         </setting>
       </group>
     </category>
+    <category id="audiooutput" label="772" help="36360">
+      <group id="2">
+        <setting id="audiooutput.audiodevice" type="string" label="545" help="36371">
+          <level>2</level>
+          <default>WASAPI:default</default> <!-- will be properly set on startup -->
+          <constraints>
+            <options>audiodevices</options>
+          </constraints>
+          <control type="spinner" format="string" />
+        </setting>
+        <setting id="audiooutput.passthroughdevice" type="string" label="546" help="36372">
+          <level>2</level>
+          <default>WASAPI:default</default> <!-- will be properly set on startup -->
+          <constraints>
+            <options>audiodevicespassthrough</options>
+          </constraints>
+          <dependencies>
+            <dependency type="enable">
+              <or>
+                <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 -->
+                <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI -->
+              </or>
+            </dependency>
+          </dependencies>
+          <control type="spinner" format="string" />
+        </setting>
+      </group>
+    </category>
   </section>
 </settings>

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index cbbbcb4..2d6ff7e 100644 (file)
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -645,10 +645,7 @@ void CSettings::InitializeDefaults()
   ((CSettingString*)m_settingsManager->GetSetting("audiooutput.audiodevice"))->SetDefault(defaultAudioDeviceName);
   ((CSettingString*)m_settingsManager->GetSetting("audiooutput.passthroughdevice"))->SetDefault(defaultAudioDeviceName);
   #endif
-#elif defined(TARGET_WINDOWS)
-  ((CSettingString*)m_settingsManager->GetSetting("audiooutput.audiodevice"))->SetDefault(std::string("WASAPI:default"));
-  ((CSettingString*)m_settingsManager->GetSetting("audiooutput.passthroughdevice"))->SetDefault(std::string("WASAPI:default"));
-#else
+#elif !defined(TARGET_WINDOWS)
   ((CSettingString*)m_settingsManager->GetSetting("audiooutput.audiodevice"))->SetDefault(CAEFactory::GetDefaultDevice(false));
   ((CSettingString*)m_settingsManager->GetSetting("audiooutput.passthroughdevice"))->SetDefault(CAEFactory::GetDefaultDevice(true));
 #endif