Commit 351ccb16 authored by Pierre Lamot's avatar Pierre Lamot Committed by Jean-Baptiste Kempf
Browse files

qt: move player to its own folder



  no functionnal changes
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 4d646bdd
......@@ -91,7 +91,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/info_panels.cpp gui/qt/components/info_panels.hpp \
gui/qt/components/info_widgets.cpp gui/qt/components/info_widgets.hpp \
gui/qt/components/navigation_history.cpp gui/qt/components/navigation_history.hpp \
gui/qt/components/player_controller.cpp gui/qt/components/player_controller.hpp gui/qt/components/player_controller_p.hpp \
gui/qt/player/player_controller.cpp gui/qt/player/player_controller.hpp gui/qt/player/player_controller_p.hpp \
gui/qt/player/playercontrolbarmodel.cpp gui/qt/player/playercontrolbarmodel.hpp \
gui/qt/components/preferences_widgets.cpp \
gui/qt/components/preferences_widgets.hpp \
gui/qt/components/selectable_list_model.hpp \
......@@ -104,7 +105,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/interface_widgets.cpp \
gui/qt/components/interface_widgets.hpp \
gui/qt/components/controller.cpp gui/qt/components/controller.hpp \
gui/qt/components/playercontrolbarmodel.cpp gui/qt/components/playercontrolbarmodel.hpp \
gui/qt/components/controller_widget.cpp \
gui/qt/components/controller_widget.hpp \
gui/qt/components/recent_media_model.cpp \
......@@ -185,7 +185,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/sout/profiles.hpp \
gui/qt/util/animators.cpp gui/qt/util/animators.hpp \
gui/qt/util/input_slider.cpp gui/qt/util/input_slider.hpp \
gui/qt/util/input_models.cpp gui/qt/util/input_models.hpp \
gui/qt/player/input_models.cpp gui/qt/player/input_models.hpp \
gui/qt/util/timetooltip.cpp gui/qt/util/timetooltip.hpp \
gui/qt/util/customwidgets.cpp gui/qt/util/customwidgets.hpp \
gui/qt/util/searchlineedit.cpp gui/qt/util/searchlineedit.hpp \
......@@ -264,7 +264,8 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/components/extended_panels.moc.cpp \
gui/qt/components/info_panels.moc.cpp \
gui/qt/components/info_widgets.moc.cpp \
gui/qt/components/player_controller.moc.cpp \
gui/qt/player/player_controller.moc.cpp \
gui/qt/player/playercontrolbarmodel.moc.cpp \
gui/qt/components/preferences_widgets.moc.cpp \
gui/qt/components/complete_preferences.moc.cpp \
gui/qt/components/simple_preferences.moc.cpp \
......@@ -272,7 +273,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/components/interface_widgets.moc.cpp \
gui/qt/components/navigation_history.moc.cpp \
gui/qt/components/controller.moc.cpp \
gui/qt/components/playercontrolbarmodel.moc.cpp \
gui/qt/components/controller_widget.moc.cpp \
gui/qt/components/custom_menus.moc.cpp \
gui/qt/components/recent_media_model.moc.cpp \
......@@ -312,7 +312,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/components/sout/sout_widgets.moc.cpp \
gui/qt/util/animators.moc.cpp \
gui/qt/util/input_slider.moc.cpp \
gui/qt/util/input_models.moc.cpp \
gui/qt/player/input_models.moc.cpp \
gui/qt/util/timetooltip.moc.cpp \
gui/qt/util/customwidgets.moc.cpp \
gui/qt/util/qmleventfilter.moc.cpp \
......@@ -563,18 +563,18 @@ libqt_plugin_la_QML = \
gui/qt/qml/MainInterface.qml \
gui/qt/qml/BannerSources.qml \
gui/qt/qml/about/About.qml \
gui/qt/qml/player/Player.qml \
gui/qt/qml/player/TrackInfo.qml \
gui/qt/qml/player/ControlBar.qml \
gui/qt/qml/player/ControlButtons.qml \
gui/qt/qml/player/PlayerButtonsLayout.qml \
gui/qt/qml/player/PlayerMenu.qml \
gui/qt/qml/player/PlayerMenuItem.qml \
gui/qt/qml/player/VolumeWidget.qml \
gui/qt/qml/player/SliderBar.qml \
gui/qt/qml/player/TeletextWidget.qml \
gui/qt/qml/player/MiniPlayer.qml \
gui/qt/qml/player/TopBar.qml \
gui/qt/player/qml/Player.qml \
gui/qt/player/qml/TrackInfo.qml \
gui/qt/player/qml/ControlBar.qml \
gui/qt/player/qml/ControlButtons.qml \
gui/qt/player/qml/PlayerButtonsLayout.qml \
gui/qt/player/qml/PlayerMenu.qml \
gui/qt/player/qml/PlayerMenuItem.qml \
gui/qt/player/qml/VolumeWidget.qml \
gui/qt/player/qml/SliderBar.qml \
gui/qt/player/qml/TeletextWidget.qml \
gui/qt/player/qml/MiniPlayer.qml \
gui/qt/player/qml/TopBar.qml \
gui/qt/qml/dialogs/Dialogs.qml \
gui/qt/qml/dialogs/ModalDialog.qml \
gui/qt/qml/dialogs/EditorDummyButton.qml \
......
......@@ -32,7 +32,7 @@
#include <QFrame>
#include <QString>
#include <QSizeGrip>
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#define MAIN_TB1_DEFAULT "64;39;64;38;65"
#define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;9;64;10;20;19;64-4;37;65;35-4"
......
......@@ -28,7 +28,7 @@
#include "controller.hpp"
#include "playlist/playlist_controller.hpp"
#include "components/player_controller.hpp" /* Get notification of Volume Change */
#include "player/player_controller.hpp" /* Get notification of Volume Change */
#include "util/input_slider.hpp" /* SoundSlider */
#include "util/imagehelper.hpp"
#include "vlc_player.h"
......
......@@ -28,7 +28,7 @@
#endif
#include "qt.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include "playlist/playlist_controller.hpp"
#include <QWidget>
......
......@@ -23,7 +23,7 @@
#include "qt.hpp"
#include <vlc_epg.h>
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include <QStackedWidget>
#include <QVBoxLayout>
......
......@@ -47,7 +47,7 @@
#include "components/extended_panels.hpp"
#include "dialogs/preferences.hpp"
#include "qt.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include "util/qt_dirs.hpp"
#include "util/customwidgets.hpp"
#include "dialogs_provider.hpp"
......
......@@ -30,7 +30,7 @@
#endif
#include "main_interface.hpp" /* Interface integration */
#include "components/player_controller.hpp" /* Speed control */
#include "player/player_controller.hpp" /* Speed control */
#include "components/controller.hpp"
#include "components/controller_widget.hpp"
......
......@@ -25,7 +25,7 @@
#endif
#include "dialogs/bookmarks.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include <QHBoxLayout>
#include <QSpacerItem>
......
......@@ -41,7 +41,7 @@
#include <QDateTime>
#include "qt.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
{
......
......@@ -29,7 +29,7 @@
#include "dialogs/extended.hpp"
#include "main_interface.hpp" /* Needed for external MI size */
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include <QTabWidget>
#include <QGridLayout>
......
......@@ -27,7 +27,7 @@
#include "components/extended_panels.hpp"
#include "util/singleton.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
class QTabWidget;
......
......@@ -25,7 +25,7 @@
#include "dialogs/gototime.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include <QTabWidget>
#include <QLabel>
......
......@@ -26,7 +26,7 @@
#endif
#include "dialogs/mediainfo.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include <vlc_url.h>
......
......@@ -36,7 +36,7 @@
#include "util/imagehelper.hpp"
#include "qt.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include <QGroupBox>
#include <QLabel>
......
......@@ -22,7 +22,7 @@
#include "dialogs/toolbareditor.hpp"
#include "components/settings.hpp"
#include "components/playercontrolbarmodel.hpp"
#include "player/playercontrolbarmodel.hpp"
#include "main_interface.hpp"
#include <QInputDialog>
......
......@@ -29,7 +29,7 @@
#include "qt.hpp"
#include "dialogs_provider.hpp"
#include "components/player_controller.hpp" /* Load Subtitles */
#include "player/player_controller.hpp" /* Load Subtitles */
#include "playlist/playlist_controller.hpp"
#include "menus.hpp"
#include "recents.hpp"
......
......@@ -21,7 +21,7 @@
*****************************************************************************/
#include "extensions_manager.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include "dialogs/extensions.hpp"
#include <vlc_modules.h>
......
......@@ -30,7 +30,7 @@
#include <vlc_extensions.h>
#include "qt.hpp"
#include <components/player_controller.hpp>
#include <player/player_controller.hpp>
#include <QObject>
#include <QMenu>
......
......@@ -29,7 +29,7 @@
#include "qt.hpp"
#include "main_interface.hpp"
#include "components/player_controller.hpp" // Creation
#include "player/player_controller.hpp" // Creation
#include "managers/renderer_manager.hpp"
#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
......@@ -59,7 +59,7 @@
#include "components/navigation_history.hpp"
#include "components/aboutmodel.hpp"
#include "components/dialogmodel.hpp"
#include "components/playercontrolbarmodel.hpp"
#include "player/playercontrolbarmodel.hpp"
#include "components/voutwindow/qvoutwindowdummy.hpp"
......
......@@ -27,7 +27,7 @@
#include "qt.hpp"
#include "util/qvlcframe.hpp"
#include "components/player_controller.hpp"
#include "player/player_controller.hpp"
#include "components/voutwindow/qvoutwindow.hpp"
#include <QSystemTrayIcon>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment