vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Oct 12 23:19:24 2012 +0300| [16b9d39f8980a4a3166ae63e10c1d4bec04993ed] | committer: Rémi Denis-Courmont
Qt4: update avcodec-hw prefs > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16b9d39f8980a4a3166ae63e10c1d4bec04993ed --- modules/gui/qt4/components/simple_preferences.cpp | 4 ++-- modules/gui/qt4/ui/sprefs_input.ui | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 759ba54..7e77fad 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -471,11 +471,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.live555TransportHTTPRadio->hide(); ui.live555TransportLabel->hide(); } - CONFIG_BOOL( "avcodec-hw", hwAccelBox ); + CONFIG_GENERIC( "avcodec-hw", StringList, ui.hwAccelLabel, hwAccelModule ); #ifdef WIN32 HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") ); if( !hdxva2_dll ) - ui.hwAccelBox->setEnabled( false ); + ui.hwAccelModule->setEnabled( false ); else FreeLibrary( hdxva2_dll ); #endif diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui index 383f1fb..f07b15b 100644 --- a/modules/gui/qt4/ui/sprefs_input.ui +++ b/modules/gui/qt4/ui/sprefs_input.ui @@ -69,10 +69,17 @@ <item row="11" column="3"> <widget class="QComboBox" name="tuneBox"/> </item> - <item row="4" column="0" colspan="3"> - <widget class="QCheckBox" name="hwAccelBox"> + <item row="4" column="1" colspan="2"> + <widget class="QComboBox" name="hwAccelModule"> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="hwAccelLabel"> <property name="text"> - <string>Use GPU accelerated decoding</string> + <string>Hardware decoding acceleration</string> + </property> + <property name="buddy"> + <cstring>hwAccelModule</cstring> </property> </widget> </item> @@ -345,7 +352,7 @@ </layout> </widget> <tabstops> - <tabstop>hwAccelBox</tabstop> + <tabstop>hwAccelModule</tabstop> <tabstop>PostProcLevel</tabstop> <tabstop>loopFilterBox</tabstop> <tabstop>presetBox</tabstop> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
