From a956f37f1bda74b6ae8d2024bd0fc9a02690d2bc Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 18 Jan 2022 17:18:07 -0500
Subject: [PATCH] Genesis/Neo Geo: fix extended channel mode volume

---
 src/engine/platform/genesisext.cpp | 4 +---
 src/engine/platform/ym2610ext.cpp  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/engine/platform/genesisext.cpp b/src/engine/platform/genesisext.cpp
index e3ed4864..abc4ec8c 100644
--- a/src/engine/platform/genesisext.cpp
+++ b/src/engine/platform/genesisext.cpp
@@ -62,10 +62,8 @@ int DivPlatformGenesisExt::dispatch(DivCommand c) {
       DivInstrumentFM::Operator op=ins->fm.op[ordch];
       if (isOpMuted[ch]) {
         rWrite(baseAddr+0x40,127);
-      } else if (isOutput[ins->fm.alg][ordch]) {
-        rWrite(baseAddr+0x40,127-(((127-op.tl)*(opChan[ch].vol&0x7f))/127));
       } else {
-        rWrite(baseAddr+0x40,op.tl);
+        rWrite(baseAddr+0x40,127-(((127-op.tl)*(opChan[ch].vol&0x7f))/127));
       }
       break;
     }
diff --git a/src/engine/platform/ym2610ext.cpp b/src/engine/platform/ym2610ext.cpp
index fad17408..00360c63 100644
--- a/src/engine/platform/ym2610ext.cpp
+++ b/src/engine/platform/ym2610ext.cpp
@@ -62,10 +62,8 @@ int DivPlatformYM2610Ext::dispatch(DivCommand c) {
       DivInstrumentFM::Operator op=ins->fm.op[ordch];
       if (isOpMuted[ch]) {
         rWrite(baseAddr+0x40,127);
-      } else if (isOutput[ins->fm.alg][ordch]) {
-        rWrite(baseAddr+0x40,127-(((127-op.tl)*(opChan[ch].vol&0x7f))/127));
       } else {
-        rWrite(baseAddr+0x40,op.tl);
+        rWrite(baseAddr+0x40,127-(((127-op.tl)*(opChan[ch].vol&0x7f))/127));
       }
       break;
     }