Ensure media items are owned by C++

theCheeseboard · Dec 1, 2024 · 95a4142 · 95a4142
1 parent 52a5b81
commit 95a4142
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/libthebeat/statemanager.cpp b/libthebeat/statemanager.cpp
@@ -27,14 +27,15 @@
 #include "visualisationmanager.h"
 
 struct StateManagerPrivate {
-    Playlist* playlist;
-    SourceManager* sources;
-    BurnManager* burn;
-    VisualisationManager* visualisation;
-    ControlStripManager* controlStrip;
-    UrlManager* url;
+        Playlist* playlist;
+        SourceManager* sources;
+        BurnManager* burn;
+        VisualisationManager* visualisation;
+        ControlStripManager* controlStrip;
+        UrlManager* url;
 
-    QQuickWindow* mainWindow = nullptr;
+        QQuickWindow* mainWindow = nullptr;
+        QQmlEngine* qmlEngine = nullptr;
 };
 
 StateManager::StateManager(QObject* parent) :
@@ -85,3 +86,11 @@ void StateManager::setMainWindow(QQuickWindow* mainWindow) {
     d->mainWindow = mainWindow;
     emit mainWindowAvailable(mainWindow);
 }
+
+QQmlEngine* StateManager::qmlEngine() {
+    return d->qmlEngine;
+}
+
+void StateManager::setQmlEngine(QQmlEngine* qmlEngine) {
+    d->qmlEngine = qmlEngine;
+}
diff --git a/libthebeat/statemanager.h b/libthebeat/statemanager.h
@@ -22,6 +22,7 @@
 
 #include "libthebeat_global.h"
 #include <QObject>
+#include <QQmlEngine>
 
 class Playlist;
 class SourceManager;
@@ -49,6 +50,9 @@ class LIBTHEBEAT_EXPORT StateManager : public QObject {
         QQuickWindow* mainWindow();
         void setMainWindow(QQuickWindow* mainWindow);
 
+        QQmlEngine* qmlEngine();
+        void setQmlEngine(QQmlEngine* qmlEngine);
+
     signals:
         void mainWindowAvailable(QQuickWindow* mainWindow);
 

diff --git a/plugins/MacIntegration/cd/cdchecker.cpp b/plugins/MacIntegration/cd/cdchecker.cpp
@@ -163,7 +163,9 @@ QVariant CdChecker::data(const QModelIndex& index, int role) const {
 }
 
 MediaItem* CdChecker::mediaItem(int row) {
-    return new MacCdMediaItem(d->directory, d->trackInfo.at(row));
+    auto item = new MacCdMediaItem(d->directory, d->trackInfo.at(row));
+    StateManager::instance()->qmlEngine()->setObjectOwnership(item, QQmlEngine::CppOwnership);
+    return item;
 }
 
 QHash<int, QByteArray> CdChecker::roleNames() const {

diff --git a/plugins/ParanoiaPlugin/paranoiacdcontroller.cpp b/plugins/ParanoiaPlugin/paranoiacdcontroller.cpp
@@ -13,6 +13,7 @@
 #include <statemanager.h>
 
 #include <QAudioSink>
+#include <QQmlEngine>
 
 #include <cdio++/cdio.hpp>
 
@@ -82,7 +83,9 @@ QCoro::Task<> ParanoiaCdController::eject() {
 }
 
 MediaItem* ParanoiaCdController::mediaItem(int row) {
-    return new ParanoiaMediaItem(d->player, row, d->sink, d->trackInfo.at(row));
+    auto item = new ParanoiaMediaItem(d->player, row, d->sink, d->trackInfo.at(row));
+    StateManager::instance()->qmlEngine()->setObjectOwnership(item, QQmlEngine::CppOwnership);
+    return item;
 }
 
 void ParanoiaCdController::readCd() {

diff --git a/plugins/ParanoiaPlugin/paranoiamediaitem.cpp b/plugins/ParanoiaPlugin/paranoiamediaitem.cpp
@@ -67,7 +67,7 @@ quint64 ParanoiaMediaItem::duration() {
 }
 
 QImage ParanoiaMediaItem::albumArt() {
-    return {};
+    return QImage();
 }
 
 QString ParanoiaMediaItem::lyrics() {

diff --git a/plugins/WinIntegration/cdplayback/cdchecker.cpp b/plugins/WinIntegration/cdplayback/cdchecker.cpp
@@ -124,7 +124,9 @@ QCoro::Task<> CdChecker::eject() {
 
 MediaItem* CdChecker::mediaItem(int row) {
     winrt::CDLib::IAudioCDTrack track = d->drive.InsertedMedia().Tracks().GetAt(row);
-    return new WinCdMediaItem(d->drive.DriveLetter().Value(), track);
+    auto item = new WinCdMediaItem(d->drive.DriveLetter().Value(), track);
+    StateManager::instance()->qmlEngine()->setObjectOwnership(item, QQmlEngine::CppOwnership);
+    return item;
 }
 
 int CdChecker::rowCount(const QModelIndex& parent) const {