aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2012-11-28 22:54:37 +0100
committerMemphiz <memphis@machzwo.de>2012-11-28 23:03:10 +0100
commit2171b5672b0cff75465c13ed4f9607f126518789 (patch)
treee0cc380c944c85ee2a6227914cdaa82cf7fc4ce4
parent64f2b460aca7d704402db44c8ca3a30444c48051 (diff)
[osx/ios] - save the sinkname instead of the device label to guisettings.xml (somehow we forgot about darwin when that was changed...)
-rw-r--r--xbmc/settings/GUIWindowSettingsCategory.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
index 0090d2e8c6..8b29c4f1f8 100644
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -1954,7 +1954,12 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC
{
CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(pSettingControl->GetID());
#if defined(TARGET_DARWIN)
- g_guiSettings.SetString("audiooutput.audiodevice", pControl->GetCurrentLabel());
+ // save the sinkname - since we don't have sinks on osx
+ // we need to get the fitting sinkname for the device label from the
+ // factory
+ std::string label2sink = pControl->GetCurrentLabel();
+ CAEFactory::VerifyOutputDevice(label2sink, false);
+ g_guiSettings.SetString("audiooutput.audiodevice", label2sink.c_str());
#else
g_guiSettings.SetString("audiooutput.audiodevice", m_AnalogAudioSinkMap[pControl->GetCurrentLabel()]);
#endif