woverview waveformsmarks will now reflect their hotcue color

mixxxdj · Oct 6, 2018 · 29df355 · 29df355
1 parent e0d73a0
commit 29df355
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
@@ -230,6 +230,8 @@ void WOverview::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack)
                 this, SLOT(slotWaveformSummaryUpdated()));
         connect(pNewTrack.get(), SIGNAL(analyzerProgress(int)),
                 this, SLOT(slotAnalyzerProgress(int)));
+        connect(pNewTrack.get(), SIGNAL(cuesUpdated(void)),
+                this, SLOT(onTrackCueChange(void)));
 
         slotAnalyzerProgress(pNewTrack->getAnalyzerProgress());
     } else {
@@ -247,14 +249,38 @@ void WOverview::onEndOfTrackChange(double v) {
 
 void WOverview::onMarkChanged(double /*v*/) {
     //qDebug() << "WOverview::onMarkChanged()" << v;
-    update();
+    onTrackCueChange();
+    //update();
 }
 
 void WOverview::onMarkRangeChange(double /*v*/) {
     //qDebug() << "WOverview::onMarkRangeChange()" << v;
     update();
 }
 
+// currently only updates the mark color but it could be easily extended.
+void WOverview::onTrackCueChange(void) {
+
+    const QList<CuePointer> loadedCues = m_pCurrentTrack->getCuePoints();
+
+    for (CuePointer currentCue: loadedCues) {
+
+        const WaveformMarkPointer currentMark = m_marks.getHotCueMark(currentCue->getHotCue());
+
+        if (currentMark && currentMark->isValid()) {
+
+            WaveformMarkProperties markProperties = currentMark->getProperties();
+            const QColor newColor = currentCue->getColor();
+
+            if (newColor != markProperties.m_color) {
+                markProperties.m_color = newColor;
+                currentMark->setProperties(markProperties);
+            }
+        }
+    }
+    update();
+}
+
 void WOverview::mouseMoveEvent(QMouseEvent* e) {
     if (m_orientation == Qt::Horizontal) {
         m_iPos = math_clamp(e->x(), 0, width() - 1);

diff --git a/src/widget/woverview.h b/src/widget/woverview.h
@@ -84,6 +84,7 @@ class WOverview : public WWidget {
 
     void onMarkChanged(double v);
     void onMarkRangeChange(double v);
+    void onTrackCueChange(void);
 
     void slotWaveformSummaryUpdated();
     void slotAnalyzerProgress(int progress);