Overviews: update in decks and library when type changes

mixxxdj · Sep 11, 2024 · 99d13c3 · 99d13c3
1 parent 73edc2f
commit 99d13c3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/src/waveform/overviews/overviewcache.cpp b/src/waveform/overviews/overviewcache.cpp
@@ -118,9 +118,14 @@ void OverviewCache::setOverviewType(mixxx::OverviewType type) {
     }
 
     m_type = type;
+
+    const TrackIdList trackIds = m_overviewCache.keys();
+    for (auto& trackId : trackIds) {
+        emit overviewChanged(trackId);
+    }
     m_overviewCache.clear();
 
-    emit overviewsChanged(m_overviewCache.keys());
+    emit typeChanged(type);
 }
 
 void OverviewCache::setOverviewNormalized(bool normalized) {

diff --git a/src/waveform/overviews/overviewcache.h b/src/waveform/overviews/overviewcache.h
@@ -21,7 +21,9 @@ struct OverviewCacheItem {
 class OverviewCache : public QObject, public Singleton<OverviewCache> {
     Q_OBJECT
   public:
-    mixxx::OverviewType getOverviewType();
+    mixxx::OverviewType getOverviewType() {
+        return m_type;
+    }
     void setOverviewType(mixxx::OverviewType);
 
     bool isOverviewNormalized();
@@ -73,6 +75,8 @@ class OverviewCache : public QObject, public Singleton<OverviewCache> {
 
     void overviewsChanged(const QList<TrackId>);
 
+    void typeChanged(mixxx::OverviewType type);
+
   protected:
     OverviewCache(UserSettingsPointer pConfig,
             mixxx::DbConnectionPoolPtr pDbConnectionPool,

diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
@@ -40,6 +40,8 @@ WOverview::WOverview(
         : WWidget(parent),
           m_group(group),
           m_pConfig(pConfig),
+          m_pCache(OverviewCache::instance()),
+          m_type(m_pCache->getOverviewType()),
           m_actualCompletion(0),
           m_pixmapDone(false),
           m_waveformPeak(-1.0),
@@ -103,6 +105,11 @@ WOverview::WOverview(
             &WOverview::onTrackAnalyzerProgress);
 
     connect(m_pCueMenuPopup.get(), &WCueMenuPopup::aboutToHide, this, &WOverview::slotCueMenuPopupAboutToHide);
+
+    connect(m_pCache,
+            &OverviewCache::typeChanged,
+            this,
+            &WOverview::slotTypeChanged);
 }
 
 void WOverview::setup(const QDomNode& node, const SkinContext& context) {
@@ -282,8 +289,17 @@ void WOverview::onConnectedControlChanged(double dParameter, double dValue) {
     }
 }
 
+void WOverview::slotTypeChanged(mixxx::OverviewType type) {
+    kLogger.warning() << "slotTypeChanged";
+    if (m_type == type) {
+        return;
+    }
+    m_type = type;
+    slotWaveformSummaryUpdated();
+}
+
 void WOverview::slotWaveformSummaryUpdated() {
-    //qDebug() << "WOverview::slotWaveformSummaryUpdated()";
+    kLogger.info() << "slotWaveformSummaryUpdated";
 
     TrackPointer pTrack(m_pCurrentTrack);
     if (!pTrack) {
@@ -676,7 +692,7 @@ void WOverview::drawWaveformPixmap(QPainter* pPainter) {
         WaveformWidgetFactory* widgetFactory = WaveformWidgetFactory::instance();
         PainterScope painterScope(pPainter);
         float diffGain;
-        bool normalize = OverviewCache::instance()->isOverviewNormalized();
+        bool normalize = m_pCache->isOverviewNormalized();
         if (normalize && m_pixmapDone && m_waveformPeak > 1) {
             diffGain = 255 - m_waveformPeak - 1;
         } else {
@@ -1291,7 +1307,7 @@ bool WOverview::drawNextPixmapPart() {
     }
 
     RenderResult result = OverviewRenderThread::render(
-            pWaveform, mixxx::OverviewType::RGB, m_signalColors);
+            pWaveform, m_type, m_signalColors);
     m_waveformSourceImage = result.image;
     m_waveformPeak = result.waveformPeak;
     // reset scaled image to trigger rebuild in drawWaveformPixmap()

diff --git a/src/widget/woverview.h b/src/widget/woverview.h
@@ -8,6 +8,7 @@
 #include "track/track_decl.h"
 #include "track/trackid.h"
 #include "util/parented_ptr.h"
+#include "waveform/overviews/overviewtype.h"
 #include "waveform/renderers/waveformmarkrange.h"
 #include "waveform/renderers/waveformmarkset.h"
 #include "waveform/renderers/waveformsignalcolors.h"
@@ -19,6 +20,7 @@
 class PlayerManager;
 class QDomNode;
 class SkinContext;
+class OverviewCache;
 
 class WOverview : public WWidget, public TrackDropTarget {
     Q_OBJECT
@@ -36,6 +38,7 @@ class WOverview : public WWidget, public TrackDropTarget {
     void slotTrackLoaded(TrackPointer pTrack);
     void slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack);
     void onTrackAnalyzerProgress(TrackId trackId, AnalyzerProgress analyzerProgress);
+    void slotTypeChanged(mixxx::OverviewType type);
 
   signals:
     void trackDropped(const QString& filename, const QString& group) override;
@@ -122,6 +125,9 @@ class WOverview : public WWidget, public TrackDropTarget {
 
     const QString m_group;
     UserSettingsPointer m_pConfig;
+    OverviewCache* const m_pCache;
+
+    mixxx::OverviewType m_type;
 
     int m_actualCompletion;
     bool m_pixmapDone;