feat: refactor player proxy and create separated track proxy

Author: acolombier

CMakeLists.txt

@@ -3436,24 +3436,25 @@ if(QML)
       src/qml/qmlapplication.cpp
       src/qml/qmlautoreload.cpp
       src/qml/qmlbeatsmodel.cpp
-      src/qml/qmlcuesmodel.cpp
-      src/qml/qmlcontrolproxy.cpp
+      src/qml/qmlchainpresetmodel.cpp
       src/qml/qmlconfigproxy.cpp
+      src/qml/qmlcontrolproxy.cpp
+      src/qml/qmlcuesmodel.cpp
       src/qml/qmldlgpreferencesproxy.cpp
       src/qml/qmleffectmanifestparametersmodel.cpp
-      src/qml/qmleffectsmanagerproxy.cpp
       src/qml/qmleffectslotproxy.cpp
+      src/qml/qmleffectsmanagerproxy.cpp
       src/qml/qmllibraryproxy.cpp
       src/qml/qmllibrarytracklistmodel.cpp
+      src/qml/qmlmixxxcontrollerscreen.cpp
       src/qml/qmlplayermanagerproxy.cpp
       src/qml/qmlplayerproxy.cpp
       src/qml/qmlvisibleeffectsmodel.cpp
-      src/qml/qmlchainpresetmodel.cpp
-      src/qml/qmlwaveformoverview.cpp
-      src/qml/qmlmixxxcontrollerscreen.cpp
       src/qml/qmlwaveformdisplay.cpp
+      src/qml/qmlwaveformoverview.cpp
       src/qml/qmlwaveformrenderer.cpp
       src/qml/qmlsettingparameter.cpp
+      src/qml/qmltrackproxy.cpp
       src/waveform/renderers/allshader/digitsrenderer.cpp
       src/waveform/renderers/allshader/waveformrenderbeat.cpp
       src/waveform/renderers/allshader/waveformrenderer.cpp

res/qml/Mixxx/Controls/WaveformOverview.qml

@@ -6,8 +6,9 @@ Mixxx.WaveformOverview {
     id: root
 
     required property string group
+    readonly property var player: Mixxx.PlayerManager.getPlayer(root.group)
 
-    player: Mixxx.PlayerManager.getPlayer(root.group)
+    track: player.currentTrack
 
     Mixxx.ControlProxy {
         id: trackLoadedControl

src/coreservices.cpp

@@ -40,13 +40,9 @@
 
 #include "controllers/scripting/controllerscriptenginebase.h"
 #include "qml/qmlconfigproxy.h"
-#include "qml/qmlcontrolproxy.h"
-#include "qml/qmldlgpreferencesproxy.h"
-#include "qml/qmleffectslotproxy.h"
 #include "qml/qmleffectsmanagerproxy.h"
 #include "qml/qmllibraryproxy.h"
 #include "qml/qmlplayermanagerproxy.h"
-#include "qml/qmlplayerproxy.h"
 #endif
 #include "soundio/soundmanager.h"
 #include "sources/soundsourceproxy.h"

src/qml/qmlplayermanagerproxy.cpp

@@ -5,6 +5,7 @@
 #include "mixer/playermanager.h"
 #include "moc_qmlplayermanagerproxy.cpp"
 #include "qml/qmlplayerproxy.h"
+#include "track/track_decl.h"
 
 namespace mixxx {
 namespace qml {
@@ -31,6 +32,20 @@ QmlPlayerProxy* QmlPlayerManagerProxy::getPlayer(const QString& group) {
             [this, group](const QString& trackLocation, bool play) {
                 loadLocationToPlayer(trackLocation, group, play);
             });
+    connect(pPlayerProxy,
+            &QmlPlayerProxy::loadTrackRequested,
+            this,
+            [this, group](TrackPointer track,
+#ifdef __STEM__
+                    mixxx::StemChannelSelection stemSelection,
+#endif
+                    bool play) {
+                loadTrackToPlayer(track, group,
+#ifdef __STEM__
+                        stemSelection,
+#endif
+                        play);
+            });
     connect(pPlayerProxy,
             &QmlPlayerProxy::cloneFromGroup,
             this,
@@ -59,6 +74,19 @@ void QmlPlayerManagerProxy::loadLocationToPlayer(
     m_pPlayerManager->slotLoadLocationToPlayer(location, group, play);
 }
 
+void QmlPlayerManagerProxy::loadTrackToPlayer(TrackPointer track,
+        const QString& group,
+#ifdef __STEM__
+        mixxx::StemChannelSelection stemSelection,
+#endif
+        bool play) {
+    m_pPlayerManager->slotLoadTrackToPlayer(track, group,
+#ifdef __STEM__
+            stemSelection,
+#endif
+            play);
+}
+
 // static
 QmlPlayerManagerProxy* QmlPlayerManagerProxy::create(QQmlEngine* pQmlEngine, QJSEngine* pJsEngine) {
     // The implementation of this method is mostly taken from the code example

src/qml/qmlplayermanagerproxy.h

@@ -24,6 +24,12 @@ class QmlPlayerManagerProxy : public QObject {
             const QUrl& locationUrl, bool play = false);
     Q_INVOKABLE void loadLocationToPlayer(
             const QString& location, const QString& group, bool play = false);
+    Q_INVOKABLE void loadTrackToPlayer(TrackPointer track,
+            const QString& group,
+#ifdef __STEM__
+            mixxx::StemChannelSelection stemSelection,
+#endif
+            bool play);
 
     static QmlPlayerManagerProxy* create(QQmlEngine* pQmlEngine, QJSEngine* pJsEngine);
     static void registerPlayerManager(std::shared_ptr<PlayerManager> pPlayerManager) {