vlc/vlc-3.0 | branch: master | Pierre Lamot <[email protected]> | Wed Dec 20 17:58:11 2017 +0100| [58560d797578c0af933d8eee93052641f3de2766] | committer: Hugo Beauzée-Luyssen
Qt: spref, remove DirectX DisplayDevice preference Ref #19305 Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit c50125010149ff49e5d4edce47b789b6065a4ff4) Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=58560d797578c0af933d8eee93052641f3de2766 --- modules/gui/qt/components/simple_preferences.cpp | 2 -- modules/gui/qt/ui/sprefs_video.ui | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp index 8d4c66e8d8..74b1903aeb 100644 --- a/modules/gui/qt/components/simple_preferences.cpp +++ b/modules/gui/qt/components/simple_preferences.cpp @@ -362,8 +362,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "vout", StringList, ui.voutLabel, outputModule ); #ifdef _WIN32 - CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel, - dXdisplayDevice ); CONFIG_BOOL( "directx-overlay", overlay ); CONFIG_BOOL( "directx-hw-yuv", hwYUVBox ); CONNECT( ui.overlay, toggled( bool ), ui.hwYUVBox, setEnabled( bool ) ); diff --git a/modules/gui/qt/ui/sprefs_video.ui b/modules/gui/qt/ui/sprefs_video.ui index abfc1ad3c3..766f747c2e 100644 --- a/modules/gui/qt/ui/sprefs_video.ui +++ b/modules/gui/qt/ui/sprefs_video.ui @@ -100,19 +100,6 @@ </property> </widget> </item> - <item row="3" column="0"> - <widget class="QLabel" name="dxDeviceLabel"> - <property name="text"> - <string>Display device</string> - </property> - <property name="buddy"> - <cstring>dXdisplayDevice</cstring> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QComboBox" name="dXdisplayDevice"/> - </item> </layout> </widget> </item> @@ -320,7 +307,6 @@ <tabstop>outputModule</tabstop> <tabstop>overlay</tabstop> <tabstop>hwYUVBox</tabstop> - <tabstop>dXdisplayDevice</tabstop> <tabstop>kvaFixT23</tabstop> <tabstop>kvaVideoMode</tabstop> <tabstop>deinterlaceBox</tabstop> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
