Merge pull request #1237 from Be-ing/getparameter_out_of_bounds_fix

do not clamp out-of-bounds ControlPotmeter parameters when they are allowed
mixxxdj · Apr 17, 2017 · 244eaeb · 244eaeb
2 parents 7b73abf + 9ee2d1c
commit 244eaeb
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/control/controlbehavior.cpp b/src/control/controlbehavior.cpp
@@ -56,10 +56,12 @@ double ControlPotmeterBehavior::valueToParameter(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_bAllowOutOfBounds) {
+        if (dValue > m_dMaxValue) {
+            dValue = m_dMaxValue;
+        } else if (dValue < m_dMinValue) {
+            dValue = m_dMinValue;
+        }
     }
     return (dValue - m_dMinValue) / m_dValueRange;
 }
@@ -116,10 +118,12 @@ double ControlLogPotmeterBehavior::valueToParameter(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_bAllowOutOfBounds) {
+        if (dValue > m_dMaxValue) {
+            dValue = m_dMaxValue;
+        } else if (dValue < m_dMinValue) {
+            dValue = m_dMinValue;
+        }
     }
     double linPrameter = (dValue - m_dMinValue) / m_dValueRange;
     double dbParamter = ratio2db(linPrameter + m_minOffset * (1 - linPrameter));