Merge pull request #2 from daschuer/potmeter_fix

Minor refactoring in Midi to Control path

6 files changed, 11 insertions, 10 deletions

diff --git a/src/control/controlbehavior.cpp b/src/control/controlbehavior.cpp
index b07c783f3f..97a036bfae 100644
--- a/src/control/controlbehavior.cpp
+++ b/src/control/controlbehavior.cpp
@@ -49,19 +49,19 @@ double ControlPotmeterBehavior::defaultValue(double dDefault) const {
 }
 
 double ControlPotmeterBehavior::valueToWidgetParameter(double dValue) {
+    if (m_dValueRange == 0.0) {
+        return 0;
+    }
     if (dValue > m_dMaxValue) {
         dValue = m_dMaxValue;
     } else if (dValue < m_dMinValue) {
         dValue = m_dMinValue;
     }
-    if (m_dValueRange == 0.0) {
-        return 0;
-    }
     return (dValue - m_dMinValue) / m_dValueRange;
 }
 
 double ControlPotmeterBehavior::widgetParameterToValue(double dParam) {
-    return m_dMinValue + dParam * m_dValueRange;
+    return m_dMinValue + (dParam * m_dValueRange);
 }
 
 double ControlPotmeterBehavior::valueToMidiParameter(double dValue) {
@@ -82,8 +82,8 @@ void ControlPotmeterBehavior::setValueFromMidiParameter(MidiOpCode o, double dPa
 
 #define maxPosition 1.0
 #define minPosition 0.0
-#define middlePosition ((maxPosition-minPosition)/2.0)
-#define positionrange (maxPosition-minPosition)
+#define middlePosition ((maxPosition - minPosition) / 2.0)
+#define positionrange (maxPosition - minPosition)
 
 ControlLogpotmeterBehavior::ControlLogpotmeterBehavior(double dMaxValue)
         : ControlPotmeterBehavior(0, dMaxValue) {
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index 84511d411f..6401c5ec2e 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -347,7 +347,7 @@ void MidiController::receive(unsigned char status, unsigned char control,
 
         // computeValue not (yet) done on pitch messages because it all assumes 7-bit numbers
     } else {
-        double currMixxxControlValue = pCO->getValueToMidi();
+        double currMixxxControlValue = pCO->getMidiParameter();
         newValue = computeValue(options, currMixxxControlValue, value);
     }
 
diff --git a/src/controllers/softtakeover.cpp b/src/controllers/softtakeover.cpp
index dba269292f..4045edc520 100644
--- a/src/controllers/softtakeover.cpp
+++ b/src/controllers/softtakeover.cpp
@@ -79,7 +79,7 @@ bool SoftTakeover::ignore(ControlObject* control, float newValue, bool midiVal)
             threshold = scaleFactor*(threshold/128.0f);
         }
 
-        double currentValue = midiVal ? control->getValueToMidi() : control->get();
+        double currentValue = midiVal ? control->getMidiParameter() : control->get();
         double difference = currentValue - newValue;
         double prevDiff = 0;
         bool sameSide = false;
diff --git a/src/controlobject.cpp b/src/controlobject.cpp
index c9d33e98ed..ecaf793ba2 100644
--- a/src/controlobject.cpp
+++ b/src/controlobject.cpp
@@ -73,7 +73,7 @@ void ControlObject::setValueFromMidi(MidiOpCode o, double v) {
     }
 }
 
-double ControlObject::getValueToMidi() const {
+double ControlObject::getMidiParameter() const {
     return m_pControl ? m_pControl->getMidiParameter() : 0.0;
 }
 
diff --git a/src/controlobject.h b/src/controlobject.h
index 702570882a..4385ae652e 100644
--- a/src/controlobject.h
+++ b/src/controlobject.h
@@ -82,7 +82,7 @@ class ControlObject : public QObject {
     // DEPRECATED: Called to set the control value from the controller
     // subsystem.
     virtual void setValueFromMidi(MidiOpCode o, double v);
-    virtual double getValueToMidi() const;
+    virtual double getMidiParameter() const;
 
   protected:
     // Key of the object
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp
index 9ba5587c4e..c389a14a9f 100644
--- a/src/widget/wpushbutton.cpp
+++ b/src/widget/wpushbutton.cpp
@@ -185,6 +185,7 @@ void WPushButton::setValue(double v) {
 }
 
 void WPushButton::paintEvent(QPaintEvent* e) {
+    Q_UNUSED(e);
     QStyleOption option;
     option.initFrom(this);
     QStylePainter p(this);