Use sqrt() in pan law

AxioDL · Nov 28, 2017 · 89233e9 · 89233e9
1 parent b890a76
commit 89233e9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/include/amuse/Voice.hpp b/include/amuse/Voice.hpp
@@ -82,8 +82,8 @@ class Voice : public Entity
     float m_curAuxBVol = 0.f;       /**< Current AuxB volume of voice */
     float m_userPan = 0.f;          /**< User pan of voice */
     float m_curPan = 0.f;           /**< Current pan of voice */
-    float m_userSpan = 0.f;         /**< User span of voice */
-    float m_curSpan = 0.f;          /**< Current surround pan of voice */
+    float m_userSpan = -1.f;        /**< User span of voice */
+    float m_curSpan = -1.f;         /**< Current surround pan of voice */
     float m_curPitchWheel = 0.f;    /**< Current normalized wheel value for control */
     int32_t m_pitchWheelUp = 600;   /**< Up range for pitchwheel control in cents */
     int32_t m_pitchWheelDown = 600; /**< Down range for pitchwheel control in cents */

diff --git a/lib/Voice.cpp b/lib/Voice.cpp
@@ -979,52 +979,61 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
     case AudioChannelSet::Stereo:
     default:
         /* Left */
-        coefs[0] = -frontPan * 0.5f + 0.5f;
+        coefs[0] = std::sqrt(-frontPan * 0.5f + 0.5f);
 
         /* Right */
-        coefs[1] = frontPan * 0.5f + 0.5f;
+        coefs[1] = std::sqrt(frontPan * 0.5f + 0.5f);
 
         break;
 
     case AudioChannelSet::Quad:
         /* Left */
         coefs[0] = -frontPan * 0.5f + 0.5f;
         coefs[0] *= -totalSpan * 0.5f + 0.5f;
+        coefs[0] = std::sqrt(coefs[0]);
 
         /* Right */
         coefs[1] = frontPan * 0.5f + 0.5f;
         coefs[1] *= -totalSpan * 0.5f + 0.5f;
+        coefs[1] = std::sqrt(coefs[1]);
 
         /* Back Left */
         coefs[2] = -backPan * 0.5f + 0.5f;
         coefs[2] *= totalSpan * 0.5f + 0.5f;
+        coefs[2] = std::sqrt(coefs[2]);
 
         /* Back Right */
         coefs[3] = backPan * 0.5f + 0.5f;
         coefs[3] *= totalSpan * 0.5f + 0.5f;
+        coefs[3] = std::sqrt(coefs[3]);
 
         break;
 
     case AudioChannelSet::Surround51:
         /* Left */
         coefs[0] = (frontPan <= 0.f) ? -frontPan : 0.f;
         coefs[0] *= -totalSpan * 0.5f + 0.5f;
+        coefs[0] = std::sqrt(coefs[0]);
 
         /* Right */
         coefs[1] = (frontPan >= 0.f) ? frontPan : 0.f;
         coefs[1] *= -totalSpan * 0.5f + 0.5f;
+        coefs[1] = std::sqrt(coefs[1]);
 
         /* Back Left */
         coefs[2] = -backPan * 0.5f + 0.5f;
         coefs[2] *= totalSpan * 0.5f + 0.5f;
+        coefs[2] = std::sqrt(coefs[2]);
 
         /* Back Right */
         coefs[3] = backPan * 0.5f + 0.5f;
         coefs[3] *= totalSpan * 0.5f + 0.5f;
+        coefs[3] = std::sqrt(coefs[3]);
 
         /* Center */
         coefs[4] = 1.f - std::fabs(frontPan);
         coefs[4] *= -totalSpan * 0.5f + 0.5f;
+        coefs[4] = std::sqrt(coefs[4]);
 
         /* LFE */
         coefs[5] = 0.25f;
@@ -1035,33 +1044,40 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
         /* Left */
         coefs[0] = (frontPan <= 0.f) ? -frontPan : 0.f;
         coefs[0] *= (totalSpan <= 0.f) ? -totalSpan : 0.f;
+        coefs[0] = std::sqrt(coefs[0]);
 
         /* Right */
         coefs[1] = (frontPan >= 0.f) ? frontPan : 0.f;
         coefs[1] *= (totalSpan <= 0.f) ? -totalSpan : 0.f;
+        coefs[1] = std::sqrt(coefs[1]);
 
         /* Back Left */
         coefs[2] = -backPan * 0.5f + 0.5f;
         coefs[2] *= (totalSpan >= 0.f) ? totalSpan : 0.f;
+        coefs[2] = std::sqrt(coefs[2]);
 
         /* Back Right */
         coefs[3] = backPan * 0.5f + 0.5f;
         coefs[3] *= (totalSpan >= 0.f) ? totalSpan : 0.f;
+        coefs[3] = std::sqrt(coefs[3]);
 
         /* Center */
         coefs[4] = 1.f - std::fabs(frontPan);
         coefs[4] *= (totalSpan <= 0.f) ? -totalSpan : 0.f;
+        coefs[4] = std::sqrt(coefs[4]);
 
         /* LFE */
         coefs[5] = 0.25f;
 
         /* Side Left */
         coefs[6] = -backPan * 0.5f + 0.5f;
         coefs[6] *= 1.f - std::fabs(totalSpan);
+        coefs[6] = std::sqrt(coefs[6]);
 
         /* Side Right */
         coefs[7] = backPan * 0.5f + 0.5f;
         coefs[7] *= 1.f - std::fabs(totalSpan);
+        coefs[7] = std::sqrt(coefs[7]);
 
         break;
     }