From b62f0cd4653d7bf1de386fa5df6f0af0a9a9b56a Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 12 Feb 2023 01:23:14 -0500
Subject: [PATCH] Revert "ES5506:Fixes?"

This reverts commit da6d0b1702470cc219b32bb40c594dddaa835fdc.
---
 src/engine/platform/es5506.cpp | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/engine/platform/es5506.cpp b/src/engine/platform/es5506.cpp
index 42c545cf..bda354c5 100644
--- a/src/engine/platform/es5506.cpp
+++ b/src/engine/platform/es5506.cpp
@@ -700,10 +700,6 @@ void DivPlatformES5506::tick(bool sysTick) {
           // Run sample
           pageWrite(0x00|i,0x06,chan[i].envelope.ecount); // Clear ECOUNT
           pageWriteMask(0x00|i,0x5f,0x00,loopFlag,0x3cff);
-          if (!chan[i].std.vol.had) {
-            chan[i].outVol=(0xffff*chan[i].vol)/0xff;
-            chan[i].volChanged.changed=0xff;
-          }
         }
       }
       if (chan[i].keyOff) {
@@ -775,19 +771,6 @@ int DivPlatformES5506::dispatch(DivCommand c) {
       chan[c.chan].active=true;
       chan[c.chan].keyOn=true;
       chan[c.chan].macroInit(ins);
-      if (!chan[c.chan].std.vol.will) {
-        chan[c.chan].outVol=(0xffff*chan[c.chan].vol)/0xff;
-        chan[c.chan].volChanged.lVol=1;
-        chan[c.chan].volChanged.rVol=1;
-      }
-      if (!chan[c.chan].std.panL.will) {
-        chan[c.chan].outLVol=(0xffff*chan[c.chan].lVol)/0xff;
-        chan[c.chan].volChanged.lVol=1;
-      }
-      if (!chan[c.chan].std.panR.will) {
-        chan[c.chan].outRVol=(0xffff*chan[c.chan].rVol)/0xff;
-        chan[c.chan].volChanged.rVol=1;
-      }
       break;
     }
     case DIV_CMD_NOTE_OFF:
@@ -810,7 +793,7 @@ int DivPlatformES5506::dispatch(DivCommand c) {
       if (chan[c.chan].vol!=(unsigned int)(c.value)) {
         chan[c.chan].vol=c.value;
         if (!chan[c.chan].std.vol.has) {
-          chan[c.chan].outVol=(0xffff*chan[c.chan].vol)/0xff;
+          chan[c.chan].outVol=(0xffff*c.value)/0xff;
           chan[c.chan].volChanged.changed=0xff;
         }
       }