clean up function names a bit

7 files changed, 35 insertions, 35 deletions

diff --git a/src/control/control.cpp b/src/control/control.cpp
index 474d71d723..8e2d8bc277 100644
--- a/src/control/control.cpp
+++ b/src/control/control.cpp
@@ -239,7 +239,7 @@ double ControlDoublePrivate::getParameterForMidi(double midiParam) const {
         qWarning() << "Cannot set" << m_key << "by Midi";
         return 0;
     }
-    return pBehavior->midiValueToParameter(midiParam);
+    return pBehavior->midiToParameter(midiParam);
 }
 
 void ControlDoublePrivate::setValueFromMidi(MidiOpCode opcode, double midiParam) {
@@ -248,7 +248,7 @@ void ControlDoublePrivate::setValueFromMidi(MidiOpCode opcode, double midiParam)
         qWarning() << "Cannot set" << m_key << "by Midi";
         return;
     }
-    pBehavior->setValueFromMidiParameter(opcode, midiParam, this);
+    pBehavior->setValueFromMidi(opcode, midiParam, this);
 }
 
 double ControlDoublePrivate::getMidiParameter() const {
diff --git a/src/control/controlbehavior.cpp b/src/control/controlbehavior.cpp
index a435bf7d97..a4205ecd84 100644
--- a/src/control/controlbehavior.cpp
+++ b/src/control/controlbehavior.cpp
@@ -11,7 +11,7 @@ double ControlNumericBehavior::valueToParameter(double dValue) {
     return dValue;
 }
 
-double ControlNumericBehavior::midiValueToParameter(double midiValue) {
+double ControlNumericBehavior::midiToParameter(double midiValue) {
     return midiValue;
 }
 
@@ -23,10 +23,10 @@ double ControlNumericBehavior::valueToMidiParameter(double dValue) {
     return dValue;
 }
 
-void ControlNumericBehavior::setValueFromMidiParameter(MidiOpCode o, double dParam,
-                                                       ControlDoublePrivate* pControl) {
+void ControlNumericBehavior::setValueFromMidi(
+        MidiOpCode o, double dParam, ControlDoublePrivate* pControl) {
     Q_UNUSED(o);
-    double dNorm = midiValueToParameter(dParam);
+    double dNorm = midiToParameter(dParam);
     pControl->set(parameterToValue(dNorm), NULL);
 }
 
@@ -64,7 +64,7 @@ double ControlPotmeterBehavior::valueToParameter(double dValue) {
     return (dValue - m_dMinValue) / m_dValueRange;
 }
 
-double ControlPotmeterBehavior::midiValueToParameter(double midiValue) {
+double ControlPotmeterBehavior::midiToParameter(double midiValue) {
     double parameter;
     if (midiValue > 64) {
         parameter = (midiValue - 1) / 126.0;
@@ -98,7 +98,8 @@ double ControlPotmeterBehavior::valueToMidiParameter(double dValue) {
 #define middlePosition ((maxPosition - minPosition) / 2.0)
 #define positionrange (maxPosition - minPosition)
 
-ControlLogPotmeterBehavior::ControlLogPotmeterBehavior(double dMinValue, double dMaxValue, double minDB)
+ControlLogPotmeterBehavior::ControlLogPotmeterBehavior(double dMinValue,
+        double dMaxValue, double minDB)
         : ControlPotmeterBehavior(dMinValue, dMaxValue, false) {
     if (minDB >= 0) {
         qWarning() << "ControlLogPotmeterBehavior::ControlLogPotmeterBehavior() minDB must be negative";
@@ -132,8 +133,8 @@ double ControlLogPotmeterBehavior::parameterToValue(double dParam) {
     return m_dMinValue + (linPrameter * m_dValueRange);
 }
 
-ControlLinPotmeterBehavior::ControlLinPotmeterBehavior(double dMinValue, double dMaxValue,
-                                                       bool allowOutOfBounds)
+ControlLinPotmeterBehavior::ControlLinPotmeterBehavior(
+        double dMinValue, double dMaxValue, bool allowOutOfBounds)
         : ControlPotmeterBehavior(dMinValue, dMaxValue, allowOutOfBounds) {
 }
 
@@ -206,7 +207,7 @@ double ControlAudioTaperPotBehavior::parameterToValue(double dParam) {
     return dValue;
 }
 
-double ControlAudioTaperPotBehavior::midiValueToParameter(double midiValue) {
+double ControlAudioTaperPotBehavior::midiToParameter(double midiValue) {
     double dParam;
     if (m_neutralParameter && m_neutralParameter != 1.0) {
         double neutralTest = (midiValue - m_midiCorrection) / 127.0;
@@ -241,14 +242,13 @@ double ControlAudioTaperPotBehavior::valueToMidiParameter(double dValue) {
     return dMidiParam;
 }
 
-void ControlAudioTaperPotBehavior::setValueFromMidiParameter(MidiOpCode o, double dMidiParam,
-                                                           ControlDoublePrivate* pControl) {
+void ControlAudioTaperPotBehavior::setValueFromMidi(
+        MidiOpCode o, double dMidiParam, ControlDoublePrivate* pControl) {
     Q_UNUSED(o);
-    double dParam = midiValueToParameter(dMidiParam);
+    double dParam = midiToParameter(dMidiParam);
     pControl->set(parameterToValue(dParam), NULL);
 }
 
-
 double ControlTTRotaryBehavior::valueToParameter(double dValue) {
     return (dValue * 200.0 + 64) / 127.0;
 }
@@ -273,7 +273,7 @@ ControlPushButtonBehavior::ControlPushButtonBehavior(ButtonMode buttonMode,
           m_iNumStates(iNumStates) {
 }
 
-void ControlPushButtonBehavior::setValueFromMidiParameter(
+void ControlPushButtonBehavior::setValueFromMidi(
         MidiOpCode o, double dParam, ControlDoublePrivate* pControl) {
     // Calculate pressed State of the midi Button
     // Some controller like the RMX2 are sending always MIDI_NOTE_ON
diff --git a/src/control/controlbehavior.h b/src/control/controlbehavior.h
index ab6b9d77f8..26ca5290d4 100644
--- a/src/control/controlbehavior.h
+++ b/src/control/controlbehavior.h
@@ -19,13 +19,13 @@ class ControlNumericBehavior {
     // returns the normalized parameter range 0..1
     virtual double valueToParameter(double dValue);
     // returns the normalized parameter range 0..1
-    virtual double midiValueToParameter(double midiValue);
+    virtual double midiToParameter(double midiValue);
     // returns the scaled user visible value
     virtual double parameterToValue(double dParam);
     // returns the midi range parameter 0..127
     virtual double valueToMidiParameter(double dValue);
 
-    virtual void setValueFromMidiParameter(MidiOpCode o, double dParam,
+    virtual void setValueFromMidi(MidiOpCode o, double dParam,
                                            ControlDoublePrivate* pControl);
 };
 
@@ -37,7 +37,7 @@ class ControlPotmeterBehavior : public ControlNumericBehavior {
 
     bool setFilter(double* dValue) override;
     double valueToParameter(double dValue) override;
-    double midiValueToParameter(double midiValue) override;
+    double midiToParameter(double midiValue) override;
     double parameterToValue(double dParam) override;
     double valueToMidiParameter(double dValue) override;
 
@@ -76,9 +76,9 @@ class ControlAudioTaperPotBehavior : public ControlPotmeterBehavior {
 
     double valueToParameter(double dValue);
     double parameterToValue(double dParam);
-    double midiValueToParameter(double midiValue);
+    double midiToParameter(double midiValue);
     double valueToMidiParameter(double dValue);
-    void setValueFromMidiParameter(
+    void setValueFromMidi(
             MidiOpCode o, double dParam, ControlDoublePrivate* pControl)
                     override;
 
@@ -120,7 +120,7 @@ class ControlPushButtonBehavior : public ControlNumericBehavior {
     };
 
     ControlPushButtonBehavior(ButtonMode buttonMode, int iNumStates);
-    void setValueFromMidiParameter(
+    void setValueFromMidi(
             MidiOpCode o, double dParam, ControlDoublePrivate* pControl)
                 override;
 
diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp
index 1d70089a72..31c8c2b510 100644
--- a/src/control/controlobject.cpp
+++ b/src/control/controlobject.cpp
@@ -102,8 +102,8 @@ double ControlObject::getParameterForValue(double value) const {
     return m_pControl ? m_pControl->getParameterForValue(value) : 0.0;
 }
 
-double ControlObject::getParameterForMidiValue(double midiValue) const {
-    return m_pControl ? m_pControl->getParameterForMidi(midiValue) : 0.0;
+double ControlObject::getParameterForMidi(double midiParameter) const {
+    return m_pControl ? m_pControl->getParameterForMidi(midiParameter) : 0.0;
 }
 
 void ControlObject::setParameter(double v) {
diff --git a/src/control/controlobject.h b/src/control/controlobject.h
index f5e6396fc1..96de336d80 100644
--- a/src/control/controlobject.h
+++ b/src/control/controlobject.h
@@ -136,7 +136,7 @@ class ControlObject : public QObject {
     virtual double getParameterForValue(double value) const;
 
     // Returns the parameterized value of the object. Thread safe, non-blocking.
-    virtual double getParameterForMidiValue(double midiValue) const;
+    virtual double getParameterForMidi(double midiValue) const;
 
     // Sets the control parameterized value to v. Thread safe, non-blocking.
     virtual void setParameter(double v);
diff --git a/src/controllers/midi/midicontroller.cpp b/src/controllers/midi/midicontroller.cpp
index c2848d3020..23aa6994ef 100644
--- a/src/controllers/midi/midicontroller.cpp
+++ b/src/controllers/midi/midicontroller.cpp
@@ -348,7 +348,7 @@ void MidiController::processInputMapping(const MidiInputMapping& mapping,
     if (mapping.options.soft_takeover) {
         // This is the only place to enable it if it isn't already.
         m_st.enable(pCO);
-        if (m_st.ignore(pCO, pCO->getParameterForMidiValue(newValue))) {
+        if (m_st.ignore(pCO, pCO->getParameterForMidi(newValue))) {
             return;
         }
     }
diff --git a/src/test/audiotaperpot_test.cpp b/src/test/audiotaperpot_test.cpp
index cd312f320d..3b3e611a68 100644
--- a/src/test/audiotaperpot_test.cpp
+++ b/src/test/audiotaperpot_test.cpp
@@ -25,10 +25,10 @@ TEST_F(AudioTaperPotTest, ScaleTest) {
         double neutralMidi = catpb.valueToMidiParameter(1);
         ASSERT_EQ(0.0, fmod(neutralMidi, 1));
         // Midi value 64 should result in 0,5
-        ASSERT_EQ(neutralParameter, catpb.midiValueToParameter(neutralMidi));
+        ASSERT_EQ(neutralParameter, catpb.midiToParameter(neutralMidi));
         // roundtrip check
-        ASSERT_DOUBLE_EQ(0.25, catpb.parameterToValue(catpb.midiValueToParameter(catpb.valueToMidiParameter(0.25))));
-        ASSERT_DOUBLE_EQ(0.75, catpb.parameterToValue(catpb.midiValueToParameter(catpb.valueToMidiParameter(0.75))));
+        ASSERT_DOUBLE_EQ(0.25, catpb.parameterToValue(catpb.midiToParameter(catpb.valueToMidiParameter(0.25))));
+        ASSERT_DOUBLE_EQ(0.75, catpb.parameterToValue(catpb.midiToParameter(catpb.valueToMidiParameter(0.75))));
     }
 
     {
@@ -46,10 +46,10 @@ TEST_F(AudioTaperPotTest, ScaleTest) {
         double neutralMidi = catpb.valueToMidiParameter(1);
         ASSERT_EQ(0.0, fmod(neutralMidi, 1));
         // Midi value 64 should result in 0,5
-        ASSERT_EQ(neutralParameter, catpb.midiValueToParameter(neutralMidi));
+        ASSERT_EQ(neutralParameter, catpb.midiToParameter(neutralMidi));
         // roundtrip check
-        ASSERT_DOUBLE_EQ(0.25, catpb.parameterToValue(catpb.midiValueToParameter(catpb.valueToMidiParameter(0.25))));
-        ASSERT_DOUBLE_EQ(0.75, catpb.parameterToValue(catpb.midiValueToParameter(catpb.valueToMidiParameter(0.75))));
+        ASSERT_DOUBLE_EQ(0.25, catpb.parameterToValue(catpb.midiToParameter(catpb.valueToMidiParameter(0.25))));
+        ASSERT_DOUBLE_EQ(0.75, catpb.parameterToValue(catpb.midiToParameter(catpb.valueToMidiParameter(0.75))));
     }
 
     {
@@ -67,9 +67,9 @@ TEST_F(AudioTaperPotTest, ScaleTest) {
         double neutralMidi = catpb.valueToMidiParameter(1);
         ASSERT_EQ(0.0, fmod(neutralMidi, 1));
         // Midi value 64 should result in 0,5
-        ASSERT_EQ(neutralParameter, catpb.midiValueToParameter(neutralMidi));
+        ASSERT_EQ(neutralParameter, catpb.midiToParameter(neutralMidi));
         // roundtrip checkx
-        ASSERT_DOUBLE_EQ(0.25, catpb.parameterToValue(catpb.midiValueToParameter(catpb.valueToMidiParameter(0.25))));
-        ASSERT_DOUBLE_EQ(0.75, catpb.parameterToValue(catpb.midiValueToParameter(catpb.valueToMidiParameter(0.75))));
+        ASSERT_DOUBLE_EQ(0.25, catpb.parameterToValue(catpb.midiToParameter(catpb.valueToMidiParameter(0.25))));
+        ASSERT_DOUBLE_EQ(0.75, catpb.parameterToValue(catpb.midiToParameter(catpb.valueToMidiParameter(0.75))));
     }
 }