vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue Jan 16 17:45:58 2018 +0100| [7cffc551abc2a999c96fd72e9892247943e5b02d] | committer: Jean-Baptiste Kempf
qt: Move renderer menu to playback This makes even more sense now that we handle chromecast audio correctly Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7cffc551abc2a999c96fd72e9892247943e5b02d --- modules/gui/qt/menus.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp index ede795a55c..ef75eedc53 100644 --- a/modules/gui/qt/menus.cpp +++ b/modules/gui/qt/menus.cpp @@ -670,17 +670,11 @@ QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu *current ) QVector<vlc_object_t *> objects; QVector<const char *> varnames; - if ( !rendererMenu ) - rendererMenu = RendererMenu( p_intf ); - if( current->isEmpty() ) { addActionWithSubmenu( current, "video-es", qtr( "Video &Track" ) ); current->addSeparator(); - current->addMenu( rendererMenu ); - - current->addSeparator(); /* Surface modifiers */ addActionWithCheckbox( current, "fullscreen", qtr( "&Fullscreen" ) ); addActionWithCheckbox( current, "autoscale", qtr( "Always Fit &Window" ) ); @@ -733,6 +727,13 @@ QMenu *VLCMenuBar::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) menu->addSeparator(); + if ( !rendererMenu ) + rendererMenu = RendererMenu( p_intf ); + + menu->addMenu( rendererMenu ); + menu->addSeparator(); + + PopupMenuControlEntries( menu, p_intf ); EnableStaticEntries( menu, ( THEMIM->getInput() != NULL ) ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
