make better use of intro/outro markers with AutoDJ

src/library/autodj/autodjprocessor.cpp

@@ -104,8 +104,7 @@ AutoDJProcessor::AutoDJProcessor(QObject* pParent,
           m_pPlayerManager(pPlayerManager),
           m_pAutoDJTableModel(NULL),
           m_eState(ADJ_DISABLED),
-          m_transitionTime(kTransitionPreferenceDefault),
-          m_bUseIntroOutro(true) {
+          m_transitionTime(kTransitionPreferenceDefault) {
     m_pAutoDJTableModel = new PlaylistTableModel(this, pTrackCollection,
                                                  "mixxx.db.model.autodj");
     m_pAutoDJTableModel->setTableModel(iAutoDJPlaylistId);
@@ -157,8 +156,10 @@ AutoDJProcessor::AutoDJProcessor(QObject* pParent,
         m_transitionTime = str_autoDjTransition.toDouble();
     }
 
-    m_bUseIntroOutro = m_pConfig->getValue(
-            ConfigKey(kConfigKey, kUseIntroOutroPreferenceName), true);
+    int configMode = m_pConfig->getValue(
+            ConfigKey(kConfigKey, kUseIntroOutroPreferenceName),
+            static_cast<int>(IntroOutroUsage::Shorter));
+    m_useIntroOutroMode = static_cast<IntroOutroUsage>(configMode);
 }
 
 AutoDJProcessor::~AutoDJProcessor() {
@@ -876,29 +877,27 @@ void AutoDJProcessor::calculateTransition(DeckAttributes* pFromDeck,
 
     double toTrackIntroLength = toTrackIntroEnd - toTrackIntroStart;
 
-    if (m_bUseIntroOutro) {
+    if (m_useIntroOutroMode != IntroOutroUsage::None) {
         if (fromTrackOutroLength > 0 && toTrackIntroLength > 0) {
             if (fromTrackOutroLength > toTrackIntroLength) {
-                pFromDeck->posThreshold = fromTrackOutroStart;
-                if (fromTrackOutroLength < toTrackDuration) {
-                    pFromDeck->fadeDuration = fromTrackOutroLength;
-                } else {
-                    pFromDeck->fadeDuration = toTrackDuration;
+                if (m_useIntroOutroMode == IntroOutroUsage::Longer) {
+                    useOutroFadeTime(pFromDeck, fromTrackOutroStart,
+                                     fromTrackOutroLength, toTrackDuration);
+                } else if (m_useIntroOutroMode == IntroOutroUsage::Shorter) {
+                    useIntroFadeTime(pFromDeck, fromTrackOutroEnd, toTrackIntroLength);
                 }
             } else if (fromTrackOutroLength < toTrackIntroLength) {
-                pFromDeck->posThreshold = fromTrackDuration - toTrackIntroLength;
-                pFromDeck->fadeDuration = toTrackIntroLength;
+                if (m_useIntroOutroMode == IntroOutroUsage::Longer) {
+                    useIntroFadeTime(pFromDeck, fromTrackOutroEnd, toTrackIntroLength);
+                } else if (m_useIntroOutroMode == IntroOutroUsage::Shorter) {
+                    useOutroFadeTime(pFromDeck, fromTrackOutroStart,
+                                     fromTrackOutroLength, toTrackDuration);
+                }
             }
         } else if (fromTrackOutroLength > 0 && toTrackIntroLength <= 0) {
-            pFromDeck->posThreshold = fromTrackOutroStart;
-            if (fromTrackOutroLength < toTrackDuration) {
-                pFromDeck->fadeDuration = fromTrackOutroLength;
-            } else {
-                pFromDeck->fadeDuration = toTrackDuration;
-            }
+            useOutroFadeTime(pFromDeck, fromTrackOutroStart, fromTrackOutroLength, toTrackDuration);
         } else if (fromTrackOutroLength <= 0 && toTrackIntroLength > 0) {
-            pFromDeck->posThreshold = fromTrackDuration - toTrackIntroLength;
-            pFromDeck->fadeDuration = toTrackIntroLength;
+            useIntroFadeTime(pFromDeck, fromTrackOutroEnd, toTrackIntroLength);
         } else {
             double transitionTime = m_transitionTime;
             if (m_transitionTime > toTrackDuration) {
@@ -944,6 +943,22 @@ void AutoDJProcessor::calculateTransition(DeckAttributes* pFromDeck,
     pToDeck->startPos /= toTrackDuration;
 }
 
+void AutoDJProcessor::useOutroFadeTime(DeckAttributes* pFromDeck, double fromTrackOutroStart,
+                                       double fromTrackOutroLength, double toTrackDuration) {
+    pFromDeck->posThreshold = fromTrackOutroStart;
+    if (fromTrackOutroLength < toTrackDuration) {
+        pFromDeck->fadeDuration = fromTrackOutroLength;
+    } else {
+        pFromDeck->fadeDuration = toTrackDuration;
+    }
+}
+
+void AutoDJProcessor::useIntroFadeTime(DeckAttributes* pFromDeck, double fromTrackOutroEnd,
+                                       double toTrackIntroLength) {
+    pFromDeck->posThreshold = fromTrackOutroEnd - toTrackIntroLength;
+    pFromDeck->fadeDuration = toTrackIntroLength;
+}
+
 void AutoDJProcessor::playerTrackLoaded(DeckAttributes* pDeck, TrackPointer pTrack) {
     if (sDebug) {
         qDebug() << this << "playerTrackLoaded" << pDeck->group
@@ -1038,10 +1053,10 @@ void AutoDJProcessor::setTransitionTime(int time) {
     }
 }
 
-void AutoDJProcessor::setUseIntroOutro(bool checkboxState) {
+void AutoDJProcessor::setUseIntroOutro(int checkboxState) {
     m_pConfig->set(ConfigKey(kConfigKey, kUseIntroOutroPreferenceName),
                    ConfigValue(checkboxState));
-    m_bUseIntroOutro = checkboxState;
+    m_useIntroOutroMode = static_cast<IntroOutroUsage>(checkboxState);
     // Then re-calculate fade thresholds for the decks.
     if (m_eState == ADJ_IDLE) {
         DeckAttributes& leftDeck = *m_decks[0];

src/library/autodj/autodjprocessor.h

@@ -161,6 +161,12 @@ class AutoDJProcessor : public QObject {
         ADJ_NOT_TWO_DECKS
     };
 
+    enum class IntroOutroUsage {
+        None = 0,
+        Shorter = 1,
+        Longer = 2
+    };
+
     AutoDJProcessor(QObject* pParent,
                     UserSettingsPointer pConfig,
                     PlayerManagerInterface* pPlayerManager,
@@ -176,8 +182,8 @@ class AutoDJProcessor : public QObject {
         return m_transitionTime;
     }
 
-    bool getUseIntroOutro() const {
-        return m_bUseIntroOutro;
+    IntroOutroUsage getUseIntroOutro() const {
+        return m_useIntroOutroMode;
     }
 
     PlaylistTableModel* getTableModel() const {
@@ -189,7 +195,7 @@ class AutoDJProcessor : public QObject {
   public slots:
     void setTransitionTime(int seconds);
 
-    void setUseIntroOutro(bool checkboxState);
+    void setUseIntroOutro(int checkboxState);
 
     AutoDJError shufflePlaylist(const QModelIndexList& selectedIndices);
     AutoDJError skipNext();
@@ -247,6 +253,10 @@ class AutoDJProcessor : public QObject {
     bool loadNextTrackFromQueue(const DeckAttributes& pDeck, bool play = false);
     void calculateTransition(DeckAttributes* pFromDeck,
                              DeckAttributes* pToDeck);
+    void useOutroFadeTime(DeckAttributes* pFromDeck, double fromTrackOutroStart,
+                          double fromTrackOutroLength, double toTrackDuration);
+    void useIntroFadeTime(DeckAttributes* pFromDeck, double fromTrackOutroEnd,
+                          double toTrackIntroLength);
     DeckAttributes* getOtherDeck(DeckAttributes* pFromDeck,
                                  bool playing = false);
 
@@ -264,7 +274,7 @@ class AutoDJProcessor : public QObject {
 
     AutoDJState m_eState;
     double m_transitionTime; // the desired value set by the user
-    bool m_bUseIntroOutro;
+    IntroOutroUsage m_useIntroOutroMode;
 
     QList<DeckAttributes*> m_decks;
 

src/library/autodj/dlgautodj.cpp

@@ -74,8 +74,14 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent,
     connect(pushButtonAutoDJ, SIGNAL(toggled(bool)),
             this, SLOT(toggleAutoDJButton(bool)));
 
-    introOutroCheckbox->setChecked(m_pAutoDJProcessor->getUseIntroOutro());
-    connect(introOutroCheckbox, &QCheckBox::stateChanged,
+    introOutroCombobox->addItem(tr("Do not use intro/outro markers"),
+                                static_cast<int>(AutoDJProcessor::IntroOutroUsage::None));
+    introOutroCombobox->addItem(tr("Use intro/outro for transition time (whichever is shorter)"),
+                                static_cast<int>(AutoDJProcessor::IntroOutroUsage::Shorter));
+    introOutroCombobox->addItem(tr("Use intro/outro for transition time (whichever is longer)"),
+                                static_cast<int>(AutoDJProcessor::IntroOutroUsage::Longer));
+    introOutroCombobox->setCurrentIndex(static_cast<int>(m_pAutoDJProcessor->getUseIntroOutro()));
+    connect(introOutroCombobox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             m_pAutoDJProcessor, &AutoDJProcessor::setUseIntroOutro);
 
     // Setup DlgAutoDJ UI based on the current AutoDJProcessor state. Keep in

src/library/autodj/dlgautodj.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>879</width>
+    <width>913</width>
     <height>399</height>
    </rect>
   </property>
@@ -139,17 +139,7 @@ If no track sources are configured, the track is added from the library instead.
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="introOutroCheckbox">
-       <property name="text">
-        <string>Use intro/outro markers</string>
-       </property>
-       <property name="toolTip">
-         <string>Use the intro of the incoming track or the
-outro of the outgoing track for the transition time,
-whichever is longer. If neither track has an intro or outro marked,
-fall back to the specified transition time.</string>
-       </property>
-      </widget>
+      <widget class="QComboBox" name="introOutroCombobox"/>
      </item>
      <item>
       <spacer name="horizontalSpacer">