Preferences fixes

build/depends.py

@@ -670,11 +670,12 @@ def sources(self, build):
 
                    "preferences/configobject.cpp",
                    "preferences/dialog/dlgprefautodj.cpp",
-                   "preferences/dialog/dlgprefcontrols.cpp",
+                   "preferences/dialog/dlgprefdeck.cpp",
                    "preferences/dialog/dlgprefcrossfader.cpp",
                    "preferences/dialog/dlgprefeffects.cpp",
                    "preferences/dialog/dlgprefeq.cpp",
                    "preferences/dialog/dlgpreferences.cpp",
+                   "preferences/dialog/dlgprefinterface.cpp",
                    "preferences/dialog/dlgpreflibrary.cpp",
                    "preferences/dialog/dlgprefnovinyl.cpp",
                    "preferences/dialog/dlgprefrecord.cpp",
@@ -1200,11 +1201,12 @@ def sources(self, build):
             'library/recording/dlgrecording.ui',
             'preferences/dialog/dlgprefautodjdlg.ui',
             'preferences/dialog/dlgprefbeatsdlg.ui',
-            'preferences/dialog/dlgprefcontrolsdlg.ui',
+            'preferences/dialog/dlgprefdeckdlg.ui',
             'preferences/dialog/dlgprefcrossfaderdlg.ui',
             'preferences/dialog/dlgprefeffectsdlg.ui',
             'preferences/dialog/dlgprefeqdlg.ui',
             'preferences/dialog/dlgpreferencesdlg.ui',
+            'preferences/dialog/dlgprefinterfacedlg.ui',
             'preferences/dialog/dlgprefkeydlg.ui',
             'preferences/dialog/dlgpreflibrarydlg.ui',
             'preferences/dialog/dlgprefnovinyldlg.ui',

res/mixxx.qrc

@@ -31,6 +31,7 @@
         <file>images/preferences/ic_preferences_broadcast.png</file>
         <file>images/preferences/ic_preferences_controllers.png</file>
         <file>images/preferences/ic_preferences_crossfader.png</file>
+        <file>images/preferences/ic_preferences_decks.png</file>
         <file>images/preferences/ic_preferences_effects.png</file>
         <file>images/preferences/ic_preferences_equalizers.png</file>
         <file>images/preferences/ic_preferences_interface.png</file>

src/engine/ratecontrol.cpp

@@ -17,18 +17,16 @@
 
 #include <QtDebug>
 
-// Static default values for rate buttons (percents). Note that these are not
-// actually used -- the preferences code sets the values that are stored in the
-// user's configuration. These are just fail safe defaults.
-double RateControl::m_dTemp = 4.00; //(eg. 4.00%)
-double RateControl::m_dTempSmall = 2.00;
-double RateControl::m_dPerm = 0.50;
-double RateControl::m_dPermSmall = 0.05;
-
-int RateControl::m_iRateRampSensitivity = 250;
+// Static default values for rate buttons (percents)
+double RateControl::m_dTemporaryRateChangeCoarse;
+double RateControl::m_dTemporaryRateChangeFine;
+double RateControl::m_dPermanentRateChangeCoarse;
+double RateControl::m_dPermanentRateChangeFine;
+int RateControl::m_iRateRampSensitivity;
+enum RateControl::RampMode RateControl::m_eRateRampMode;
+
 const double RateControl::kWheelMultiplier = 40.0;
 const double RateControl::kPausedJogMultiplier = 18.0;
-enum RateControl::RATERAMP_MODE RateControl::m_eRateRampMode = RateControl::RATERAMP_STEP;
 
 RateControl::RateControl(QString group,
                          UserSettingsPointer pConfig)
@@ -44,7 +42,7 @@ RateControl::RateControl(QString group,
     m_pScratchController = new PositionScratchController(group);
 
     m_pRateDir = new ControlObject(ConfigKey(group, "rate_dir"));
-    m_pRateRange = new ControlObject(ConfigKey(group, "rateRange"));
+    m_pRateRange = new ControlPotmeter(ConfigKey(group, "rateRange"), 0.01, 0.90);
     // Allow rate slider to go out of bounds so that master sync rate
     // adjustments are not capped.
     m_pRateSlider = new ControlPotmeter(ConfigKey(group, "rate"),
@@ -161,14 +159,15 @@ RateControl::RateControl(QString group,
     // FIXME: This should be dependent on sample rate/block size or something
     m_pJogFilter->setFilterLength(25);
 
-    // Update Internal Settings
-    // Set Pitchbend Mode
-    m_eRateRampMode = (RateControl::RATERAMP_MODE)
-            getConfig()->getValueString(ConfigKey("[Controls]","RateRamp")).toInt();
+//     // Update Internal Settings
+//     // Set Pitchbend Mode
+//     m_eRateRampMode = static_cast<RampMode>(
+//         getConfig()->getValue(ConfigKey("[Controls]","RateRamp"),
+//                               static_cast<int>(RampMode::Stepping)));
 
-    // Set the Sensitivity
-    m_iRateRampSensitivity =
-            getConfig()->getValueString(ConfigKey("[Controls]","RateRampSensitivity")).toInt();
+//     // Set the Sensitivity
+//     m_iRateRampSensitivity =
+//             getConfig()->getValueString(ConfigKey("[Controls]","RateRampSensitivity")).toInt();
 
     m_pSyncMode = new ControlProxy(group, "sync_mode", this);
 }
@@ -209,15 +208,17 @@ void RateControl::setBpmControl(BpmControl* bpmcontrol) {
 }
 
 //static
-void RateControl::setRateRamp(bool linearMode)
-{
-    m_eRateRampMode = linearMode ?
-            RateControl::RATERAMP_LINEAR : RateControl::RATERAMP_STEP;
+void RateControl::setRateRampMode(RampMode mode) {
+    m_eRateRampMode = mode;
 }
 
 //static
-void RateControl::setRateRampSensitivity(int sense)
-{
+RateControl::RampMode RateControl::getRateRampMode() {
+    return m_eRateRampMode;
+}
+
+//static
+void RateControl::setRateRampSensitivity(int sense) {
     // Reverse the actual sensitivity value passed.
     // That way the gui works in an intuitive manner.
     sense = RATE_SENSITIVITY_MAX - sense + RATE_SENSITIVITY_MIN;
@@ -231,23 +232,43 @@ void RateControl::setRateRampSensitivity(int sense)
 }
 
 //static
-void RateControl::setTemp(double v) {
-    m_dTemp = v;
+void RateControl::setTemporaryRateChangeCoarseAmount(double v) {
+    m_dTemporaryRateChangeCoarse = v;
 }
 
 //static
-void RateControl::setTempSmall(double v) {
-    m_dTempSmall = v;
+void RateControl::setTemporaryRateChangeFineAmount(double v) {
+    m_dTemporaryRateChangeFine = v;
 }
 
 //static
-void RateControl::setPerm(double v) {
-    m_dPerm = v;
+void RateControl::setPermanentRateChangeCoarseAmount(double v) {
+    m_dPermanentRateChangeCoarse = v;
 }
 
 //static
-void RateControl::setPermSmall(double v) {
-    m_dPermSmall = v;
+void RateControl::setPermanentRateChangeFineAmount(double v) {
+    m_dPermanentRateChangeFine = v;
+}
+
+//static
+double RateControl::getTemporaryRateChangeCoarseAmount() {
+    return m_dTemporaryRateChangeCoarse;
+}
+
+//static
+double RateControl::getTemporaryRateChangeFineAmount() {
+    return m_dTemporaryRateChangeFine;
+}
+
+//static
+double RateControl::getPermanentRateChangeCoarseAmount() {
+    return m_dPermanentRateChangeCoarse;
+}
+
+//static
+double RateControl::getPermanentRateChangeFineAmount() {
+    return m_dPermanentRateChangeFine;
 }
 
 void RateControl::slotReverseRollActivate(double v) {
@@ -283,7 +304,7 @@ void RateControl::slotControlRatePermDown(double)
     // Adjusts temp rate down if button pressed
     if (buttonRatePermDown->get()) {
         m_pRateSlider->set(m_pRateSlider->get() -
-                           m_pRateDir->get() * m_dPerm / (100 * m_pRateRange->get()));
+                           m_pRateDir->get() * m_dPermanentRateChangeCoarse / (100 * m_pRateRange->get()));
     }
 }
 
@@ -292,15 +313,15 @@ void RateControl::slotControlRatePermDownSmall(double)
     // Adjusts temp rate down if button pressed
     if (buttonRatePermDownSmall->get())
         m_pRateSlider->set(m_pRateSlider->get() -
-                           m_pRateDir->get() * m_dPermSmall / (100. * m_pRateRange->get()));
+                           m_pRateDir->get() * m_dPermanentRateChangeFine / (100. * m_pRateRange->get()));
 }
 
 void RateControl::slotControlRatePermUp(double)
 {
     // Adjusts temp rate up if button pressed
     if (buttonRatePermUp->get()) {
         m_pRateSlider->set(m_pRateSlider->get() +
-                           m_pRateDir->get() * m_dPerm / (100. * m_pRateRange->get()));
+                           m_pRateDir->get() * m_dPermanentRateChangeCoarse / (100. * m_pRateRange->get()));
     }
 }
 
@@ -309,7 +330,7 @@ void RateControl::slotControlRatePermUpSmall(double)
     // Adjusts temp rate up if button pressed
     if (buttonRatePermUpSmall->get())
         m_pRateSlider->set(m_pRateSlider->get() +
-                           m_pRateDir->get() * m_dPermSmall / (100. * m_pRateRange->get()));
+                           m_pRateDir->get() * m_dPermanentRateChangeFine / (100. * m_pRateRange->get()));
 }
 
 void RateControl::slotControlRateTempDown(double)
@@ -540,7 +561,7 @@ void RateControl::process(const double rate,
     if ((m_ePbPressed) && (!m_bTempStarted)) {
         m_bTempStarted = true;
 
-        if (m_eRateRampMode == RATERAMP_STEP) {
+        if (m_eRateRampMode == RampMode::Stepping) {
             // old temporary pitch shift behavior
             double range = m_pRateRange->get();
 
@@ -550,9 +571,9 @@ void RateControl::process(const double rate,
                 return;
             }
 
-            double change = m_pRateDir->get() * m_dTemp /
+            double change = m_pRateDir->get() * m_dTemporaryRateChangeCoarse /
                                     (100. * range);
-            double csmall = m_pRateDir->get() * m_dTempSmall /
+            double csmall = m_pRateDir->get() * m_dTemporaryRateChangeFine /
                                     (100. * range);
 
             if (buttonRateTempUp->get())
@@ -563,23 +584,22 @@ void RateControl::process(const double rate,
                 addRateTemp(csmall);
             else if (buttonRateTempDownSmall->get())
                 subRateTemp(csmall);
-        } else {
-            // m_eRateRampMode == RATERAMP_LINEAR
-            m_dTempRateChange = ((double)latrate / ((double)m_iRateRampSensitivity / 100.));
+        } else if (m_eRateRampMode == RampMode::Linear) {
+            m_dTemporaryRateChangeCoarse = ((double)latrate / ((double)m_iRateRampSensitivity / 100.));
 
             if (m_eRampBackMode == RATERAMP_RAMPBACK_PERIOD)
                 m_dRateTempRampbackChange = 0.0;
         }
 
     }
 
-    if (m_eRateRampMode == RATERAMP_LINEAR) {
+    if (m_eRateRampMode == RampMode::Linear) {
         if (m_ePbCurrent) {
             // apply ramped pitchbending
             if (m_ePbCurrent == RateControl::RATERAMP_UP) {
-                addRateTemp(m_dTempRateChange);
+                addRateTemp(m_dTemporaryRateChangeCoarse);
             } else if (m_ePbCurrent == RateControl::RATERAMP_DOWN) {
-                subRateTemp(m_dTempRateChange);
+                subRateTemp(m_dTemporaryRateChangeCoarse);
             }
         } else if ((m_bTempStarted)
                 || ((m_eRampBackMode != RATERAMP_RAMPBACK_NONE)
@@ -605,7 +625,7 @@ void RateControl::process(const double rate,
                 resetRateTemp();
             }
         }
-    } else if ((m_eRateRampMode == RATERAMP_STEP) && (m_bTempStarted)) {
+    } else if ((m_eRateRampMode == RampMode::Stepping) && (m_bTempStarted)) {
         if (!m_ePbCurrent) {
             m_bTempStarted = false;
             resetRateTemp();