make better use of intro/outro markers with AutoDJ

src/engine/controls/cuecontrol.cpp

@@ -56,7 +56,9 @@ CueControl::CueControl(QString group,
 
     m_pCueMode = new ControlObject(ConfigKey(group, "cue_mode"));
 
-    m_pSeekOnLoadMode = new ControlObject(ConfigKey(group, "seekonload_mode"));
+    m_pSeekOnLoadModeAutoDjOverride = new ControlObject(ConfigKey(group, "seekonload_mode_autodj"));
+    m_pSeekOnLoadModeAutoDjOverride->set(static_cast<double>(
+            static_cast<int>(SeekOnLoadMode::UsePreference)));
 
     m_pCueSet = new ControlPushButton(ConfigKey(group, "cue_set"));
     m_pCueSet->setButtonMode(ControlPushButton::TRIGGER);
@@ -207,7 +209,7 @@ CueControl::CueControl(QString group,
 CueControl::~CueControl() {
     delete m_pCuePoint;
     delete m_pCueMode;
-    delete m_pSeekOnLoadMode;
+    delete m_pSeekOnLoadModeAutoDjOverride;
     delete m_pCueSet;
     delete m_pCueClear;
     delete m_pCueGoto;
@@ -347,29 +349,26 @@ void CueControl::trackLoaded(TrackPointer pNewTrack) {
     loadCuesFromTrack();
 
     // Seek track according to SeekOnLoadMode.
-    SeekOnLoadMode seekOnLoadMode = getSeekOnLoadMode();
+    SeekOnLoadMode seekOnLoadMode = getSeekOnLoadModeAutoDjOverride();
+    if (seekOnLoadMode == SeekOnLoadMode::UsePreference) {
+        seekOnLoadMode = getSeekOnLoadPreference();
+    }
     switch (seekOnLoadMode) {
-    case SEEK_ON_LOAD_ZERO_POS:
-        seekExact(0.0);
+    case SeekOnLoadMode::Beginning:
+        // This allows users to load tracks and have the needle-drop be maintained.
+        if (!(m_pVinylControlEnabled->get() &&
+                m_pVinylControlMode->get() == MIXXX_VCMODE_ABSOLUTE)) {
+            seekExact(0.0);
+        }
         break;
-    case SEEK_ON_LOAD_MAIN_CUE:
+    case SeekOnLoadMode::MainCue:
         seekExact(m_pCuePoint->get());
         break;
-    case SEEK_ON_LOAD_INTRO_CUE:
+    case SeekOnLoadMode::IntroStart:
         seekExact(m_pIntroStartPosition->get());
         break;
     default:
-        // Respect cue recall preference option.
-        if (isCueRecallEnabled() && m_pCuePoint->get() != -1.0) {
-            // If cue recall is ON and main cue point is set, seek to it.
-            seekExact(m_pCuePoint->get());
-        } else if (!(m_pVinylControlEnabled->get() &&
-                     m_pVinylControlMode->get() == MIXXX_VCMODE_ABSOLUTE)) {
-            // Otherwise, seek to zero unless vinylcontrol is on and
-            // set to absolute. This allows users to load tracks and
-            // have the needle-drop be maintained.
-            seekExact(0.0);
-        }
+        seekExact(0.0);
         break;
     }
 }
@@ -491,16 +490,16 @@ void CueControl::reloadCuesFromTrack() {
     double intro = m_pIntroStartPosition->get();
 
     // Make track follow the updated cues.
-    SeekOnLoadMode seekOnLoadMode = getSeekOnLoadMode();
-    if (seekOnLoadMode == SEEK_ON_LOAD_DEFAULT) {
-        if ((trackAt == TrackAt::Cue || wasTrackAtZeroPos) && cue != -1.0 && isCueRecallEnabled()) {
-            seekExact(cue);
-        }
-    } else if (seekOnLoadMode == SEEK_ON_LOAD_MAIN_CUE) {
+    SeekOnLoadMode seekOnLoadMode = getSeekOnLoadModeAutoDjOverride();
+    if (seekOnLoadMode == SeekOnLoadMode::UsePreference) {
+        seekOnLoadMode = getSeekOnLoadPreference();
+    }
+
+    if (seekOnLoadMode == SeekOnLoadMode::MainCue) {
         if ((trackAt == TrackAt::Cue || wasTrackAtZeroPos) && cue != -1.0) {
             seekExact(cue);
         }
-    } else if (seekOnLoadMode == SEEK_ON_LOAD_INTRO_CUE) {
+    } else if (seekOnLoadMode == SeekOnLoadMode::IntroStart) {
         if ((wasTrackAtIntroCue || wasTrackAtZeroPos) && intro != -1.0) {
             seekExact(intro);
         }
@@ -1631,13 +1630,14 @@ bool CueControl::isPlayingByPlayButton() {
             !m_iCurrentlyPreviewingHotcues && !m_bPreviewing;
 }
 
-bool CueControl::isCueRecallEnabled() {
-    // Note that [Controls],CueRecall == 0 corresponds to "ON", not "OFF".
-    return getConfig()->getValue(ConfigKey("[Controls]", "CueRecall"), 0) == 0;
+SeekOnLoadMode CueControl::getSeekOnLoadPreference() {
+    int configValue = getConfig()->getValue(ConfigKey("[Controls]", "CueRecall"),
+                                            static_cast<int>(SeekOnLoadMode::IntroStart));
+    return static_cast<SeekOnLoadMode>(configValue);
 }
 
-SeekOnLoadMode CueControl::getSeekOnLoadMode() {
-    return seekOnLoadModeFromDouble(m_pSeekOnLoadMode->get());
+SeekOnLoadMode CueControl::getSeekOnLoadModeAutoDjOverride() {
+    return seekOnLoadModeFromDouble(m_pSeekOnLoadModeAutoDjOverride->get());
 }
 
 

src/engine/controls/cuecontrol.h

@@ -18,21 +18,17 @@ class ControlObject;
 class ControlPushButton;
 class ControlIndicator;
 
-enum SeekOnLoadMode {
-    SEEK_ON_LOAD_DEFAULT = 0,  // Use CueRecall preference setting
-    SEEK_ON_LOAD_ZERO_POS = 1,  // Use 0:00.000
-    SEEK_ON_LOAD_MAIN_CUE = 2,  // Use main cue point
-    SEEK_ON_LOAD_INTRO_CUE = 3,  // Use intro cue point
-    SEEK_ON_LOAD_NUM_MODES
+// This enum class is shared between the preference option in DlgPrefDeck
+// and AutoDJ's override of that option from AutoDJProcessor.
+enum class SeekOnLoadMode {
+    MainCue = 0,  // Use main cue point
+    Beginning = 1,  // Use 0:00.000
+    IntroStart = 2,  // Use intro start cue point
+    UsePreference = 3,  // Use CueRecall preference setting
 };
 
 inline SeekOnLoadMode seekOnLoadModeFromDouble(double value) {
-    // msvs does not allow to cast from double to an enum
-    SeekOnLoadMode mode = static_cast<SeekOnLoadMode>(int(value));
-    if (mode >= SEEK_ON_LOAD_NUM_MODES || mode < 0) {
-        return SEEK_ON_LOAD_DEFAULT;
-    }
-    return mode;
+    return static_cast<SeekOnLoadMode>(int(value));;
 }
 
 class HotcueControl : public QObject {
@@ -126,9 +122,9 @@ class CueControl : public EngineControl {
     void resetIndicators();
     bool isPlayingByPlayButton();
     bool getPlayFlashingAtPause();
-    bool isCueRecallEnabled();
+    SeekOnLoadMode getSeekOnLoadPreference();
     void trackLoaded(TrackPointer pNewTrack) override;
-    SeekOnLoadMode getSeekOnLoadMode();
+    SeekOnLoadMode getSeekOnLoadModeAutoDjOverride();
 
   private slots:
     void quantizeChanged(double v);
@@ -210,7 +206,7 @@ class CueControl : public EngineControl {
     ControlObject* m_pTrackSamples;
     ControlObject* m_pCuePoint;
     ControlObject* m_pCueMode;
-    ControlObject* m_pSeekOnLoadMode;
+    ControlObject* m_pSeekOnLoadModeAutoDjOverride;
     ControlPushButton* m_pCueSet;
     ControlPushButton* m_pCueClear;
     ControlPushButton* m_pCueCDJ;