aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2012-02-16 21:15:08 +0100
committerMemphiz <memphis@machzwo.de>2012-02-16 22:32:07 +0100
commitc6c9ab3e99d6a2da4be89b94c4ef4f77a8cd0c11 (patch)
treec875698a5abbd0489f805a7010773ca7f2870662
parenta82b8be5e91d34193e06f1014371601e308cc05b (diff)
[ios] - add advanced setting bool iosvoumecontrol in the audio section for allowing volume control on ios - defaults to off
-rw-r--r--xbmc/settings/AdvancedSettings.cpp2
-rw-r--r--xbmc/settings/AdvancedSettings.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index d6d65cc332..0988e0a5aa 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -48,6 +48,7 @@ void CAdvancedSettings::Initialize()
m_audioHeadRoom = 0;
m_ac3Gain = 12.0f;
m_audioApplyDrc = true;
+ m_audioIosAllowVolumeControl = false;
m_dvdplayerIgnoreDTSinWAV = false;
//default hold time of 25 ms, this allows a 20 hertz sine to pass undistorted
@@ -367,6 +368,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetString(pElement, "audiohost", m_audioHost);
XMLUtils::GetBoolean(pElement, "applydrc", m_audioApplyDrc);
+ XMLUtils::GetBoolean(pElement, "iosvoumecontrol", m_audioIosAllowVolumeControl);
XMLUtils::GetBoolean(pElement, "dvdplayerignoredtsinwav", m_dvdplayerIgnoreDTSinWAV);
XMLUtils::GetFloat(pElement, "limiterhold", m_limiterHold, 0.0f, 100.0f);
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index 3585e0ef6e..91bb0aa9c2 100644
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -117,6 +117,7 @@ class CAdvancedSettings
float m_videoIgnorePercentAtEnd;
CStdString m_audioHost;
bool m_audioApplyDrc;
+ bool m_audioIosAllowVolumeControl;
bool m_videoVDPAUScaling;
float m_videoNonLinStretchRatio;