[Settings] move SETTING_VIDEOPLAYER_SUPPORTMVC from platform settings…

… to common settings.
popcornmix · Apr 3, 2020 · 5798ca3 · 5798ca3
1 parent 85a8ed7
commit 5798ca3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
@@ -28,13 +28,6 @@
           <control type="edit" format="integer" />
         </setting>
       </group>
-      <group id="4">
-        <setting id="videoplayer.supportmvc" type="boolean" label="38027" help="38028">
-          <level>2</level>
-          <default>true</default>
-          <control type="toggle" />
-        </setting>
-      </group>
     </category>
   </section>
   <section id="media">

diff --git a/system/settings/settings.xml b/system/settings/settings.xml
@@ -173,6 +173,12 @@
           <default>true</default>
           <control type="toggle" />
         </setting>
+        <setting id="videoplayer.supportmvc" type="boolean" label="38027" help="38028">
+          <level>2</level>
+          <default>true</default>
+          <control type="toggle" />
+          <requirement>HAS_MVC</requirement>
+        </setting>
       </group>
       <group id="5" label="14233">
         <setting id="videoplayer.teletextenabled" type="boolean" label="23050" help="36174">

diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -1199,7 +1199,7 @@ bool CDVDInputStreamBluray::ProcessItem(int playitem)
 
   m_titleInfo = bd_get_playlist_info(m_bd, playitem, m_angle);
 
-  if (CSettings::GetInstance().GetBool("videoplayer.supportmvc") && !m_bMVCDisabled)
+  if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_VIDEOPLAYER_SUPPORTMVC) && !m_bMVCDisabled)
   {
     MPLS_PL * mpls = bd_get_title_mpls(m_bd);
     if (mpls)

diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp
@@ -314,6 +314,9 @@ void CSettingConditions::Initialize()
   m_simpleConditions.insert("has_dx");
   m_simpleConditions.insert("hasdxva2");
 #endif
+#if defined(HAVE_LIBMFX) || defined(TARGET_RASPBERRY_PI)
+  m_simpleConditions.insert("has_mvc");
+#endif
 #ifdef HAVE_LCMS2
   m_simpleConditions.insert("have_lcms2");
 #endif