Skip to content

Commit

Permalink
qt: remove the renderer selection dialog
Browse files Browse the repository at this point in the history
Signed-off-by: Jean-Baptiste Kempf <[email protected]>
  • Loading branch information
robUx4 authored and jbkempf committed Jun 26, 2016
1 parent 2a074a4 commit a6ee93b
Show file tree
Hide file tree
Showing 12 changed files with 2 additions and 409 deletions.
1 change: 0 additions & 1 deletion include/vlc_intf_strings.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
#define I_MENU_GOTOTIME N_("Jump to Specific &Time")
#define I_MENU_BOOKMARK N_("Custom &Bookmarks")
#define I_MENU_VLM N_("&VLM Configuration")
#define I_MENU_RENDERER N_("&Renderer Output")

#define I_MENU_ABOUT N_("&About")

Expand Down
4 changes: 0 additions & 4 deletions modules/gui/qt/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ libqt_plugin_la_SOURCES = \
dialogs/podcast_configuration.cpp dialogs/podcast_configuration.hpp \
dialogs/extensions.cpp dialogs/extensions.hpp \
dialogs/fingerprintdialog.cpp dialogs/fingerprintdialog.hpp \
dialogs/renderer.cpp dialogs/renderer.hpp \
components/extended_panels.cpp components/extended_panels.hpp \
components/info_panels.cpp components/info_panels.hpp \
components/info_widgets.cpp components/info_widgets.hpp \
Expand Down Expand Up @@ -167,7 +166,6 @@ nodist_libqt_plugin_la_SOURCES = \
dialogs/firstrun.moc.cpp \
dialogs/extensions.moc.cpp \
dialogs/fingerprintdialog.moc.cpp \
dialogs/renderer.moc.cpp \
components/extended_panels.moc.cpp \
components/info_panels.moc.cpp \
components/info_widgets.moc.cpp \
Expand Down Expand Up @@ -225,7 +223,6 @@ nodist_libqt_plugin_la_SOURCES += \
ui/about.h \
ui/update.h \
ui/fingerprintdialog.h \
ui/renderer.h \
ui/sout.h

# User interface compilation
Expand Down Expand Up @@ -263,7 +260,6 @@ libqt_plugin_la_UI = \
ui/streampanel.ui \
ui/messages_panel.ui \
ui/about.ui \
ui/renderer.ui \
ui/update.ui \
ui/sout.ui \
ui/vlm.ui \
Expand Down
3 changes: 0 additions & 3 deletions modules/gui/qt/actions_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ void ActionsManager::doAction( int id_action )
if( p_intf->p_sys->p_mi )
p_intf->p_sys->p_mi->getFullscreenControllerWidget()->toggleFullwidth();
break;
case RENDERER_ACTION:
THEDP->rendererDialog(); break;
break;
default:
msg_Warn( p_intf, "Action not supported: %i", id_action );
break;
Expand Down
1 change: 0 additions & 1 deletion modules/gui/qt/actions_manager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ typedef enum actionType_e
LOOP_ACTION,
INFO_ACTION,
OPEN_SUB_ACTION,
RENDERER_ACTION,
} actionType_e;

class ActionsManager : public QObject, public Singleton<ActionsManager>
Expand Down
4 changes: 0 additions & 4 deletions modules/gui/qt/components/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,6 @@ 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 );
Expand Down
7 changes: 2 additions & 5 deletions modules/gui/qt/components/controller.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ typedef enum buttonType_e
NEXT_BUTTON,
OPEN_SUB_BUTTON,
FULLWIDTH_BUTTON,
RENDERER_BUTTON,
BUTTON_MAX,

SPLITTER = 0x20,
Expand Down Expand Up @@ -111,7 +110,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_("Renderer output")
N_("Open subtitles"), N_("Dock fullscreen controller")
};
static const char* const tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
N_("Stop playback"), N_("Open a medium"),
Expand All @@ -126,7 +125,6 @@ static const char* const tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
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_("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",
Expand All @@ -136,8 +134,7 @@ 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/renderer"
":/toolbar/previous_b", ":/toolbar/next_b", ":/toolbar/eject", ":/toolbar/space"
};

enum
Expand Down
257 changes: 0 additions & 257 deletions modules/gui/qt/dialogs/renderer.cpp

This file was deleted.

Loading

0 comments on commit a6ee93b

Please sign in to comment.