[vlc-devel] [PATCH 5/5] gui:qt: add a buton in the bottom bar to launch the renderer dialog

[Steve Lhomme]

---
 modules/gui/qt/Makefile.am                    |   1 +
 modules/gui/qt/components/controller.cpp      |   4 ++++
 modules/gui/qt/components/controller.hpp      |  13 ++++++++++---
 modules/gui/qt/pixmaps/toolbar/chromecast.png | Bin 0 -> 286 bytes
 modules/gui/qt/vlc.qrc                        |   1 +
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 modules/gui/qt/pixmaps/toolbar/chromecast.png

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 1911cb5..2043938 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -366,6 +366,7 @@ DEPS_res = \
 	pixmaps/toolbar/atob.png \
 	pixmaps/toolbar/atob_noa.png \
 	pixmaps/toolbar/atob_nob.png \
+	pixmaps/toolbar/chromecast.png \
 	pixmaps/toolbar/defullscreen.png \
 	pixmaps/toolbar/dvd_menu.png \
 	pixmaps/toolbar/dvd_next.png \
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index 7acf5c3..d103889 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -473,6 +473,10 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
         CONNECT_MAP_SET( play, PLAY_ACTION );
         }
         break;
+    case RENDERER_BUTTON:{
+        NORMAL_BUTTON( RENDERER );
+        }
+        break;
     case ASPECT_RATIO_COMBOBOX:
         widget = new AspectRatioComboBox( p_intf );
         widget->setMinimumHeight( 26 );
diff --git a/modules/gui/qt/components/controller.hpp b/modules/gui/qt/components/controller.hpp
index 6ac5b14..2a39c93 100644
--- a/modules/gui/qt/components/controller.hpp
+++ b/modules/gui/qt/components/controller.hpp
@@ -35,7 +35,11 @@
 #include <QSizeGrip>
 
 #define MAIN_TB1_DEFAULT "64;39;64;38;65"
+#if defined(ENABLE_SOUT)
+#define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;9;64;10;20;19;64-4;37;26;65;35-4"
+#else
 #define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;9;64;10;20;19;64-4;37;65;35-4"
+#endif
 #define ADV_TB_DEFAULT "12;11;13;14"
 #define INPT_TB_DEFAULT "43;33-4;44"
 #define FSC_TB_DEFAULT "0-2;64;3;1;4;64;37;64;38;64;8;65;25;35-4;34"
@@ -81,6 +85,7 @@ typedef enum buttonType_e
     NEXT_BUTTON,
     OPEN_SUB_BUTTON,
     FULLWIDTH_BUTTON,
+    RENDERER_BUTTON,
     BUTTON_MAX,
 
     SPLITTER = 0x20,
@@ -110,7 +115,7 @@ static const char* const nameL[BUTTON_MAX] = { N_("Play"), N_("Stop"), N_("Open"
     N_("Record"), N_("A→B Loop"), N_("Frame By Frame"), N_("Trickplay Reverse"),
     N_("Step backward" ), N_("Step forward"), N_("Quit"), N_("Random"),
     N_("Loop / Repeat"), N_("Information"), N_("Previous"), N_("Next"),
-    N_("Open subtitles"), N_("Dock fullscreen controller")
+    N_("Open subtitles"), N_("Dock fullscreen controller"), N_("Renderer output")
 };
 static const char* const tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
     N_("Stop playback"), N_("Open a medium"),
@@ -124,7 +129,8 @@ static const char* const tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
     N_("Random"), N_("Change the loop and repeat modes"), N_("Information"),
     N_("Previous media in the playlist"), N_("Next media in the playlist"),
     N_("Open subtitle file"),
-    N_("Dock/undock fullscreen controller to/from bottom of screen")
+    N_("Dock/undock fullscreen controller to/from bottom of screen"),
+    N_("Select a Renderer device to output video/audio")
 };
 static const QString iconL[BUTTON_MAX] ={ ":/toolbar/play_b", ":/toolbar/stop_b",
     ":/toolbar/eject", ":/toolbar/previous_b", ":/toolbar/next_b",
@@ -134,7 +140,8 @@ static const QString iconL[BUTTON_MAX] ={ ":/toolbar/play_b", ":/toolbar/stop_b"
     ":/toolbar/frame", ":/toolbar/reverse", ":/toolbar/skip_back",
     ":/toolbar/skip_fw", ":/toolbar/clear", ":/buttons/playlist/shuffle_on",
     ":/buttons/playlist/repeat_all", ":/menu/info",
-    ":/toolbar/previous_b", ":/toolbar/next_b", ":/toolbar/eject", ":/toolbar/space"
+    ":/toolbar/previous_b", ":/toolbar/next_b", ":/toolbar/eject", ":/toolbar/space",
+    ":/toolbar/chromecast"
 };
 
 enum
diff --git a/modules/gui/qt/pixmaps/toolbar/chromecast.png b/modules/gui/qt/pixmaps/toolbar/chromecast.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac2929586cdfbcaa82af6b1709579b8c75dc1830
GIT binary patch
literal 286
zcmeAS at N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4 at xYmNj^kiEpy*OmP~4>OmEN&bf;ia?>&o-U3d7N^f%QtW186gc|v{wcQE
z2^*qBW<PB at n6yn+;xCW*lLJ{B^*h`S>L+aZ&A4TrZ@}c2izIALbIrbT*Z4=m14D!V
zGaHXvuV~ocQ_3g2K+jB5%v?Z~(LQ21gNWky`~TzFGLoi?e(2`3;@He!XK-A=d&(uI
zWflwN;x{<_i*)Fa+;{Pqdf1D^o>OygzB=ook=)O?ub`uPy1OS&l5tn_6?g9FD+MkO
b)|Rr?w(DPiQ8J|#=xhd0S3j3^P6<r_#RX|s

literal 0
HcmV?d00001

diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 20954cd..25dd853 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -42,6 +42,7 @@
         <file alias="previous_b">pixmaps/previous.png</file>
         <file alias="eject">pixmaps/eject.png</file>
         <file alias="fullscreen">pixmaps/toolbar/fullscreen.png</file>
+        <file alias="chromecast">pixmaps/toolbar/chromecast.png</file>
         <file alias="defullscreen">pixmaps/toolbar/defullscreen.png</file>
         <file alias="extended">pixmaps/toolbar/extended_16px.png</file>
         <file alias="playlist">pixmaps/playlist/playlist.png</file>
-- 
2.7.0.windows.1