Merge lp:~ezod/mixxx/hamster into lp:~mixxxdevelopers/mixxx/trunk

[Aaron Mavrinac]

Add an option to reverse the crossfader (bug #829533) and fix crossfader config loading.

Add an option to reverse the crossfader (bug #829533) and fix crossfader config loading.

[RJ Skerry-Ryan (rryan)]

Thanks for the feature, Aaron. I've merged it into our 1.11 branch and it will be released in Mixxx 1.11.0. It seems you've also fixed the bug where the crossfader mode was not saved across Mixxx reboots. Sorry it took so long to review. Can I credit you as "Aaron Mavrinac"?

Finally, please sign the Mixxx contributor agreement to give us permission to distribute your changes under Mixxx's license:

https://docs.google.com/a/mixxx.org/spreadsheet/viewform?formkey=dEpYN2NkVEFnWWQzbkFfM0ZYYUZ5X2c6MQ#gid=0

Thanks again!
RJ Ryan

review: Approve

[Aaron Mavrinac (ezod)]

Yes, "Aaron Mavrinac" works. I've signed the contributor agreement. Thanks!

[Daniel Schürmann (daschuer)]

Hi RJ, Hi Aaron,

Aaron thank you for the good work on this.

I had started a review some time a go but I was not ready for writing a commend. Now here it is, a little late.

I like the patch, but it breaks Auto DJ! A quick solution is to issue a warning about this because hamster style is somehow unusal.

The best solution would be if we implement a "Xfader Controller" with controlls all Xfader input sources and calculates a single Xfader output value, which is used in the we need separate controls for the xfader.
We have discussed something similar in the AutoDJ GSOC project, but this was not started yet.

With a Xfader Controller, it would be possible to solve some other issues with the Xfader.
* Xfader gain is mostly constant but it is fresh calculated every process cycle.
* calibration is only needed for a controller crossfader, not for the GUI Crossfader
* Interaction between AutoDJ, GUI Crossfader and Hardware Crossfader need to be polished

I am not sure if the reverse happens on the right place in the XfadeGains calculation. If we ever use an unsymetric fade curve, controled by auto DJ, whe should apply the reverse just after the calibration and before calculating the Xfader curve.

I will also write a bug a reminder.

Kind regards,

Daniel

review: Needs Fixing

=== modified file 'mixxx/src/dlgprefcrossfader.cpp'
--- mixxx/src/dlgprefcrossfader.cpp	2012-06-25 00:02:38 +0000
+++ mixxx/src/dlgprefcrossfader.cpp	2012-08-18 19:26:22 +0000
@@ -38,6 +38,7 @@
         , m_COTMode(ControlObject::getControl(ConfigKey(CONFIG_KEY, "xFaderMode")))
         , m_COTCurve(ControlObject::getControl(ConfigKey(CONFIG_KEY, "xFaderCurve")))
         , m_COTCalibration(ControlObject::getControl(ConfigKey(CONFIG_KEY, "xFaderCalibration")))
+        , m_COTReverse(ControlObject::getControl(ConfigKey(CONFIG_KEY, "xFaderReverse")))
 {
     config = _config;
     m_pxfScene = NULL;
@@ -48,23 +49,22 @@
 
     setupUi(this);
 
+    connect(PushButtonReset,	  SIGNAL(clicked(bool)), this,	SLOT(setDefaults()));
+
+    QButtonGroup crossfaderModes;
+    crossfaderModes.addButton(radioButtonAdditive);
+    crossfaderModes.addButton(radioButtonConstantPower);
+
+    loadSettings();
+
     connect(SliderXFader,         SIGNAL(valueChanged(int)), this, SLOT(slotUpdateXFader()));
     connect(SliderXFader,         SIGNAL(sliderMoved(int)), this,  SLOT(slotUpdateXFader()));
     connect(SliderXFader,         SIGNAL(sliderReleased()), this,  SLOT(slotUpdateXFader()));
     connect(SliderXFader,         SIGNAL(sliderReleased()), this,  SLOT(slotApply()));
 
-    connect(PushButtonReset,	  SIGNAL(clicked(bool)), this,	SLOT(setDefaults()));
-
     //Update the crossfader curve graph and other setings when the crossfader mode is changed.
     connect(radioButtonAdditive,        SIGNAL(clicked(bool)), this, SLOT(slotUpdate()));
     connect(radioButtonConstantPower,   SIGNAL(clicked(bool)), this, SLOT(slotUpdate()));
-
-    QButtonGroup crossfaderModes;
-    crossfaderModes.addButton(radioButtonAdditive);
-    crossfaderModes.addButton(radioButtonConstantPower);
-
-	loadSettings();
-
 }
 
 DlgPrefCrossfader::~DlgPrefCrossfader()
@@ -80,11 +80,8 @@
 	double sliderVal = SliderXFader->maximum() / MIXXX_XFADER_STEEPNESS_COEFF * (sliderTransform - 1.);
 	SliderXFader->setValue((int)sliderVal);
 
-    // FIXME - this always returns 0 no matter what's in the config file
     m_xFaderMode = config->getValueString(ConfigKey(CONFIG_KEY, "xFaderMode")).toInt();
 
-    qDebug() << "loadSettings:" << sliderTransform << sliderVal << (m_xFaderMode == MIXXX_XFADER_CONSTPWR ? "Constant Power" : "Additive");
-
     if (m_xFaderMode == MIXXX_XFADER_CONSTPWR)
     {
         radioButtonConstantPower->setChecked(true);
@@ -96,9 +93,11 @@
 //         SliderXFader->setEnabled(false);
     }
 
-	slotUpdateXFader();
-	slotApply();
-    drawXfaderDisplay();
+    bool xFaderReverse = config->getValueString(ConfigKey(CONFIG_KEY, "xFaderReverse")).toInt() == 1;
+    checkBoxReverse->setChecked(xFaderReverse);
+
+    slotUpdateXFader();
+    slotApply();
 }
 
 /** Set the default values for all the widgets */
@@ -108,6 +107,7 @@
     m_xFaderMode = MIXXX_XFADER_ADDITIVE;
     radioButtonAdditive->setChecked(true);
     SliderXFader->setValue(SliderXFader->minimum());
+    checkBoxReverse->setChecked(false);
     slotUpdate();
     slotApply();
 }
@@ -118,8 +118,7 @@
     m_COTMode.slotSet(m_xFaderMode);
     m_COTCurve.slotSet(m_transform);
     m_COTCalibration.slotSet(m_cal);
-
-    qDebug() << "slotApply crossfader:" << m_transform << (m_xFaderMode == MIXXX_XFADER_CONSTPWR ? "Constant Power" : "Additive");
+    m_COTReverse.slotSet(checkBoxReverse->isChecked());
 }
 
 /** Update the dialog when the crossfader mode is changed */
@@ -184,7 +183,8 @@
 
         EngineXfader::getXfadeGains(gain1, gain2, (-1. + (xfadeStep * (double) i)),
                                     m_transform, m_cal,
-                                    (m_xFaderMode == MIXXX_XFADER_CONSTPWR));
+                                    (m_xFaderMode == MIXXX_XFADER_CONSTPWR),
+                                    checkBoxReverse->isChecked());
 
 		double sum = gain1 + gain2;
 		//scale for graph
@@ -220,13 +220,14 @@
 /** Update and save the crossfader's parameters from the dialog's widgets. **/
 void DlgPrefCrossfader::slotUpdateXFader()
 {
-	m_transform = 1. + ((double) SliderXFader->value() / SliderXFader->maximum() * MIXXX_XFADER_STEEPNESS_COEFF);
+    m_transform = 1. + ((double) SliderXFader->value() / SliderXFader->maximum() * MIXXX_XFADER_STEEPNESS_COEFF);
 
     m_cal = EngineXfader::getCalibration(m_transform);
 	QString QS_transform = QString::number(m_transform);
     config->set(ConfigKey(CONFIG_KEY, "xFaderMode"), ConfigValue(m_xFaderMode));
 	config->set(ConfigKey(CONFIG_KEY, "xFaderCurve"), ConfigValue(QS_transform));
 	//config->set(ConfigKey(CONFIG_KEY, "xFaderCalibration"), ConfigValue(m_cal)); //FIXME: m_cal is a double - be forewarned
+    config->set(ConfigKey(CONFIG_KEY, "xFaderReverse"), ConfigValue(checkBoxReverse->isChecked() ? 1 : 0));
 
-	drawXfaderDisplay();
+    drawXfaderDisplay();
 }

=== modified file 'mixxx/src/dlgprefcrossfader.h'
--- mixxx/src/dlgprefcrossfader.h	2012-05-27 12:48:11 +0000
+++ mixxx/src/dlgprefcrossfader.h	2012-08-18 19:26:22 +0000
@@ -58,6 +58,7 @@
     ControlObjectThread m_COTMode;
     ControlObjectThread m_COTCurve;
     ControlObjectThread m_COTCalibration;
+    ControlObjectThread m_COTReverse;
 };
 
 #endif

=== modified file 'mixxx/src/dlgprefcrossfaderdlg.ui'
--- mixxx/src/dlgprefcrossfaderdlg.ui	2012-05-27 12:48:11 +0000
+++ mixxx/src/dlgprefcrossfaderdlg.ui	2012-08-18 19:26:22 +0000
@@ -187,6 +187,19 @@
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QCheckBox" name="checkBoxReverse">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Reverse crossfader (hamster style)</string>
+        </property>
+       </widget>
+      </item>
      </layout>
      <zorder>radioButtonConstantPower</zorder>
      <zorder>radioButtonAdditive</zorder>

=== modified file 'mixxx/src/engine/enginemaster.cpp'
--- mixxx/src/engine/enginemaster.cpp	2012-05-27 12:48:11 +0000
+++ mixxx/src/engine/enginemaster.cpp	2012-08-18 19:26:22 +0000
@@ -112,6 +112,8 @@
         ConfigKey("[Mixer Profile]", "xFaderCurve"), 0., 2.);
     xFaderCalibration = new ControlPotmeter(
         ConfigKey("[Mixer Profile]", "xFaderCalibration"), -2., 2.);
+    xFaderReverse = new ControlPotmeter(
+        ConfigKey("[Mixer Profile]", "xFaderReverse"), 0., 1.);
 }
 
 EngineMaster::~EngineMaster()
@@ -126,7 +128,8 @@
     delete vumeter;
     delete head_clipping;
     delete sidechain;
-
+    
+    delete xFaderReverse;
     delete xFaderCalibration;
     delete xFaderCurve;
     delete xFaderMode;
@@ -381,7 +384,8 @@
     EngineXfader::getXfadeGains(c1_gain, c2_gain,
                                 crossfader->get(), xFaderCurve->get(),
                                 xFaderCalibration->get(),
-                                xFaderMode->get()==MIXXX_XFADER_CONSTPWR);
+                                xFaderMode->get()==MIXXX_XFADER_CONSTPWR,
+                                xFaderReverse->get()==1.0);
 
     // Now set the gains for overall volume and the left, center, right gains.
     m_masterGain.setGains(m_pMasterVolume->get(), c1_gain, 1.0, c2_gain);

=== modified file 'mixxx/src/engine/enginemaster.h'
--- mixxx/src/engine/enginemaster.h	2012-05-27 12:48:11 +0000
+++ mixxx/src/engine/enginemaster.h	2012-08-18 19:26:22 +0000
@@ -150,7 +150,7 @@
     EngineSideChain *sidechain;
 
     ControlPotmeter *crossfader, *head_mix, *m_pBalance,
-        *xFaderMode, *xFaderCurve, *xFaderCalibration;
+        *xFaderMode, *xFaderCurve, *xFaderCalibration, *xFaderReverse;
 
     ConstantGainCalculator m_headphoneGain;
     OrientationVolumeGainCalculator m_masterGain;

=== modified file 'mixxx/src/engine/enginexfader.cpp'
--- mixxx/src/engine/enginexfader.cpp	2012-05-27 12:48:11 +0000
+++ mixxx/src/engine/enginexfader.cpp	2012-08-18 19:26:22 +0000
@@ -7,7 +7,7 @@
     return pow(.5, 1./transform);
 }
 
-void EngineXfader::getXfadeGains(float &gain1, float &gain2, float xfadePosition, float transform, float calibration, bool constPower)
+void EngineXfader::getXfadeGains(float &gain1, float &gain2, float xfadePosition, float transform, float calibration, bool constPower, bool reverse)
 {
     // Slow-fade/fast-cut
     float xfadePositionLeft = xfadePosition;
@@ -42,4 +42,10 @@
     if(gain2 < 0.)
         gain2 = 0.;
 
+    if(reverse)
+    {
+        float gaint = gain1;
+        gain1 = gain2;
+        gain2 = gaint;
+    }
 }

=== modified file 'mixxx/src/engine/enginexfader.h'
--- mixxx/src/engine/enginexfader.h	2012-05-27 12:48:11 +0000
+++ mixxx/src/engine/enginexfader.h	2012-08-18 19:26:22 +0000
@@ -6,6 +6,6 @@
     
 public:
     static float getCalibration(float transform);
-    static void getXfadeGains(float &gain1, float &gain2, float xfadePosition, float transform, float calibration, bool constPower);
+    static void getXfadeGains(float &gain1, float &gain2, float xfadePosition, float transform, float calibration, bool constPower, bool reverse);
     
 };

=== modified file 'mixxx/src/playerinfo.cpp'
--- mixxx/src/playerinfo.cpp	2012-05-27 12:48:11 +0000
+++ mixxx/src/playerinfo.cpp	2012-08-18 19:26:22 +0000
@@ -115,7 +115,7 @@
         if ((fvol = m_listCOVolume[chan]->get()) == 0.0 )
             continue;
 
-        EngineXfader::getXfadeGains(xfl, xfr, m_COxfader->get(), 1.0, 0.0, false);
+        EngineXfader::getXfadeGains(xfl, xfr, m_COxfader->get(), 1.0, 0.0, false, false);
 
         // Orientation goes: left is 0, center is 1, right is 2.
         // Leave math out of it...