diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2020-11-21 14:50:29 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 14:50:29 +1000 |
| commit | 4acc114f8237b5e2c98b992e3be315e622923a6b (patch) | |
| tree | aaa717167ef25f78ec3763618b053d2058788b7b | |
| parent | 3e07a3d59059f9527313df88f8da1df40f1a1791 (diff) | |
| parent | c06c88d003d80b32567145a91e525f0d65c0d042 (diff) | |
Merge pull request #18787 from thexai/clean-up
Remove dead code in CVideoSettings
| -rw-r--r-- | xbmc/cores/VideoSettings.h | 1 | ||||
| -rw-r--r-- | xbmc/settings/MediaSettings.cpp | 1 | ||||
| -rw-r--r-- | xbmc/video/VideoDatabase.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/xbmc/cores/VideoSettings.h b/xbmc/cores/VideoSettings.h index 4e2007a8a6..e0cecda754 100644 --- a/xbmc/cores/VideoSettings.h +++ b/xbmc/cores/VideoSettings.h @@ -101,7 +101,6 @@ public: int m_SubtitleStream; float m_SubtitleDelay; bool m_SubtitleOn; - bool m_SubtitleCached; // not used -> remove from DB float m_Brightness; float m_Contrast; float m_Gamma; diff --git a/xbmc/settings/MediaSettings.cpp b/xbmc/settings/MediaSettings.cpp index 37d653e999..811fee6013 100644 --- a/xbmc/settings/MediaSettings.cpp +++ b/xbmc/settings/MediaSettings.cpp @@ -114,7 +114,6 @@ bool CMediaSettings::Load(const TiXmlNode *settings) m_defaultVideoSettings.m_StereoMode = 0; if (!XMLUtils::GetInt(pElement, "centermixlevel", m_defaultVideoSettings.m_CenterMixLevel)) m_defaultVideoSettings.m_CenterMixLevel = 0; - m_defaultVideoSettings.m_SubtitleCached = false; if (!XMLUtils::GetInt(pElement, "tonemapmethod", m_defaultVideoSettings.m_ToneMapMethod)) m_defaultVideoSettings.m_ToneMapMethod = VS_TONEMAPMETHOD_REINHARD; if (!XMLUtils::GetFloat(pElement, "tonemapparam", m_defaultVideoSettings.m_ToneMapParam, 0.1f, 5.0f)) diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index 862b4874e2..2cd45b6d3c 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -4462,7 +4462,6 @@ bool CVideoDatabase::GetVideoSettings(int idFile, CVideoSettings &settings) settings.m_ScalingMethod = (ESCALINGMETHOD)m_pDS->fv("ScalingMethod").get_asInt(); settings.m_StereoMode = m_pDS->fv("StereoMode").get_asInt(); settings.m_StereoInvert = m_pDS->fv("StereoInvert").get_asBool(); - settings.m_SubtitleCached = false; settings.m_VideoStream = m_pDS->fv("VideoStream").get_asInt(); settings.m_ToneMapMethod = m_pDS->fv("TonemapMethod").get_asInt(); settings.m_ToneMapParam = m_pDS->fv("TonemapParam").get_asFloat(); |