Commit 72a9f481 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: remove DMO selection from Simple Prefs

Ref #5814
(cherry picked from commit 9effd9e76da80fce6f8c6053129a63d648cb5698)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent cd275b2e
...@@ -472,14 +472,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -472,14 +472,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
} }
CONFIG_BOOL( "ffmpeg-hw", hwAccelBox ); CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
#ifdef WIN32 #ifdef WIN32
CONFIG_BOOL( "prefer-system-codecs", systemCodecBox );
HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") ); HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") );
if( !hdxva2_dll ) if( !hdxva2_dll )
ui.hwAccelBox->setEnabled( false ); ui.hwAccelBox->setEnabled( false );
else else
FreeLibrary( hdxva2_dll ); FreeLibrary( hdxva2_dll );
#else
ui.systemCodecBox->hide();
#endif #endif
optionWidgets.append( ui.DVDDeviceComboBox ); optionWidgets.append( ui.DVDDeviceComboBox );
optionWidgets.append( ui.cachingCombo ); optionWidgets.append( ui.cachingCombo );
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<item row="8" column="2" colspan="2"> <item row="8" column="2" colspan="2">
<widget class="QComboBox" name="loopFilterBox"/> <widget class="QComboBox" name="loopFilterBox"/>
</item> </item>
<item row="13" column="0"> <item row="12" column="0">
<widget class="QLabel" name="x264Label"> <widget class="QLabel" name="x264Label">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="11" column="0">
<widget class="QLabel" name="x264profileLabel"> <widget class="QLabel" name="x264profileLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1" colspan="2"> <item row="11" column="1" colspan="2">
<widget class="QComboBox" name="presetBox"> <widget class="QComboBox" name="presetBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="3"> <item row="11" column="3">
<widget class="QComboBox" name="tuneBox"/> <widget class="QComboBox" name="tuneBox"/>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="4" column="0" colspan="3">
...@@ -76,17 +76,17 @@ ...@@ -76,17 +76,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0" colspan="4"> <item row="10" column="0" colspan="4">
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="3"> <item row="12" column="3">
<widget class="QLineEdit" name="levelBox"/> <widget class="QLineEdit" name="levelBox"/>
</item> </item>
<item row="13" column="1" colspan="2"> <item row="12" column="1" colspan="2">
<widget class="QComboBox" name="profileBox"> <widget class="QComboBox" name="profileBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
...@@ -112,13 +112,6 @@ ...@@ -112,13 +112,6 @@
</property> </property>
</widget> </widget>
</item> </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"> <item row="5" column="0">
<widget class="QLabel" name="ppLabel"> <widget class="QLabel" name="ppLabel">
<property name="minimumSize"> <property name="minimumSize">
...@@ -355,7 +348,6 @@ ...@@ -355,7 +348,6 @@
<tabstop>hwAccelBox</tabstop> <tabstop>hwAccelBox</tabstop>
<tabstop>PostProcLevel</tabstop> <tabstop>PostProcLevel</tabstop>
<tabstop>loopFilterBox</tabstop> <tabstop>loopFilterBox</tabstop>
<tabstop>systemCodecBox</tabstop>
<tabstop>presetBox</tabstop> <tabstop>presetBox</tabstop>
<tabstop>tuneBox</tabstop> <tabstop>tuneBox</tabstop>
<tabstop>profileBox</tabstop> <tabstop>profileBox</tabstop>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment