[vlc-commits] qml: move miniplayer to the player module

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Wed Jul 17 13:32:18 2019 +0200| [e919205b044223d38d543e257d4dd8bd789d456c] | committer: Jean-Baptiste Kempf

qml: move miniplayer to the player module

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

 modules/gui/qt/Makefile.am                                | 2 +-
 modules/gui/qt/qml/mediacenter/MCMainDisplay.qml          | 3 ++-
 modules/gui/qt/qml/{mediacenter => player}/MiniPlayer.qml | 0
 modules/gui/qt/vlc.qrc                                    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index dcbea18eb7..917134b885 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -549,6 +549,7 @@ libqt_plugin_la_QML = \
 	gui/qt/qml/player/ModalControlBar.qml \
 	gui/qt/qml/player/SliderBar.qml \
 	gui/qt/qml/player/TeletextWidget.qml \
+	gui/qt/qml/player/MiniPlayer.qml \
 	gui/qt/qml/dialogs/Dialogs.qml \
 	gui/qt/qml/dialogs/ModalDialog.qml \
 	gui/qt/qml/utils/DNDLabel.qml \
@@ -600,7 +601,6 @@ libqt_plugin_la_QML = \
 	gui/qt/qml/mediacenter/NetworkDriveDisplay.qml \
 	gui/qt/qml/mediacenter/NetworkFileDisplay.qml \
 	gui/qt/qml/mediacenter/NetworkListItem.qml \
-	gui/qt/qml/mediacenter/MiniPlayer.qml \
 	gui/qt/qml/playlist/PlaylistListView.qml \
 	gui/qt/qml/playlist/PlaylistMainView.qml \
 	gui/qt/qml/playlist/PLItem.qml \
diff --git a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml b/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
index e5ee8a6651..e1d94c9222 100644
--- a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
+++ b/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
@@ -25,6 +25,7 @@ import "qrc:///style/"
 import "qrc:///qml/"
 import "qrc:///utils/" as Utils
 import "qrc:///playlist/" as PL
+import "qrc:///player/" as Player
 
 Utils.NavigableFocusScope {
     id: root
@@ -240,7 +241,7 @@ Utils.NavigableFocusScope {
                     }
                 }
 
-                MiniPlayer {
+                Player.MiniPlayer {
                     id: miniPlayer
 
                     onActionUp: stackViewZone.focus = true
diff --git a/modules/gui/qt/qml/mediacenter/MiniPlayer.qml b/modules/gui/qt/qml/player/MiniPlayer.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MiniPlayer.qml
rename to modules/gui/qt/qml/player/MiniPlayer.qml
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 6ed9849c70..cf4382f3cc 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -214,7 +214,6 @@
         <file alias="NetworkDriveDisplay.qml">qml/mediacenter/NetworkDriveDisplay.qml</file>
         <file alias="NetworkFileDisplay.qml">qml/mediacenter/NetworkFileDisplay.qml</file>
         <file alias="NetworkListItem.qml">qml/mediacenter/NetworkListItem.qml</file>
-        <file alias="MiniPlayer.qml">qml/mediacenter/MiniPlayer.qml</file>
     </qresource>
     <qresource prefix="/style">
         <file alias="qmldir">qml/style/qmldir</file>
@@ -253,6 +252,7 @@
         <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>
     </qresource>
     <qresource prefix="/about">
         <file alias="About.qml">qml/about/About.qml</file>