Merge branch 'autodj-orientation-main' into huxley-hacks-shared-data-2

Author: ywwg

src/library/autodj/autodjprocessor.cpp

@@ -57,6 +57,7 @@ DeckAttributes::DeckAttributes(int index,
     m_outroStartPos.connectValueChanged(this, &DeckAttributes::slotOutroStartPositionChanged);
     m_outroEndPos.connectValueChanged(this, &DeckAttributes::slotOutroEndPositionChanged);
     m_rateRatio.connectValueChanged(this, &DeckAttributes::slotRateChanged);
+    m_orientation.connectValueChanged(this, &DeckAttributes::slotOrientationChanged);
 }
 
 DeckAttributes::~DeckAttributes() {
@@ -104,6 +105,11 @@ void DeckAttributes::slotRateChanged(double v) {
     emit rateChanged(this);
 }
 
+void DeckAttributes::slotOrientationChanged(double v) {
+    Q_UNUSED(v);
+    emit orientationChanged(this);
+}
+
 TrackPointer DeckAttributes::getLoadedTrack() const {
     return m_pPlayer != nullptr ? m_pPlayer->getLoadedTrack() : TrackPointer();
 }
@@ -551,6 +557,16 @@ AutoDJProcessor::AutoDJError AutoDJProcessor::toggleAutoDJ(bool enable) {
                 &DeckAttributes::rateChanged,
                 this,
                 &AutoDJProcessor::playerRateChanged);
+
+        connect(pLeftDeck,
+                &DeckAttributes::orientationChanged,
+                this,
+                &AutoDJProcessor::playerOrientationChanged);
+        connect(pRightDeck,
+                &DeckAttributes::orientationChanged,
+                this,
+                &AutoDJProcessor::playerOrientationChanged);
+
         connect(m_pAutoDJTableModel,
                 &PlaylistTableModel::firstTrackChanged,
                 this,
@@ -1701,6 +1717,19 @@ void AutoDJProcessor::playerRateChanged(DeckAttributes* pAttributes) {
     calculateTransition(fromDeck, getOtherDeck(fromDeck), false);
 }
 
+void AutoDJProcessor::playerOrientationChanged(DeckAttributes* pAttributes) {
+    if constexpr (sDebug) {
+        qDebug() << this << "playerOrientationChanged" << pAttributes->group;
+    }
+
+    if (m_eState != ADJ_DISABLED) {
+        // Disable and Enable auto DJ.  We will likely fail to enable auto DJ
+        // but that will pop up an error to explain the situation to the user.
+        toggleAutoDJ(false);
+        toggleAutoDJ(true);
+    }
+}
+
 void AutoDJProcessor::playlistFirstTrackChanged() {
     if constexpr (sDebug) {
         qDebug() << this << "playlistFirstTrackChanged";

src/library/autodj/autodjprocessor.h

@@ -101,6 +101,7 @@ class DeckAttributes : public QObject {
     void loadingTrack(DeckAttributes* pDeck, TrackPointer pNewTrack, TrackPointer pOldTrack);
     void playerEmpty(DeckAttributes* pDeck);
     void rateChanged(DeckAttributes* pDeck);
+    void orientationChanged(DeckAttributes* pDeck);
 
   private slots:
     void slotPlayPosChanged(double v);
@@ -113,6 +114,7 @@ class DeckAttributes : public QObject {
     void slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack);
     void slotPlayerEmpty();
     void slotRateChanged(double v);
+    void slotOrientationChanged(double v);
 
   public:
     int index;
@@ -227,6 +229,7 @@ class AutoDJProcessor : public QObject {
     void playerLoadingTrack(DeckAttributes* pDeck, TrackPointer pNewTrack, TrackPointer pOldTrack);
     void playerEmpty(DeckAttributes* pDeck);
     void playerRateChanged(DeckAttributes* pDeck);
+    void playerOrientationChanged(DeckAttributes* pDeck);
     void playlistFirstTrackChanged();
 
     void controlEnableChangeRequest(double value);