[vlc-commits] qt: move player to its own folder
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:12 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct 11 16:28:22 2019 +0200| [351ccb16267a1fd42872cb4b25ad5f2281ed984f] | committer: Jean-Baptiste Kempf
qt: move player to its own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351ccb16267a1fd42872cb4b25ad5f2281ed984f
---
modules/gui/qt/Makefile.am | 36 +++++++++++-----------
modules/gui/qt/components/controller.hpp | 2 +-
modules/gui/qt/components/controller_widget.cpp | 2 +-
modules/gui/qt/components/controller_widget.hpp | 2 +-
modules/gui/qt/components/epg/EPGWidget.cpp | 2 +-
modules/gui/qt/components/extended_panels.cpp | 2 +-
modules/gui/qt/components/interface_widgets.hpp | 2 +-
modules/gui/qt/dialogs/bookmarks.cpp | 2 +-
modules/gui/qt/dialogs/epg.cpp | 2 +-
modules/gui/qt/dialogs/extended.cpp | 2 +-
modules/gui/qt/dialogs/extended.hpp | 2 +-
modules/gui/qt/dialogs/gototime.cpp | 2 +-
modules/gui/qt/dialogs/mediainfo.cpp | 2 +-
modules/gui/qt/dialogs/toolbar.cpp | 2 +-
modules/gui/qt/dialogs/toolbareditor.cpp | 2 +-
modules/gui/qt/dialogs_provider.cpp | 2 +-
modules/gui/qt/extensions_manager.cpp | 2 +-
modules/gui/qt/extensions_manager.hpp | 2 +-
modules/gui/qt/main_interface.cpp | 4 +--
modules/gui/qt/main_interface.hpp | 2 +-
modules/gui/qt/main_interface_win32.cpp | 2 +-
modules/gui/qt/menus.cpp | 2 +-
modules/gui/qt/{util => player}/input_models.cpp | 0
modules/gui/qt/{util => player}/input_models.hpp | 0
.../{components => player}/player_controller.cpp | 0
.../{components => player}/player_controller.hpp | 2 +-
.../{components => player}/player_controller_p.hpp | 2 +-
.../playercontrolbarmodel.cpp | 0
.../playercontrolbarmodel.hpp | 2 +-
.../qt/{qml/player => player/qml}/ControlBar.qml | 0
.../{qml/player => player/qml}/ControlButtons.qml | 0
.../qt/{qml/player => player/qml}/MiniPlayer.qml | 0
.../gui/qt/{qml/player => player/qml}/Player.qml | 0
.../player => player/qml}/PlayerButtonsLayout.qml | 0
.../qt/{qml/player => player/qml}/PlayerMenu.qml | 0
.../{qml/player => player/qml}/PlayerMenuItem.qml | 0
.../qt/{qml/player => player/qml}/SliderBar.qml | 0
.../{qml/player => player/qml}/TeletextWidget.qml | 0
.../gui/qt/{qml/player => player/qml}/TopBar.qml | 0
.../qt/{qml/player => player/qml}/TrackInfo.qml | 0
.../qt/{qml/player => player/qml}/VolumeWidget.qml | 0
modules/gui/qt/qt.cpp | 2 +-
modules/gui/qt/util/input_slider.cpp | 4 +--
modules/gui/qt/util/qvlcapp.hpp | 2 +-
modules/gui/qt/vlc.qrc | 24 +++++++--------
45 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 1f197ef4d6..a78aceabe9 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -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 \
diff --git a/modules/gui/qt/components/controller.hpp b/modules/gui/qt/components/controller.hpp
index bfde1d497e..ee6b633006 100644
--- a/modules/gui/qt/components/controller.hpp
+++ b/modules/gui/qt/components/controller.hpp
@@ -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"
diff --git a/modules/gui/qt/components/controller_widget.cpp b/modules/gui/qt/components/controller_widget.cpp
index d3c182abad..86396a717b 100644
--- a/modules/gui/qt/components/controller_widget.cpp
+++ b/modules/gui/qt/components/controller_widget.cpp
@@ -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"
diff --git a/modules/gui/qt/components/controller_widget.hpp b/modules/gui/qt/components/controller_widget.hpp
index 4bfc868a31..e9d173bd15 100644
--- a/modules/gui/qt/components/controller_widget.hpp
+++ b/modules/gui/qt/components/controller_widget.hpp
@@ -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>
diff --git a/modules/gui/qt/components/epg/EPGWidget.cpp b/modules/gui/qt/components/epg/EPGWidget.cpp
index fcf08ce7b7..ee89ab9579 100644
--- a/modules/gui/qt/components/epg/EPGWidget.cpp
+++ b/modules/gui/qt/components/epg/EPGWidget.cpp
@@ -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>
diff --git a/modules/gui/qt/components/extended_panels.cpp b/modules/gui/qt/components/extended_panels.cpp
index 937206c589..57fc51038b 100644
--- a/modules/gui/qt/components/extended_panels.cpp
+++ b/modules/gui/qt/components/extended_panels.cpp
@@ -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"
diff --git a/modules/gui/qt/components/interface_widgets.hpp b/modules/gui/qt/components/interface_widgets.hpp
index c6510c3b40..09bfa2f68c 100644
--- a/modules/gui/qt/components/interface_widgets.hpp
+++ b/modules/gui/qt/components/interface_widgets.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"
diff --git a/modules/gui/qt/dialogs/bookmarks.cpp b/modules/gui/qt/dialogs/bookmarks.cpp
index 6f6f68781d..a9ff4f907a 100644
--- a/modules/gui/qt/dialogs/bookmarks.cpp
+++ b/modules/gui/qt/dialogs/bookmarks.cpp
@@ -25,7 +25,7 @@
#endif
#include "dialogs/bookmarks.hpp"
-#include "components/player_controller.hpp"
+#include "player/player_controller.hpp"
#include <QHBoxLayout>
#include <QSpacerItem>
diff --git a/modules/gui/qt/dialogs/epg.cpp b/modules/gui/qt/dialogs/epg.cpp
index 0439271556..a78a6068d3 100644
--- a/modules/gui/qt/dialogs/epg.cpp
+++ b/modules/gui/qt/dialogs/epg.cpp
@@ -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 )
{
diff --git a/modules/gui/qt/dialogs/extended.cpp b/modules/gui/qt/dialogs/extended.cpp
index 83720034d3..f3c99d24e6 100644
--- a/modules/gui/qt/dialogs/extended.cpp
+++ b/modules/gui/qt/dialogs/extended.cpp
@@ -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>
diff --git a/modules/gui/qt/dialogs/extended.hpp b/modules/gui/qt/dialogs/extended.hpp
index a867d14d49..09786ccb6e 100644
--- a/modules/gui/qt/dialogs/extended.hpp
+++ b/modules/gui/qt/dialogs/extended.hpp
@@ -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;
diff --git a/modules/gui/qt/dialogs/gototime.cpp b/modules/gui/qt/dialogs/gototime.cpp
index 953d5ab213..19ba095c8f 100644
--- a/modules/gui/qt/dialogs/gototime.cpp
+++ b/modules/gui/qt/dialogs/gototime.cpp
@@ -25,7 +25,7 @@
#include "dialogs/gototime.hpp"
-#include "components/player_controller.hpp"
+#include "player/player_controller.hpp"
#include <QTabWidget>
#include <QLabel>
diff --git a/modules/gui/qt/dialogs/mediainfo.cpp b/modules/gui/qt/dialogs/mediainfo.cpp
index 7a4406a015..de2c86dd81 100644
--- a/modules/gui/qt/dialogs/mediainfo.cpp
+++ b/modules/gui/qt/dialogs/mediainfo.cpp
@@ -26,7 +26,7 @@
#endif
#include "dialogs/mediainfo.hpp"
-#include "components/player_controller.hpp"
+#include "player/player_controller.hpp"
#include <vlc_url.h>
diff --git a/modules/gui/qt/dialogs/toolbar.cpp b/modules/gui/qt/dialogs/toolbar.cpp
index 7ca554aa18..e6d6282466 100644
--- a/modules/gui/qt/dialogs/toolbar.cpp
+++ b/modules/gui/qt/dialogs/toolbar.cpp
@@ -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>
diff --git a/modules/gui/qt/dialogs/toolbareditor.cpp b/modules/gui/qt/dialogs/toolbareditor.cpp
index fcdcf360b9..eae67cfdcc 100644
--- a/modules/gui/qt/dialogs/toolbareditor.cpp
+++ b/modules/gui/qt/dialogs/toolbareditor.cpp
@@ -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>
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 3628a8fd67..f92f456718 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -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"
diff --git a/modules/gui/qt/extensions_manager.cpp b/modules/gui/qt/extensions_manager.cpp
index f7e819254a..9acdf6849a 100644
--- a/modules/gui/qt/extensions_manager.cpp
+++ b/modules/gui/qt/extensions_manager.cpp
@@ -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>
diff --git a/modules/gui/qt/extensions_manager.hpp b/modules/gui/qt/extensions_manager.hpp
index 4961a75201..ceb56c24df 100644
--- a/modules/gui/qt/extensions_manager.hpp
+++ b/modules/gui/qt/extensions_manager.hpp
@@ -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>
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index d6cdbbd65c..8ab3d43cbd 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -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"
diff --git a/modules/gui/qt/main_interface.hpp b/modules/gui/qt/main_interface.hpp
index e9a3e6d512..4cb7dd2360 100644
--- a/modules/gui/qt/main_interface.hpp
+++ b/modules/gui/qt/main_interface.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>
diff --git a/modules/gui/qt/main_interface_win32.cpp b/modules/gui/qt/main_interface_win32.cpp
index 657240e3f8..86307da7e5 100644
--- a/modules/gui/qt/main_interface_win32.cpp
+++ b/modules/gui/qt/main_interface_win32.cpp
@@ -27,7 +27,7 @@
#include "main_interface_win32.hpp"
-#include "components/player_controller.hpp"
+#include "player/player_controller.hpp"
#include "dialogs_provider.hpp"
#include "components/interface_widgets.hpp"
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 83f9830494..41ed454e6f 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -39,7 +39,7 @@
#include "main_interface.hpp" /* View modifications */
#include "dialogs_provider.hpp" /* Dialogs display */
-#include "components/player_controller.hpp" /* Input Management */
+#include "player/player_controller.hpp" /* Input Management */
#include "playlist/playlist_controller.hpp"
#include "recents.hpp" /* Recent Items */
#include "extensions_manager.hpp" /* Extensions menu */
diff --git a/modules/gui/qt/util/input_models.cpp b/modules/gui/qt/player/input_models.cpp
similarity index 100%
rename from modules/gui/qt/util/input_models.cpp
rename to modules/gui/qt/player/input_models.cpp
diff --git a/modules/gui/qt/util/input_models.hpp b/modules/gui/qt/player/input_models.hpp
similarity index 100%
rename from modules/gui/qt/util/input_models.hpp
rename to modules/gui/qt/player/input_models.hpp
diff --git a/modules/gui/qt/components/player_controller.cpp b/modules/gui/qt/player/player_controller.cpp
similarity index 100%
rename from modules/gui/qt/components/player_controller.cpp
rename to modules/gui/qt/player/player_controller.cpp
diff --git a/modules/gui/qt/components/player_controller.hpp b/modules/gui/qt/player/player_controller.hpp
similarity index 99%
rename from modules/gui/qt/components/player_controller.hpp
rename to modules/gui/qt/player/player_controller.hpp
index 66a474e056..81ed34035b 100644
--- a/modules/gui/qt/components/player_controller.hpp
+++ b/modules/gui/qt/player/player_controller.hpp
@@ -29,7 +29,7 @@
#include <QAbstractListModel>
#include <QScopedPointer>
#include <vlc_cxx_helpers.hpp>
-#include "util/input_models.hpp"
+#include "player/input_models.hpp"
#include "components/audio_device_model.hpp"
#include "adapters/var_choice_model.hpp"
#include "util/vlctick.hpp"
diff --git a/modules/gui/qt/components/player_controller_p.hpp b/modules/gui/qt/player/player_controller_p.hpp
similarity index 99%
rename from modules/gui/qt/components/player_controller_p.hpp
rename to modules/gui/qt/player/player_controller_p.hpp
index df167228b1..f7ebdc3489 100644
--- a/modules/gui/qt/components/player_controller_p.hpp
+++ b/modules/gui/qt/player/player_controller_p.hpp
@@ -21,7 +21,7 @@
#include "player_controller.hpp"
#include "adapters/variables.hpp"
-#include "util/input_models.hpp"
+#include "input_models.hpp"
#include "adapters/var_choice_model.hpp"
#include <QTimer>
diff --git a/modules/gui/qt/components/playercontrolbarmodel.cpp b/modules/gui/qt/player/playercontrolbarmodel.cpp
similarity index 100%
rename from modules/gui/qt/components/playercontrolbarmodel.cpp
rename to modules/gui/qt/player/playercontrolbarmodel.cpp
diff --git a/modules/gui/qt/components/playercontrolbarmodel.hpp b/modules/gui/qt/player/playercontrolbarmodel.hpp
similarity index 98%
rename from modules/gui/qt/components/playercontrolbarmodel.hpp
rename to modules/gui/qt/player/playercontrolbarmodel.hpp
index 2a6f1e1219..f2ffdb5559 100644
--- a/modules/gui/qt/components/playercontrolbarmodel.hpp
+++ b/modules/gui/qt/player/playercontrolbarmodel.hpp
@@ -22,7 +22,7 @@
#include <QAbstractListModel>
#include <QVector>
-#include "qml_main_context.hpp"
+#include "components/qml_main_context.hpp"
class PlayerControlBarModel : public QAbstractListModel
{
diff --git a/modules/gui/qt/qml/player/ControlBar.qml b/modules/gui/qt/player/qml/ControlBar.qml
similarity index 100%
rename from modules/gui/qt/qml/player/ControlBar.qml
rename to modules/gui/qt/player/qml/ControlBar.qml
diff --git a/modules/gui/qt/qml/player/ControlButtons.qml b/modules/gui/qt/player/qml/ControlButtons.qml
similarity index 100%
rename from modules/gui/qt/qml/player/ControlButtons.qml
rename to modules/gui/qt/player/qml/ControlButtons.qml
diff --git a/modules/gui/qt/qml/player/MiniPlayer.qml b/modules/gui/qt/player/qml/MiniPlayer.qml
similarity index 100%
rename from modules/gui/qt/qml/player/MiniPlayer.qml
rename to modules/gui/qt/player/qml/MiniPlayer.qml
diff --git a/modules/gui/qt/qml/player/Player.qml b/modules/gui/qt/player/qml/Player.qml
similarity index 100%
rename from modules/gui/qt/qml/player/Player.qml
rename to modules/gui/qt/player/qml/Player.qml
diff --git a/modules/gui/qt/qml/player/PlayerButtonsLayout.qml b/modules/gui/qt/player/qml/PlayerButtonsLayout.qml
similarity index 100%
rename from modules/gui/qt/qml/player/PlayerButtonsLayout.qml
rename to modules/gui/qt/player/qml/PlayerButtonsLayout.qml
diff --git a/modules/gui/qt/qml/player/PlayerMenu.qml b/modules/gui/qt/player/qml/PlayerMenu.qml
similarity index 100%
rename from modules/gui/qt/qml/player/PlayerMenu.qml
rename to modules/gui/qt/player/qml/PlayerMenu.qml
diff --git a/modules/gui/qt/qml/player/PlayerMenuItem.qml b/modules/gui/qt/player/qml/PlayerMenuItem.qml
similarity index 100%
rename from modules/gui/qt/qml/player/PlayerMenuItem.qml
rename to modules/gui/qt/player/qml/PlayerMenuItem.qml
diff --git a/modules/gui/qt/qml/player/SliderBar.qml b/modules/gui/qt/player/qml/SliderBar.qml
similarity index 100%
rename from modules/gui/qt/qml/player/SliderBar.qml
rename to modules/gui/qt/player/qml/SliderBar.qml
diff --git a/modules/gui/qt/qml/player/TeletextWidget.qml b/modules/gui/qt/player/qml/TeletextWidget.qml
similarity index 100%
rename from modules/gui/qt/qml/player/TeletextWidget.qml
rename to modules/gui/qt/player/qml/TeletextWidget.qml
diff --git a/modules/gui/qt/qml/player/TopBar.qml b/modules/gui/qt/player/qml/TopBar.qml
similarity index 100%
rename from modules/gui/qt/qml/player/TopBar.qml
rename to modules/gui/qt/player/qml/TopBar.qml
diff --git a/modules/gui/qt/qml/player/TrackInfo.qml b/modules/gui/qt/player/qml/TrackInfo.qml
similarity index 100%
rename from modules/gui/qt/qml/player/TrackInfo.qml
rename to modules/gui/qt/player/qml/TrackInfo.qml
diff --git a/modules/gui/qt/qml/player/VolumeWidget.qml b/modules/gui/qt/player/qml/VolumeWidget.qml
similarity index 100%
rename from modules/gui/qt/qml/player/VolumeWidget.qml
rename to modules/gui/qt/player/qml/VolumeWidget.qml
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 67d7e4f66d..a362ff1e71 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -46,7 +46,7 @@ extern "C" char **environ;
#include "qt.hpp"
-#include "components/player_controller.hpp" /* THEMIM destruction */
+#include "player/player_controller.hpp" /* THEMIM destruction */
#include "playlist/playlist_controller.hpp" /* THEMPL creation */
#include "dialogs_provider.hpp" /* THEDP creation */
#ifdef _WIN32
diff --git a/modules/gui/qt/util/input_slider.cpp b/modules/gui/qt/util/input_slider.cpp
index d565e56ee7..b849db4cff 100644
--- a/modules/gui/qt/util/input_slider.cpp
+++ b/modules/gui/qt/util/input_slider.cpp
@@ -30,9 +30,9 @@
#include "util/input_slider.hpp"
#include "util/timetooltip.hpp"
-#include "components/player_controller.hpp"
+#include "player/player_controller.hpp"
#include "imagehelper.hpp"
-#include "input_models.hpp"
+#include "player/input_models.hpp"
#include <QPaintEvent>
#include <QPainter>
diff --git a/modules/gui/qt/util/qvlcapp.hpp b/modules/gui/qt/util/qvlcapp.hpp
index 407c50b9ba..3f860fb571 100644
--- a/modules/gui/qt/util/qvlcapp.hpp
+++ b/modules/gui/qt/util/qvlcapp.hpp
@@ -30,7 +30,7 @@
#if defined(Q_OS_WIN)
# include "qt.hpp"
# include <windows.h>
-# include "components/player_controller.hpp"
+# include "player/player_controller.hpp"
#endif
class QVLCApp : public QApplication
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index b226e53120..b712a1a190 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -261,18 +261,18 @@
<file alias="PopupMenu.qml">qml/menus/PopupMenu.qml</file>
</qresource>
<qresource prefix="/player">
- <file alias="Player.qml">qml/player/Player.qml</file>
- <file alias="ControlBar.qml">qml/player/ControlBar.qml</file>
- <file alias="SliderBar.qml">qml/player/SliderBar.qml</file>
- <file alias="TrackInfo.qml">qml/player/TrackInfo.qml</file>
- <file alias="ControlButtons.qml">qml/player/ControlButtons.qml</file>
- <file alias="VolumeWidget.qml">qml/player/VolumeWidget.qml</file>
- <file alias="TeletextWidget.qml">qml/player/TeletextWidget.qml</file>
- <file alias="MiniPlayer.qml">qml/player/MiniPlayer.qml</file>
- <file alias="TopBar.qml">qml/player/TopBar.qml</file>
- <file alias="PlayerButtonsLayout.qml">qml/player/PlayerButtonsLayout.qml</file>
- <file alias="PlayerMenu.qml">qml/player/PlayerMenu.qml</file>
- <file alias="PlayerMenuItem.qml">qml/player/PlayerMenuItem.qml</file>
+ <file alias="Player.qml">player/qml/Player.qml</file>
+ <file alias="ControlBar.qml">player/qml/ControlBar.qml</file>
+ <file alias="SliderBar.qml">player/qml/SliderBar.qml</file>
+ <file alias="TrackInfo.qml">player/qml/TrackInfo.qml</file>
+ <file alias="ControlButtons.qml">player/qml/ControlButtons.qml</file>
+ <file alias="VolumeWidget.qml">player/qml/VolumeWidget.qml</file>
+ <file alias="TeletextWidget.qml">player/qml/TeletextWidget.qml</file>
+ <file alias="MiniPlayer.qml">player/qml/MiniPlayer.qml</file>
+ <file alias="TopBar.qml">player/qml/TopBar.qml</file>
+ <file alias="PlayerButtonsLayout.qml">player/qml/PlayerButtonsLayout.qml</file>
+ <file alias="PlayerMenu.qml">player/qml/PlayerMenu.qml</file>
+ <file alias="PlayerMenuItem.qml">player/qml/PlayerMenuItem.qml</file>
</qresource>
<qresource prefix="/about">
<file alias="About.qml">qml/about/About.qml</file>
More information about the vlc-commits
mailing list