Add a preference option for the order that tracks will be loaded in 4-deck skins

src/baseplayer.cpp

@@ -9,6 +9,6 @@ BasePlayer::~BasePlayer() {
 
 }
 
-const QString BasePlayer::getGroup() {
+const QString BasePlayer::getGroup() const {
     return m_group;
 }

src/baseplayer.h

@@ -10,7 +10,7 @@ class BasePlayer : public QObject {
     BasePlayer(QObject* pParent, QString group);
     virtual ~BasePlayer();
 
-    const QString getGroup();
+    const QString getGroup() const;
 
   private:
     const QString m_group;

src/dlgprefcontrols.cpp

@@ -195,6 +195,11 @@ DlgPrefControls::DlgPrefControls(QWidget * parent, MixxxApp * mixxx,
     ComboBoxAutoDjRequeue->setCurrentIndex(m_pConfig->getValueString(ConfigKey("[Auto DJ]", "Requeue")).toInt());
     connect(ComboBoxAutoDjRequeue, SIGNAL(activated(int)), this, SLOT(slotSetAutoDjRequeue(int)));
 
+    // Ordering of decks, if configurable
+    int deck_count = static_cast<int>(m_pNumDecks->get());
+    updateDeckOrderCombo(deck_count);
+    connect(ComboBoxDeckOrder, SIGNAL(activated(int)), this, SLOT(slotSetDeckOrder(int)));
+
 #ifdef __AUTODJCRATES__
 
     // The minimum available for randomly-selected tracks
@@ -448,6 +453,14 @@ void DlgPrefControls::slotSetAutoDjRequeue(int)
     m_pConfig->set(ConfigKey("[Auto DJ]", "Requeue"), ConfigValue(ComboBoxAutoDjRequeue->currentIndex()));
 }
 
+void DlgPrefControls::slotSetDeckOrder(int)
+{
+    QString deckorder = ComboBoxDeckOrder->currentText();
+    m_pConfig->set(ConfigKey("[Controls]", "DeckOrder"), ConfigValue(deckorder));
+    updateDeckOrderCombo(static_cast<int>(m_pNumDecks->get()));
+    m_pPlayerManager->setDeckOrder(deckorder);
+}
+
 void DlgPrefControls::slotSetAutoDjMinimumAvailable(int a_iValue) {
 #ifdef __AUTODJCRATES__
     QString str;
@@ -497,6 +510,8 @@ void DlgPrefControls::slotSetSkin(int)
     checkSkinResolution(ComboBoxSkinconf->currentText())
             ? warningLabel->hide() : warningLabel->show();
     slotUpdateSchemes();
+    const int deck_count = static_cast<int>(m_pNumDecks->get());
+    updateDeckOrderCombo(deck_count);
 }
 
 void DlgPrefControls::slotSetPositionDisplay(int)
@@ -596,6 +611,7 @@ void DlgPrefControls::slotApply()
     else
         m_pConfig->set(ConfigKey("[Controls]","RateDir"), ConfigValue(1));
 
+    slotSetDeckOrder(ComboBoxDeckOrder->currentIndex());
 }
 
 void DlgPrefControls::slotSetFrameRate(int frameRate) {
@@ -759,6 +775,7 @@ void DlgPrefControls::slotNumDecksChanged(double new_count) {
     m_iNumConfiguredDecks = numdecks;
     slotSetRateDir(m_pConfig->getValueString(ConfigKey("[Controls]","RateDir")).toInt());
     slotSetRateRange(m_pConfig->getValueString(ConfigKey("[Controls]","RateRange")).toInt());
+    updateDeckOrderCombo(numdecks);
 }
 
 void DlgPrefControls::slotNumSamplersChanged(double new_count) {
@@ -783,3 +800,46 @@ void DlgPrefControls::slotNumSamplersChanged(double new_count) {
     slotSetRateDir(m_pConfig->getValueString(ConfigKey("[Controls]","RateDir")).toInt());
     slotSetRateRange(m_pConfig->getValueString(ConfigKey("[Controls]","RateRange")).toInt());
 }
+
+void DlgPrefControls::updateDeckOrderCombo(int deck_count) {
+    // We always try to find the configured order because the skin deckcount value isn't set
+    // at construction time. We'll receive a signal when that value changes, this function
+    // will get called, and then we'll set the proper ordering. Since we update the config
+    // every time they change the value, this shouldn't cause weird overwrites.
+
+    // Temporarily, all 4-deck setups will use the same order
+    QString config_order;
+    if (deck_count == 4) {
+        config_order = "CABD";
+    } else {
+        config_order = PlayerManager::getDefaultOrder(deck_count).label;
+    }
+
+    // Eventually, load from config:
+    //QString config_order = m_pConfig->getValueString(ConfigKey("[Controls]", "DeckOrder"));
+    //textDeckOrder->setVisible(deck_count != 0);
+    //ComboBoxDeckOrder->setVisible(deck_count != 0);
+    ComboBoxDeckOrder->clear();
+    if (deck_count == 0) {
+        return;
+    }
+
+    int deckorder_index = -1;
+    int i = 0;
+    foreach(const PlayerManager::DeckOrderingManager::deck_order_t& order,
+            PlayerManager::getDeckOrderings(deck_count)) {
+        ComboBoxDeckOrder->addItem(order.label);
+        if (order.label == config_order) {
+            deckorder_index = i;
+        }
+        ++i;
+    }
+    if (deckorder_index >= 0) {
+        ComboBoxDeckOrder->setCurrentIndex(deckorder_index);
+        if (ComboBoxDeckOrder->currentText() != config_order) {
+            m_pConfig->set(ConfigKey("[Controls]", "DeckOrder"),
+                           ConfigValue(ComboBoxDeckOrder->currentText()));
+        }
+        m_pPlayerManager->setDeckOrder(config_order);
+    }
+}

src/dlgprefcontrols.h

@@ -67,11 +67,11 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     void slotSetAutoDjMinimumAvailable(int);
     void slotSetAutoDjUseIgnoreTime(int);
     void slotSetAutoDjIgnoreTime(const QTime &a_rTime);
+    void slotSetDeckOrder(int);
     void slotSetRateRamp(bool);
     void slotSetRateRampSensitivity(int);
     void slotSetLocale(int);
 
-
     void slotSetFrameRate(int frameRate);
     void slotSetWaveformType(int index);
     void slotSetWaveformOverviewType(int index);
@@ -84,13 +84,15 @@ class DlgPrefControls : public DlgPreferencePage, public Ui::DlgPrefControlsDlg
     void slotSetNormalizeOverview( bool normalize);
     void slotWaveformMeasured(float frameRate, int rtErrorCnt);
 
+  private slots:
     void slotNumDecksChanged(double);
     void slotNumSamplersChanged(double);
 
   private:
     void initWaveformControl();
     void notifyRebootNecessary();
     bool checkSkinResolution(QString skin);
+    void updateDeckOrderCombo(int deck_count);
 
     ConfigObject<ConfigValue>* m_pConfig;
     ControlObject* m_pControlPositionDisplay;

src/dlgprefcontrolsdlg.ui

@@ -80,7 +80,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="TextLabel6_2_2_3">
        <property name="enabled">
         <bool>true</bool>
@@ -99,7 +99,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1" colspan="2">
+     <item row="4" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxPosition">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -112,7 +112,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="TextLabel6_2_2_3_2">
        <property name="enabled">
         <bool>true</bool>
@@ -131,7 +131,7 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1" colspan="2">
+     <item row="5" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxTooltips">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -144,7 +144,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="TextLabel6">
        <property name="enabled">
         <bool>true</bool>
@@ -163,7 +163,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="1" colspan="2">
+     <item row="6" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxRateRange">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -176,7 +176,7 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="7" column="0">
       <widget class="QLabel" name="TextLabel6_2">
        <property name="enabled">
         <bool>true</bool>
@@ -195,7 +195,7 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="1" colspan="2">
+     <item row="7" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxRateDir">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -208,7 +208,23 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="0">
+     <item row="3" column="1" colspan="2">
+      <widget class="QComboBox" name="ComboBoxDeckOrder"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="textDeckOrder">
+       <property name="text">
+        <string>Deck track load order</string>
+       </property>
+       <property name="buddy">
+        <cstring>ComboBoxDeckOrder</cstring>
+       </property>
+       <property name="visible">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="0">
       <widget class="QLabel" name="textLabelAllowTrackLoadToPlayingDeck">
        <property name="text">
         <string>Track load behavior</string>
@@ -218,10 +234,10 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="1" colspan="2">
+     <item row="10" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxAllowTrackLoadToPlayingDeck"/>
      </item>
-     <item row="8" column="0">
+     <item row="9" column="0">
       <widget class="QLabel" name="labelCueBehaviour">
        <property name="text">
         <string>Cue behavior</string>
@@ -231,10 +247,10 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="1" colspan="2">
+     <item row="9" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxCueDefault"/>
      </item>
-     <item row="7" column="0">
+     <item row="8" column="0">
       <widget class="QLabel" name="textLabelCueRecall">
        <property name="text">
         <string>Auto Recall Cue</string>
@@ -244,10 +260,10 @@
        </property>
       </widget>
      </item>
-     <item row="7" column="1" colspan="2">
+     <item row="8" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxCueRecall"/>
      </item>
-     <item row="10" column="0">
+     <item row="11" column="0">
       <widget class="QLabel" name="textAutoDjRequeue">
        <property name="text">
         <string>Re-queue tracks in Auto DJ</string>
@@ -257,10 +273,10 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="1" colspan="2">
+     <item row="11" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxAutoDjRequeue"/>
      </item>
-     <item row="13" column="0">
+     <item row="14" column="0">
       <widget class="QLabel" name="textLabelLocale">
        <property name="text">
         <string>Locale</string>
@@ -270,7 +286,7 @@
        </property>
       </widget>
      </item>
-     <item row="13" column="1" colspan="2">
+     <item row="14" column="1" colspan="2">
       <widget class="QComboBox" name="ComboBoxLocale"/>
      </item>
      <item row="1" column="1" colspan="2">
@@ -283,14 +299,14 @@
        </property>
       </widget>
      </item>
-     <item row="11" column="0">
+    <item row="12" column="0">
       <widget class="QLabel" name="autoDjMinimumAvailableLabel">
        <property name="text">
         <string>Auto DJ: Minimum available tracks [%]</string>
        </property>
       </widget>
      </item>
-     <item row="11" column="1" colspan="2">
+     <item row="12" column="1" colspan="2">
       <widget class="QSpinBox" name="autoDjMinimumAvailableSpinBox">
        <property name="toolTip">
         <string>This percentage of tracks are always available for selecting, regardless of when they were last played.</string>
@@ -303,7 +319,7 @@
        </property>
       </widget>
      </item>
-     <item row="12" column="0">
+     <item row="13" column="0">
       <widget class="QCheckBox" name="autoDjIgnoreTimeCheckBox">
        <property name="toolTip">
         <string>Uncheck, to ignore all played tracks.</string>
@@ -313,7 +329,7 @@
        </property>
       </widget>
      </item>
-     <item row="12" column="1" colspan="2">
+     <item row="13" column="1" colspan="2">
       <widget class="QTimeEdit" name="autoDjIgnoreTimeEdit">
        <property name="toolTip">
         <string>Duration after which a track is eligible for selection by Auto DJ again</string>