Merge pull request #2103 from Be-ing/autodj_intro_outro

make better use of intro/outro markers with AutoDJ

3 files changed, 9 insertions, 10 deletions

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 0f2db81ada..5d8e7d1164 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -52,7 +52,7 @@ WaveformMark::WaveformMark(const QString& group,
                            int hotCue)
         : m_iHotCue(hotCue) {
     QString control;
-    if (hotCue != kNoHotCue) {
+    if (hotCue != Cue::kNoHotCue) {
         control = "hotcue_" + QString::number(hotCue + 1) + "_position";
     } else {
         control = context.selectString(node, "Control");
@@ -88,7 +88,7 @@ WaveformMark::WaveformMark(const QString& group,
     m_align = decodeAlignmentFlags(markAlign, Qt::AlignBottom | Qt::AlignHCenter);
 
     // Hotcue text is set by the cue's label in the database, not by the skin.
-    if (hotCue == WaveformMark::kNoHotCue) {
+    if (hotCue == Cue::kNoHotCue) {
         m_text = context.selectString(node, "Text");
     }
 
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index ab11862df1..caf652adaa 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -4,11 +4,11 @@
 #include <QDomNode>
 #include <QImage>
 
-#include "waveform/waveformmarklabel.h"
+#include "control/controlobject.h"
 #include "control/controlproxy.h"
+#include "track/cue.h"
 #include "util/memory.h"
-
-#include "control/controlobject.h"
+#include "waveform/waveformmarklabel.h"
 
 class SkinContext;
 class WaveformSignalColors;
@@ -17,13 +17,12 @@ class WOverview;
 
 class WaveformMark {
   public:
-    static const int kNoHotCue = -1;
     WaveformMark(
             const QString& group,
             const QDomNode& node,
             const SkinContext& context,
             const WaveformSignalColors& signalColors,
-            int hotCue = kNoHotCue);
+            int hotCue = Cue::kNoHotCue);
 
     // Disable copying
     WaveformMark(const WaveformMark&) = delete;
@@ -99,9 +98,9 @@ inline bool operator<(const WaveformMarkPointer& lhs, const WaveformMarkPointer&
     if (leftPosition == rightPosition) {
         // Sort WaveformMarks without hotcues before those with hotcues;
         // if both have hotcues, sort numerically by hotcue number.
-        if (leftHotcue == WaveformMark::kNoHotCue && rightHotcue != WaveformMark::kNoHotCue) {
+        if (leftHotcue == Cue::kNoHotCue && rightHotcue != Cue::kNoHotCue) {
             return true;
-        } else if (leftHotcue != WaveformMark::kNoHotCue && rightHotcue == WaveformMark::kNoHotCue) {
+        } else if (leftHotcue != Cue::kNoHotCue && rightHotcue == Cue::kNoHotCue) {
             return false;
         } else {
             return leftHotcue < rightHotcue;
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index a5d4926318..1d338688e0 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -116,7 +116,7 @@ void WaveformRenderMark::slotCuesUpdated() {
     QList<CuePointer> loadedCues = trackInfo->getCuePoints();
     for (const CuePointer pCue: loadedCues) {
         int hotCue = pCue->getHotCue();
-        if (hotCue == WaveformMark::kNoHotCue) {
+        if (hotCue == Cue::kNoHotCue) {
             continue;
         }