From 2f1cdab36b82a994153827fbfb83410b45a07f69 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 15 Jan 2022 00:24:06 -0500
Subject: [PATCH] fix mixing being done wrongly

---
 src/engine/playback.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 80fd72863..18c9535b3 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -1002,23 +1002,19 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
   }
 
   for (int i=0; i<song.systemLen; i++) {
+    float volL=((float)song.systemVol[i]/64.0f)*((float)MIN(127,127-(int)song.systemPan[i])/127.0f);
+    float volR=((float)song.systemVol[i]/64.0f)*((float)MIN(127,127+(int)song.systemPan[i])/127.0f);
     if (disCont[i].dispatch->isStereo()) {
       for (size_t j=0; j<size; j++) {
-        out[0][j]+=(float)disCont[i].bbOut[0][j]/16384.0;
-        out[1][j]+=(float)disCont[i].bbOut[1][j]/16384.0;
+        out[0][j]+=((float)disCont[i].bbOut[0][j]/16384.0)*volL;
+        out[1][j]+=((float)disCont[i].bbOut[1][j]/16384.0)*volR;
       }
     } else {
       for (size_t j=0; j<size; j++) {
-        out[0][j]+=(float)disCont[i].bbOut[0][j]/16384.0;
-        out[1][j]+=(float)disCont[i].bbOut[0][j]/16384.0;
+        out[0][j]+=((float)disCont[i].bbOut[0][j]/16384.0)*volL;
+        out[1][j]+=((float)disCont[i].bbOut[0][j]/16384.0)*volR;
       }
     }
-    float volL=((float)song.systemVol[i]/64.0f)*((float)MIN(127,127-(int)song.systemPan[i])/127.0f);
-    float volR=((float)song.systemVol[i]/64.0f)*((float)MIN(127,127+(int)song.systemPan[i])/127.0f);
-    for (size_t j=0; j<size; j++) {
-      out[0][j]*=volL;
-      out[1][j]*=volR;
-    }
   }
 
   if (metronome) for (size_t i=0; i<size; i++) {