Merge pull request #3950 from Holzhaus/qml-cleanup

QML Pointer Cleanup

src/skin/qml/qmlplayermanagerproxy.cpp

@@ -1,13 +1,16 @@
 #include "skin/qml/qmlplayermanagerproxy.h"
 
+#include <QQmlEngine>
+
 #include "mixer/playermanager.h"
 #include "skin/qml/qmlplayerproxy.h"
 
 namespace mixxx {
 namespace skin {
 namespace qml {
 
-QmlPlayerManagerProxy::QmlPlayerManagerProxy(PlayerManager* pPlayerManager, QObject* parent)
+QmlPlayerManagerProxy::QmlPlayerManagerProxy(
+        std::shared_ptr<PlayerManager> pPlayerManager, QObject* parent)
         : QObject(parent), m_pPlayerManager(pPlayerManager) {
 }
 
@@ -17,7 +20,12 @@ QObject* QmlPlayerManagerProxy::getPlayer(const QString& group) {
         qWarning() << "PlayerManagerProxy failed to find player for group" << group;
         return nullptr;
     }
-    return new QmlPlayerProxy(pPlayer, this);
+
+    // Don't set a parent here, so that the QML engine deletes the object when
+    // the corresponding JS object is garbage collected.
+    QmlPlayerProxy* pPlayerProxy = new QmlPlayerProxy(pPlayer);
+    QQmlEngine::setObjectOwnership(pPlayerProxy, QQmlEngine::JavaScriptOwnership);
+    return pPlayerProxy;
 }
 
 } // namespace qml

src/skin/qml/qmlplayermanagerproxy.h

@@ -2,7 +2,7 @@
 #include <QObject>
 #include <QString>
 
-class PlayerManager;
+#include "mixer/playermanager.h"
 
 namespace mixxx {
 namespace skin {
@@ -11,12 +11,14 @@ namespace qml {
 class QmlPlayerManagerProxy : public QObject {
     Q_OBJECT
   public:
-    explicit QmlPlayerManagerProxy(PlayerManager* pPlayerManager, QObject* parent = nullptr);
+    explicit QmlPlayerManagerProxy(
+            std::shared_ptr<PlayerManager> pPlayerManager,
+            QObject* parent = nullptr);
 
     Q_INVOKABLE QObject* getPlayer(const QString& deck);
 
   private:
-    const PlayerManager* m_pPlayerManager;
+    const std::shared_ptr<PlayerManager> m_pPlayerManager;
 };
 
 } // namespace qml

src/skin/qml/qmlplayerproxy.cpp

@@ -23,7 +23,7 @@ namespace mixxx {
 namespace skin {
 namespace qml {
 
-QmlPlayerProxy::QmlPlayerProxy(BaseTrackPlayer* pTrackPlayer, QObject* parent = nullptr)
+QmlPlayerProxy::QmlPlayerProxy(BaseTrackPlayer* pTrackPlayer, QObject* parent)
         : QObject(parent), m_pTrackPlayer(pTrackPlayer) {
     connect(m_pTrackPlayer,
             &BaseTrackPlayer::loadingTrack,

src/skin/qml/qmlplayerproxy.h

@@ -1,12 +1,12 @@
 #include <QColor>
 #include <QObject>
+#include <QPointer>
 #include <QString>
 #include <QUrl>
 
+#include "mixer/basetrackplayer.h"
 #include "track/track.h"
 
-class BaseTrackPlayer;
-
 namespace mixxx {
 namespace skin {
 namespace qml {
@@ -31,7 +31,7 @@ class QmlPlayerProxy : public QObject {
     Q_PROPERTY(QUrl coverArtUrl READ getCoverArtUrl NOTIFY coverArtUrlChanged)
 
   public:
-    explicit QmlPlayerProxy(BaseTrackPlayer* pTrackPlayer, QObject* parent);
+    explicit QmlPlayerProxy(BaseTrackPlayer* pTrackPlayer, QObject* parent = nullptr);
 
     QString getTrack() const;
     QString getTitle() const;
@@ -90,7 +90,7 @@ class QmlPlayerProxy : public QObject {
     void coverArtUrlChanged();
 
   private:
-    BaseTrackPlayer* m_pTrackPlayer;
+    QPointer<BaseTrackPlayer> m_pTrackPlayer;
     TrackPointer m_pCurrentTrack;
 };
 

src/skin/qml/qmlskin.cpp

@@ -136,7 +136,7 @@ QWidget* QmlSkin::loadSkin(QWidget* pParent,
 
                         QmlPlayerManagerProxy* pPlayerManagerProxy =
                                 new QmlPlayerManagerProxy(
-                                        pCoreServices->getPlayerManager().get(),
+                                        pCoreServices->getPlayerManager(),
                                         pEngine);
                         return pPlayerManagerProxy;
                     }));