From 62ce5ae3cedefd3f2869a55360ddd85ede19ecf7 Mon Sep 17 00:00:00 2001
From: cam900 <dbtlrchl@naver.com>
Date: Fri, 23 Sep 2022 23:41:55 +0900
Subject: [PATCH] Add compatible flag for PCE DAC volume (always enabled for
 now) Fix furnacePCM detection for MSM6295

---
 src/engine/fileOps.cpp          |  2 ++
 src/engine/platform/msm6295.cpp |  2 +-
 src/engine/platform/pce.cpp     | 14 ++++++++------
 src/engine/song.h               |  2 ++
 src/gui/compatFlags.cpp         |  4 ++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/engine/fileOps.cpp b/src/engine/fileOps.cpp
index abfd7395b..2757ac274 100644
--- a/src/engine/fileOps.cpp
+++ b/src/engine/fileOps.cpp
@@ -178,6 +178,7 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
     ds.e1e2StopOnSameNote=true;
     ds.brokenPortaArp=false;
     ds.snNoLowPeriods=true;
+    ds.ignorePCEDACVolume=true;
     ds.delayBehavior=0;
     ds.jumpTreatment=2;
 
@@ -1100,6 +1101,7 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
     if (ds.version<115) {
       ds.autoSystem=false;
     }
+    ds.ignorePCEDACVolume=true;
     ds.isDMF=false;
 
     reader.readS(); // reserved
diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp
index bd9bce01c..5cfec125a 100644
--- a/src/engine/platform/msm6295.cpp
+++ b/src/engine/platform/msm6295.cpp
@@ -126,7 +126,7 @@ int DivPlatformMSM6295::dispatch(DivCommand c) {
   switch (c.cmd) {
     case DIV_CMD_NOTE_ON: {
       DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_FM);
-      if (ins->type==DIV_INS_AMIGA) {
+      if (ins->type==DIV_INS_MSM6295 || ins->type==DIV_INS_AMIGA) {
         chan[c.chan].furnacePCM=true;
       } else {
         chan[c.chan].furnacePCM=false;
diff --git a/src/engine/platform/pce.cpp b/src/engine/platform/pce.cpp
index ea6f0e56e..74667c870 100644
--- a/src/engine/platform/pce.cpp
+++ b/src/engine/platform/pce.cpp
@@ -69,7 +69,7 @@ void DivPlatformPCE::acquire(short* bufL, short* bufR, size_t start, size_t len)
           signed char dacData=((signed char)((unsigned char)s->data8[chan[i].dacPos]^0x80))>>3;
           chan[i].dacOut=CLAMP(dacData,-16,15);
           if (!isMuted[i]) {
-            chWrite(i,0x04,0xc0|chan[i].outVol);
+            chWrite(i,0x04,parent->song.ignorePCEDACVolume?0xdf:(0xc0|chan[i].outVol));
             chWrite(i,0x06,chan[i].dacOut&0x1f);
           } else {
             chWrite(i,0x04,0xc0);
@@ -208,7 +208,7 @@ void DivPlatformPCE::tick(bool sysTick) {
         if (chan[i].active && chan[i].dacSample>=0 && chan[i].dacSample<parent->song.sampleLen) {
           chan[i].dacPos=0;
           chan[i].dacPeriod=0;
-          chWrite(i,0x04,0xc0|chan[i].vol);
+          chWrite(i,0x04,parent->song.ignorePCEDACVolume?0xdf:(0xc0|chan[i].vol));
           addWrite(0xffff0000+(i<<8),chan[i].dacSample);
           chan[i].keyOn=true;
         }
@@ -275,7 +275,7 @@ int DivPlatformPCE::dispatch(DivCommand c) {
             break;
           } else {
              if (dumpWrites) {
-               chWrite(c.chan,0x04,0xc0|chan[c.chan].vol);
+               chWrite(c.chan,0x04,parent->song.ignorePCEDACVolume?0xdf:(0xc0|chan[c.chan].vol));
                addWrite(0xffff0000+(c.chan<<8),chan[c.chan].dacSample);
              }
           }
@@ -310,7 +310,7 @@ int DivPlatformPCE::dispatch(DivCommand c) {
           chan[c.chan].dacPeriod=0;
           chan[c.chan].dacRate=parent->getSample(chan[c.chan].dacSample)->rate;
           if (dumpWrites) {
-            chWrite(c.chan,0x04,0xc0|chan[c.chan].vol);
+            chWrite(c.chan,0x04,parent->song.ignorePCEDACVolume?0xdf:(0xc0|chan[c.chan].vol));
             addWrite(0xffff0001+(c.chan<<8),chan[c.chan].dacRate);
           }
         }
@@ -362,7 +362,9 @@ int DivPlatformPCE::dispatch(DivCommand c) {
         chan[c.chan].vol=c.value;
         if (!chan[c.chan].std.vol.has) {
           chan[c.chan].outVol=c.value;
-          if (chan[c.chan].active) chWrite(c.chan,0x04,0x80|chan[c.chan].outVol);
+          if (chan[c.chan].active && !chan[c.chan].pcm) {
+            chWrite(c.chan,0x04,0x80|chan[c.chan].outVol);
+          }
         }
       }
       break;
@@ -464,7 +466,7 @@ void DivPlatformPCE::muteChannel(int ch, bool mute) {
   isMuted[ch]=mute;
   chWrite(ch,0x05,isMuted[ch]?0:chan[ch].pan);
   if (!isMuted[ch] && (chan[ch].pcm && chan[ch].dacSample!=-1)) {
-    chWrite(ch,0x04,0xc0|chan[ch].outVol);
+    chWrite(ch,0x04,parent->song.ignorePCEDACVolume?0xdf:(0xc0|chan[ch].outVol));
     chWrite(ch,0x06,chan[ch].dacOut&0x1f);
   }
 }
diff --git a/src/engine/song.h b/src/engine/song.h
index 09a89378c..28a31c759 100644
--- a/src/engine/song.h
+++ b/src/engine/song.h
@@ -511,6 +511,7 @@ struct DivSong {
   bool e1e2StopOnSameNote;
   bool brokenPortaArp;
   bool snNoLowPeriods;
+  bool ignorePCEDACVolume;
   bool autoSystem;
 
   std::vector<DivInstrument*> ins;
@@ -616,6 +617,7 @@ struct DivSong {
     e1e2StopOnSameNote(false),
     brokenPortaArp(false),
     snNoLowPeriods(false),
+    ignorePCEDACVolume(true),
     autoSystem(true) {
     for (int i=0; i<32; i++) {
       system[i]=DIV_SYSTEM_NULL;
diff --git a/src/gui/compatFlags.cpp b/src/gui/compatFlags.cpp
index 63571dcac..c3627efad 100644
--- a/src/gui/compatFlags.cpp
+++ b/src/gui/compatFlags.cpp
@@ -143,6 +143,10 @@ void FurnaceGUI::drawCompatFlags() {
     if (ImGui::IsItemHovered()) {
       ImGui::SetTooltip("when enabled, any SN period under 8 will be written as 1 instead.\nthis replicates DefleMask behavior, but reduces available period range.");
     }
+    ImGui::Checkbox("Ignore PC Engine DAC Volume",&e->song.ignorePCEDACVolume);
+    if (ImGui::IsItemHovered()) {
+      ImGui::SetTooltip("when enabled, PC Engine DAC Volume is ignored.");
+    }
 
     ImGui::Text("Pitch linearity:");
     if (ImGui::RadioButton("None",e->song.linearPitch==0)) {