Merge branch 'main' into stopped-explicit

src/library/basetracktablemodel.cpp

@@ -618,11 +618,16 @@ QVariant BaseTrackTableModel::roleValue(
             return QString("(%1)").arg(timesPlayed);
         }
         case ColumnCache::COLUMN_LIBRARYTABLE_DATETIMEADDED:
-        case ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED:
+        case ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_DATETIMEADDED: {
             VERIFY_OR_DEBUG_ASSERT(rawValue.canConvert<QDateTime>()) {
                 return QVariant();
             }
-            return mixxx::localDateTimeFromUtc(rawValue.toDateTime());
+            QDateTime dt = mixxx::localDateTimeFromUtc(rawValue.toDateTime());
+            if (role == Qt::ToolTipRole || role == kDataExportRole) {
+                return dt;
+            }
+            return dt.date();
+        }
         case ColumnCache::COLUMN_LIBRARYTABLE_LAST_PLAYED_AT: {
             QDateTime lastPlayedAt;
             if (rawValue.type() == QVariant::String) {
@@ -636,7 +641,11 @@ QVariant BaseTrackTableModel::roleValue(
                 return QVariant();
             }
             DEBUG_ASSERT(lastPlayedAt.timeSpec() == Qt::UTC);
-            return mixxx::localDateTimeFromUtc(lastPlayedAt);
+            QDateTime dt = mixxx::localDateTimeFromUtc(lastPlayedAt);
+            if (role == Qt::ToolTipRole || role == kDataExportRole) {
+                return dt;
+            }
+            return dt.date();
         }
         case ColumnCache::COLUMN_LIBRARYTABLE_BPM: {
             mixxx::Bpm bpm;

src/preferences/dialog/dlgprefinterface.cpp

@@ -130,12 +130,7 @@ DlgPrefInterface::DlgPrefInterface(
     ComboBoxSkinconf->setCurrentIndex(index);
     // schemes must be updated here to populate the drop-down box and set m_colorScheme
     slotUpdateSchemes();
-    QPixmap preview = m_pSkin->preview(m_colorScheme);
-    preview.setDevicePixelRatio(m_dDevicePixelRatio);
-    skinPreviewLabel->setPixmap(preview.scaled(
-            QSize(640, 360) * m_dDevicePixelRatio,
-            Qt::KeepAspectRatio,
-            Qt::SmoothTransformation));
+    slotSetSkinPreview();
     const auto* const pScreen = getScreen();
     if (m_pSkin->fitsScreenSize(*pScreen)) {
         warningLabel->hide();
@@ -348,12 +343,7 @@ void DlgPrefInterface::slotSetScheme(int) {
         m_colorScheme = newScheme;
         m_bRebootMixxxView = true;
     }
-    QPixmap preview = m_pSkin->preview(m_colorScheme);
-    preview.setDevicePixelRatio(m_dDevicePixelRatio);
-    skinPreviewLabel->setPixmap(preview.scaled(
-            QSize(640, 360) * m_dDevicePixelRatio,
-            Qt::KeepAspectRatio,
-            Qt::SmoothTransformation));
+    slotSetSkinPreview();
 }
 
 void DlgPrefInterface::slotSetSkinDescription() {
@@ -366,6 +356,15 @@ void DlgPrefInterface::slotSetSkinDescription() {
     }
 }
 
+void DlgPrefInterface::slotSetSkinPreview() {
+    QPixmap preview = m_pSkin->preview(m_colorScheme);
+    preview.setDevicePixelRatio(m_dDevicePixelRatio);
+    skinPreviewLabel->setPixmap(preview.scaled(
+            QSize(640, 360) * m_dDevicePixelRatio,
+            Qt::KeepAspectRatio,
+            Qt::SmoothTransformation));
+}
+
 void DlgPrefInterface::slotSetSkin(int) {
     QString newSkinName = ComboBoxSkinconf->currentText();
     if (newSkinName == m_pSkin->name()) {
@@ -386,12 +385,7 @@ void DlgPrefInterface::slotSetSkin(int) {
     }
     slotUpdateSchemes();
     slotSetSkinDescription();
-    QPixmap preview = m_pSkin->preview(m_colorScheme);
-    preview.setDevicePixelRatio(m_dDevicePixelRatio);
-    skinPreviewLabel->setPixmap(preview.scaled(
-            QSize(640, 360) * m_dDevicePixelRatio,
-            Qt::KeepAspectRatio,
-            Qt::SmoothTransformation));
+    slotSetSkinPreview();
 }
 
 void DlgPrefInterface::slotApply() {

src/preferences/dialog/dlgprefinterface.h

@@ -40,9 +40,10 @@ class DlgPrefInterface : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
 
   private slots:
     void slotSetTooltips();
-    void slotSetSkinDescription();
     void slotSetSkin(int);
     void slotSetScheme(int);
+    void slotSetSkinDescription();
+    void slotSetSkinPreview();
     void slotUpdateSchemes();
     void slotSetScaleFactor(double newValue);
     void slotSetScaleFactorAuto(bool checked);

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;
                     }));

tools/qmlformat.py

@@ -9,9 +9,9 @@
 import sys
 
 QMLFORMAT_MISSING_MESSAGE = """
-qmlformat is not installed. It is included in Qt 5.15 and later. If that Qt
-version is not available on your system, please use the SKIP environment
-variable when committing:
+qmlformat is not installed or not in your $PATH. It is included in Qt 5.15
+and later. If that Qt version is not available on your system, please
+use the SKIP environment variable when committing:
 
     $ SKIP=qmlformat git commit
 """