[vlc-commits] qt: Move renderer menu to playback

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Jan 16 17:45:58 2018 +0100| [2e8dbd4b122d2496d7391d0d8634ef1f1eb07d01] | 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 <jb at videolan.org>
(cherry picked from commit 7cffc551abc2a999c96fd72e9892247943e5b02d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2e8dbd4b122d2496d7391d0d8634ef1f1eb07d01
---

 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 ) );