Wrap QmlPlayerManagerProxy instead

res/controllers/engine-api.d.ts

@@ -32,21 +32,21 @@ declare interface ScriptConnection {
 }
 
 /** QmlPlayerProxy */
-declare interface PlayerManager {
+declare interface PlayerInfo {
     isLoaded(): boolean;
-    getTrack(): string;
-    getTitle(): string;
-    getArtist(): string;
-    getAlbum(): string;
-    getAlbumArtist(): string;
-    getGenre(): string;
-    getComposer(): string;
-    getGrouping(): string;
-    getYear(): string;
-    getTrackNumber(): string;
-    getTrackTotal(): string;
-    getComment(): string;
-    getKeyText(): string;
+    track(): string;
+    title(): string;
+    artist(): string;
+    album(): string;
+    albumArtist(): string;
+    genre(): string;
+    composer(): string;
+    grouping(): string;
+    year(): string;
+    trackNumber(): string;
+    trackTotal(): string;
+    comment(): string;
+    keyText(): string;
 }
 
 
@@ -67,7 +67,7 @@ declare namespace engine {
      *
      * @param group
      */
-    function getPlayer(group: string): PlayerManager | undefined;
+    function getPlayer(group: string): PlayerInfo | undefined;
 
     /**
      * Gets the control value

src/controllers/scripting/controllerscriptenginebase.cpp

@@ -38,10 +38,6 @@ void ControllerScriptEngineBase::registerTrackCollectionManager(
     s_pTrackCollectionManager = std::move(pTrackCollectionManager);
 }
 
-void ControllerScriptEngineBase::registerPlayerManager(std::shared_ptr<PlayerManager> pPlayerManager)  {
-    s_pPlayerManager = std::move(pPlayerManager);
-}
-
 void ControllerScriptEngineBase::handleQMLErrors(const QList<QQmlError>& qmlErrors) {
     for (const QQmlError& error : std::as_const(qmlErrors)) {
         showQMLExceptionDialog(error, m_bErrorsAreFatal);
@@ -178,56 +174,6 @@ void ControllerScriptEngineBase::showScriptExceptionDialog(
     }
 }
 
-#ifdef MIXXX_USE_QML
-void ControllerScriptEngineBase::showQMLExceptionDialog(
-        const QQmlError& error, bool bFatalError) {
-    VERIFY_OR_DEBUG_ASSERT(error.isValid()) {
-        return;
-    }
-
-    QString filename = error.url().isLocalFile() ? error.url().toLocalFile()
-                                                 : error.url().toString();
-
-    if (filename.isEmpty()) {
-        filename = QStringLiteral("<passed code>");
-    }
-    QString errorText = QStringLiteral("Uncaught exception: %1:%2: %3")
-                                .arg(filename, QString::number(error.line()), error.description());
-
-    qCWarning(m_logger) << "ControllerScriptHandlerBase:" << errorText;
-
-    if (!m_bDisplayingExceptionDialog) {
-        scriptErrorDialog(errorText, errorText, bFatalError);
-    }
-}
-
-QObject* ControllerScriptEngineBase::getPlayer(const QString& group) {
-    BaseTrackPlayer* pPlayer = s_pPlayerManager->getPlayer(group);
-    if (!pPlayer) {
-        qWarning() << "PlayerManagerProxy failed to find player for group" << group;
-        return nullptr;
-    }
-
-    // Don't set a parent here, so that the QML engine deletes the object when
-    // the corresponding JS object is garbage collected.
-    mixxx::qml::QmlPlayerProxy* pPlayerProxy = new mixxx::qml::QmlPlayerProxy(pPlayer);
-    QQmlEngine::setObjectOwnership(pPlayerProxy, QQmlEngine::JavaScriptOwnership);
-    connect(pPlayerProxy,
-            &mixxx::qml::QmlPlayerProxy::loadTrackFromLocationRequested,
-            this,
-            [this, group](const QString& trackLocation, bool play) {
-                s_pPlayerManager->slotLoadLocationToPlayer(trackLocation, group, play);
-            });
-    connect(pPlayerProxy,
-            &mixxx::qml::QmlPlayerProxy::cloneFromGroup,
-            this,
-            [this, group](const QString& sourceGroup) {
-                s_pPlayerManager->slotCloneDeck(sourceGroup, group);
-            });
-    return pPlayerProxy;
-}
-#endif
-
 void ControllerScriptEngineBase::logOrThrowError(const QString& errorMessage) {
     if (m_bAbortOnWarning) {
         throwJSError(errorMessage);

src/controllers/scripting/controllerscriptenginebase.h

@@ -39,7 +39,6 @@ class ControllerScriptEngineBase : public QObject {
 #ifdef MIXXX_USE_QML
     /// Precondition: QML.isValid() == true
     void showQMLExceptionDialog(const QQmlError& evaluationResult, bool bFatal = false);
-    QObject* getPlayer(const QString& group);
 #endif
     void throwJSError(const QString& message);
 
@@ -58,7 +57,6 @@ class ControllerScriptEngineBase : public QObject {
 #ifdef MIXXX_USE_QML
     static void registerTrackCollectionManager(
             std::shared_ptr<TrackCollectionManager> pTrackCollectionManager);
-    static void registerPlayerManager(std::shared_ptr<PlayerManager> pPlayerManager);
 #endif
   signals:
     void beforeShutdown();

src/controllers/scripting/legacy/controllerscriptinterfacelegacy.cpp

@@ -31,7 +31,9 @@ constexpr double kBrakeRampToRate = 0.01;
 ControllerScriptInterfaceLegacy::ControllerScriptInterfaceLegacy(
         ControllerScriptEngineLegacy* m_pEngine, const RuntimeLoggingCategory& logger)
         : m_pScriptEngineLegacy(m_pEngine),
-          m_logger(logger) {
+          m_logger(logger),
+          m_pPlayerManagerProxy(mixxx::qml::QmlPlayerManagerProxy::create(m_pEngine->jsEngine().get(), m_pEngine))
+{
     // Pre-allocate arrays for average number of virtual decks
     m_intervalAccumulator.resize(kDecks);
     m_lastMovement.resize(kDecks);
@@ -140,7 +142,7 @@ QObject* ControllerScriptInterfaceLegacy::getPlayer(const QString& deck) {
 #ifndef MIXXX_USE_QML
     return nullptr;
 #endif
-    return m_pScriptEngineLegacy->getPlayer(deck);
+    return m_pPlayerManagerProxy->getPlayer(deck);
 }
 
 double ControllerScriptInterfaceLegacy::getValue(const QString& group, const QString& name) {

src/controllers/scripting/legacy/controllerscriptinterfacelegacy.h

@@ -7,6 +7,10 @@
 #include "util/alphabetafilter.h"
 #include "util/runtimeloggingcategory.h"
 
+#ifdef MIXXX_USE_QML
+#include "qml/qmlplayermanagerproxy.h"
+#endif
+
 class ControllerScriptEngineLegacy;
 class ControlObjectScript;
 class ScriptConnection;
@@ -152,4 +156,8 @@ class ControllerScriptInterfaceLegacy : public QObject {
 
     ControllerScriptEngineLegacy* m_pScriptEngineLegacy;
     const RuntimeLoggingCategory m_logger;
+
+#ifdef MIXXX_USE_QML
+    std::unique_ptr<mixxx::qml::QmlPlayerManagerProxy> m_pPlayerManagerProxy;
+#endif
 };

src/coreservices.cpp

@@ -490,7 +490,6 @@ void CoreServices::initializeQMLSingletons() {
     mixxx::qml::QmlLibraryProxy::registerLibrary(getLibrary());
 
     ControllerScriptEngineBase::registerTrackCollectionManager(getTrackCollectionManager());
-    ControllerScriptEngineBase::registerPlayerManager(getPlayerManager());
 
     // Currently, it is required to enforce QQuickWindow RHI backend to use
     // OpenGL on all platforms to allow offscreen rendering to function as

src/qml/qmlplayermanagerproxy.cpp

@@ -60,7 +60,7 @@ void QmlPlayerManagerProxy::loadLocationToPlayer(
 }
 
 // static
-QmlPlayerManagerProxy* QmlPlayerManagerProxy::create(QQmlEngine* pQmlEngine, QJSEngine* pJsEngine) {
+QmlPlayerManagerProxy* QmlPlayerManagerProxy::create(QJSEngine* pJsEngine, QObject* parent) {
     // The implementation of this method is mostly taken from the code example
     // that shows the replacement for `qmlRegisterSingletonInstance()` when
     // using `QML_SINGLETON`.
@@ -71,7 +71,7 @@ QmlPlayerManagerProxy* QmlPlayerManagerProxy::create(QQmlEngine* pQmlEngine, QJS
         qWarning() << "PlayerManager hasn't been registered yet";
         return nullptr;
     }
-    return new QmlPlayerManagerProxy(s_pPlayerManager, pQmlEngine);
+    return new QmlPlayerManagerProxy(s_pPlayerManager, parent);
 }
 
 } // namespace qml

src/qml/qmlplayermanagerproxy.h

@@ -25,7 +25,7 @@ class QmlPlayerManagerProxy : public QObject {
     Q_INVOKABLE void loadLocationToPlayer(
             const QString& location, const QString& group, bool play = false);
 
-    static QmlPlayerManagerProxy* create(QQmlEngine* pQmlEngine, QJSEngine* pJsEngine);
+    static QmlPlayerManagerProxy* create(QJSEngine* pJsEngine, QObject* parent);
     static void registerPlayerManager(std::shared_ptr<PlayerManager> pPlayerManager) {
         s_pPlayerManager = std::move(pPlayerManager);
     }