vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Apr 1 20:15:15 2012 +0200| [72a9f481755ec2b355f9591bcb1929331cfc1cbe] | committer: Jean-Baptiste Kempf
Qt: remove DMO selection from Simple Prefs Ref #5814 (cherry picked from commit 9effd9e76da80fce6f8c6053129a63d648cb5698) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=72a9f481755ec2b355f9591bcb1929331cfc1cbe --- modules/gui/qt4/components/simple_preferences.cpp | 3 -- modules/gui/qt4/ui/sprefs_input.ui | 22 ++++++-------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index f37e23f..9d148e2 100644 --- 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 243300e..383f1fb 100644 --- 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> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
