[vlc-commits] Qt: allow to add a renderer button in the toolbar

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Tue May 31 13:08:54 2016 +0200| [2762e73e18ee3bfe358ab28d170610e591eaceda] | committer: Jean-Baptiste Kempf

Qt: allow to add a renderer button in the toolbar

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2762e73e18ee3bfe358ab28d170610e591eaceda
---

 modules/gui/qt/Makefile.am                  |    1 +
 modules/gui/qt/components/controller.cpp    |    4 ++++
 modules/gui/qt/components/controller.hpp    |    9 ++++++---
 modules/gui/qt/pixmaps/toolbar/renderer.png |  Bin 0 -> 286 bytes
 modules/gui/qt/vlc.qrc                      |    1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 1911cb5..aac21d7 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/renderer.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 c846f25..c13ab35 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -478,6 +478,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..dab36fd 100644
--- a/modules/gui/qt/components/controller.hpp
+++ b/modules/gui/qt/components/controller.hpp
@@ -81,6 +81,7 @@ typedef enum buttonType_e
     NEXT_BUTTON,
     OPEN_SUB_BUTTON,
     FULLWIDTH_BUTTON,
+    RENDERER_BUTTON,
     BUTTON_MAX,
 
     SPLITTER = 0x20,
@@ -110,7 +111,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 +125,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 +136,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/renderer"
 };
 
 enum
diff --git a/modules/gui/qt/pixmaps/toolbar/renderer.png b/modules/gui/qt/pixmaps/toolbar/renderer.png
new file mode 100644
index 0000000..ac29295
Binary files /dev/null and b/modules/gui/qt/pixmaps/toolbar/renderer.png differ
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 20954cd..7ff3485 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="renderer">pixmaps/toolbar/renderer.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>