Qt: remove DMO selection from Simple Prefs

Ref #5814

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index cc3cc27068639b1b966d835c0a26d805935bf203..b07d1660032fc2eeab6629673a3ffcdf6d886c2f 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -472,14 +472,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             }
             CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
 #ifdef WIN32
-            CONFIG_BOOL( "prefer-system-codecs", systemCodecBox );
             HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") );
             if( !hdxva2_dll )
                 ui.hwAccelBox->setEnabled( false );
             else
                 FreeLibrary( hdxva2_dll );
-#else
-            ui.systemCodecBox->hide();
 #endif
             optionWidgets.append( ui.DVDDeviceComboBox );
             optionWidgets.append( ui.cachingCombo );

diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui
index 243300e02255b2a16e5593d5b7f99dddaea93116..383f1fba0235e5e9c78af68c2d7b330e20b830ff 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_input.ui
+++ b/modules/gui/qt4/ui/sprefs_input.ui
@@ -24,7 +24,7 @@
       <item row="8" column="2" colspan="2">
        <widget class="QComboBox" name="loopFilterBox"/>
       </item>
-      <item row="13" column="0">
+      <item row="12" column="0">
        <widget class="QLabel" name="x264Label">
         <property name="minimumSize">
          <size>
@@ -40,7 +40,7 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="0">
+      <item row="11" column="0">
        <widget class="QLabel" name="x264profileLabel">
         <property name="minimumSize">
          <size>
@@ -56,7 +56,7 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="1" colspan="2">
+      <item row="11" column="1" colspan="2">
        <widget class="QComboBox" name="presetBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -66,7 +66,7 @@
         </property>
        </widget>
       </item>
-      <item row="12" column="3">
+      <item row="11" column="3">
        <widget class="QComboBox" name="tuneBox"/>
       </item>
       <item row="4" column="0" colspan="3">
@@ -76,17 +76,17 @@
         </property>
        </widget>
       </item>
-      <item row="11" column="0" colspan="4">
+      <item row="10" column="0" colspan="4">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="13" column="3">
+      <item row="12" column="3">
        <widget class="QLineEdit" name="levelBox"/>
       </item>
-      <item row="13" column="1" colspan="2">
+      <item row="12" column="1" colspan="2">
        <widget class="QComboBox" name="profileBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -112,13 +112,6 @@
         </property>
        </widget>
       </item>
-      <item row="10" column="0" colspan="4">
-       <widget class="QCheckBox" name="systemCodecBox">
-        <property name="text">
-         <string>Use systems codecs if available, for WMV codecs</string>
-        </property>
-       </widget>
-      </item>
       <item row="5" column="0">
        <widget class="QLabel" name="ppLabel">
         <property name="minimumSize">
@@ -355,7 +348,6 @@
   <tabstop>hwAccelBox</tabstop>
   <tabstop>PostProcLevel</tabstop>
   <tabstop>loopFilterBox</tabstop>
-  <tabstop>systemCodecBox</tabstop>
   <tabstop>presetBox</tabstop>
   <tabstop>tuneBox</tabstop>
   <tabstop>profileBox</tabstop>