Merge lp:~loadstar81/mixxx/features_softstep into lp:~mixxxdevelopers/mixxx/trunk

[Tom Mast]

This change modifies the ControlPotmeter functionality to add a smaller step size, specifically 1/100 compared to the normal 1/10 size. Added are two functions incSmallValue() and decSmallValue() which are connected to the ControlPushButtons read from the config with "_up_small" and "_down_small." Also added is a function setSmallStep() which calculates the smaller step size and stores it in the new variable m_dSmallStep.

[RJ Skerry-Ryan (rryan)]

Looks good to me -- thanks Tom!

I'll add you to the contributor list as "Tom Mast". Is that ok?

review: Approve

[Tom Mast (loadstar81)]

That's great!

On Sat, Mar 26, 2011 at 10:03 PM, RJ Ryan <email address hidden> wrote:

> Review: Approve
> Looks good to me -- thanks Tom!
>
> I'll add you to the contributor list as "Tom Mast". Is that ok?
> --
>
> https://code.launchpad.net/~thomasomast/mixxx/features_softstep/+merge/54943
> You are the owner of lp:~thomasomast/mixxx/features_softstep.
>

=== modified file 'mixxx/res/keyboard/Standard.kbd.cfg'
--- mixxx/res/keyboard/Standard.kbd.cfg	2010-12-01 20:39:53 +0000
+++ mixxx/res/keyboard/Standard.kbd.cfg	2011-03-26 04:30:49 +0000
@@ -1,6 +1,8 @@
 [Master]
 crossfader_up h
 crossfader_down g
+crossfader_up_small Shift+h
+crossfader_down_small Shift+g
 
 [Channel1]
 play d
 
=== modified file 'mixxx/src/controlpotmeter.cpp'
--- mixxx/src/controlpotmeter.cpp	2009-05-20 02:14:46 +0000
+++ mixxx/src/controlpotmeter.cpp	2011-03-26 04:30:49 +0000
@@ -31,12 +31,17 @@
 {
     setRange(dMinValue,dMaxValue);
     setStep(m_dValueRange/10.f);
+    setSmallStep(m_dValueRange/100.f);
 
     ControlPushButton * p;
     p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_up"));
     connect(p, SIGNAL(valueChanged(double)), this, SLOT(incValue(double)));
     p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_down"));
     connect(p, SIGNAL(valueChanged(double)), this, SLOT(decValue(double)));
+    p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_up_small"));
+    connect(p, SIGNAL(valueChanged(double)), this, SLOT(incSmallValue(double)));
+    p = new ControlPushButton(ConfigKey(key.group, QString(key.item)+"_down_small"));
+    connect(p, SIGNAL(valueChanged(double)), this, SLOT(decSmallValue(double)));
 }
 
 ControlPotmeter::~ControlPotmeter()
@@ -58,6 +63,11 @@
     m_dStep = dValue;
 }
 
+void ControlPotmeter::setSmallStep(double dValue)
+{
+    m_dSmallStep = dValue;
+}
+
 void ControlPotmeter::setRange(double dMinValue, double dMaxValue)
 {
     m_dMinValue = dMinValue;
@@ -141,8 +151,37 @@
             m_dValue -= m_dStep;
         emit(valueChanged(m_dValue));
 
-        // incValue will be activated by assosiated _up or _down ControlObject, and thus it is safe to update all proxies.
-        updateProxies(0);
-    }
-}
-
+        // decValue will be activated by assosiated _up or _down ControlObject, and thus it is safe to update all proxies.
+        updateProxies(0);
+    }
+}
+
+void ControlPotmeter::incSmallValue(double keypos)
+{
+    if (keypos>0)
+    {
+        if (m_dValue+m_dSmallStep>m_dMaxValue)
+            m_dValue = m_dMaxValue;
+        else
+            m_dValue += m_dSmallStep;
+        emit(valueChanged(m_dValue));
+
+        // incSmallValue will be activated by assosiated _up_small or _down_small ControlObject, and thus it is safe to update all proxies.
+        updateProxies(0);
+    }
+}
+
+void ControlPotmeter::decSmallValue(double keypos)
+{
+    if (keypos>0)
+    {
+        if (m_dValue-m_dSmallStep<m_dMinValue)
+            m_dValue = m_dMinValue;
+        else
+            m_dValue -= m_dSmallStep;
+        emit(valueChanged(m_dValue));
+
+        // decSmallValue will be activated by assosiated _up_small or _down_small ControlObject, and thus it is safe to update all proxies.
+        updateProxies(0);
+    }
+}
 
=== modified file 'mixxx/src/controlpotmeter.h'
--- mixxx/src/controlpotmeter.h	2007-04-06 22:09:23 +0000
+++ mixxx/src/controlpotmeter.h	2011-03-26 04:30:49 +0000
@@ -38,6 +38,8 @@
     double getMax();
     /** Sets the step size of the associated PushButtons */
     void setStep(double);
+    /** Sets the small step size of the associated PushButtons */
+    void setSmallStep(double);
     /** Sets the minimum and maximum allowed value. The control value is reset when calling
       * this method */
     void setRange(double dMinValue, double dMaxValue);
@@ -52,11 +54,15 @@
     void incValue(double);
     /** Decreases the value. This method is called from an associated PushButton control */
     void decValue(double);
+    /** Increases the value by smaller step. */
+    void incSmallValue(double);
+    /** Decreases the value by smaller step. */
+    void decSmallValue(double);
 
 protected:
     void setValueFromMidi(MidiCategory c, double v);
     
-    double m_dMaxValue, m_dMinValue, m_dValueRange, m_dStep;
+    double m_dMaxValue, m_dMinValue, m_dValueRange, m_dStep, m_dSmallStep;
 
 #define maxPosition 127
 #define minPosition 0