SegaPCM: finally implement new behavior

TODO.md

@@ -4,7 +4,6 @@
   - CSM
 - MSM6258 pitch and clock select
 - the last compat flags
-  - newSegaPCM
   - newVolumeScaling
 - collapse/expand pattern and song
 - Game Boy envelope macro/sequence

src/engine/platform/segapcm.cpp

@@ -85,10 +85,17 @@ void DivPlatformSegaPCM::tick(bool sysTick) {
   for (int i=0; i<16; i++) {
     chan[i].std.next();
 
-    // TODO: fix
+    if (parent->song.newSegaPCM) {
-    /*if (chan[i].std.vol.had) {
+      if (chan[i].std.vol.had) {
         chan[i].outVol=(chan[i].vol*MIN(127,chan[i].std.vol.val))/127;
-    }*/
+        chan[i].chVolL=(chan[i].outVol*chan[i].chPanL)/127;
+        chan[i].chVolR=(chan[i].outVol*chan[i].chPanR)/127;
+        if (dumpWrites) {
+          addWrite(0x10002+(i<<3),chan[i].chVolL);
+          addWrite(0x10003+(i<<3),chan[i].chVolR);
+        }
+      }
+    }
 
     if (chan[i].std.arp.had) {
       if (!chan[i].inPorta) {
@@ -107,14 +114,24 @@ void DivPlatformSegaPCM::tick(bool sysTick) {
     }
 
     if (chan[i].std.panL.had) {
+      if (parent->song.newSegaPCM) {
+        chan[i].chPanL=chan[i].std.panL.val&127;
+        chan[i].chVolL=(chan[i].outVol*chan[i].chPanL)/127;
+      } else {
         chan[i].chVolL=chan[i].std.panL.val&127;
+      }
       if (dumpWrites) {
         addWrite(0x10002+(i<<3),chan[i].chVolL);
       }
     }
 
     if (chan[i].std.panR.had) {
+      if (parent->song.newSegaPCM) {
+        chan[i].chPanR=chan[i].std.panR.val&127;
+        chan[i].chVolR=(chan[i].outVol*chan[i].chPanR)/127;
+      } else {
         chan[i].chVolR=chan[i].std.panR.val&127;
+      }
       if (dumpWrites) {
         addWrite(0x10003+(i<<3),chan[i].chVolR);
       }
@@ -261,8 +278,13 @@ int DivPlatformSegaPCM::dispatch(DivCommand c) {
       if (!chan[c.chan].std.vol.has) {
         chan[c.chan].outVol=c.value;
       }
+      if (parent->song.newSegaPCM) {
+        chan[c.chan].chVolL=(c.value*chan[c.chan].chPanL)/127;
+        chan[c.chan].chVolR=(c.value*chan[c.chan].chPanR)/127;
+      } else {
         chan[c.chan].chVolL=c.value;
         chan[c.chan].chVolR=c.value;
+      }
       if (dumpWrites) {
         addWrite(0x10002+(c.chan<<3),chan[c.chan].chVolL);
         addWrite(0x10003+(c.chan<<3),chan[c.chan].chVolR);
@@ -280,8 +302,15 @@ int DivPlatformSegaPCM::dispatch(DivCommand c) {
       chan[c.chan].ins=c.value;
       break;
     case DIV_CMD_PANNING: {
+      if (parent->song.newSegaPCM) {
+        chan[c.chan].chPanL=c.value>>1;
+        chan[c.chan].chPanR=c.value2>>1;
+        chan[c.chan].chVolL=(chan[c.chan].outVol*chan[c.chan].chPanL)/127;
+        chan[c.chan].chVolR=(chan[c.chan].outVol*chan[c.chan].chPanR)/127;
+      } else {
         chan[c.chan].chVolL=c.value>>1;
         chan[c.chan].chVolR=c.value2>>1;
+      }
       if (dumpWrites) {
         addWrite(0x10002+(c.chan<<3),chan[c.chan].chVolL);
         addWrite(0x10003+(c.chan<<3),chan[c.chan].chVolR);

src/engine/platform/segapcm.h

@@ -34,6 +34,7 @@ class DivPlatformSegaPCM: public DivDispatch {
       bool active, insChanged, freqChanged, keyOn, keyOff, inPorta, portaPause, furnacePCM;
       int vol, outVol;
       unsigned char chVolL, chVolR;
+      unsigned char chPanL, chPanR;
 
       struct PCMChannel {
         int sample;
@@ -46,7 +47,29 @@ class DivPlatformSegaPCM: public DivDispatch {
         std.init(which);
         pitch2=0;
       }
-      Channel(): freqH(0), freqL(0), freq(0), baseFreq(0), pitch(0), pitch2(0), note(0), ins(-1), active(false), insChanged(true), freqChanged(false), keyOn(false), keyOff(false), inPorta(false), portaPause(false), furnacePCM(false), vol(0), outVol(0), chVolL(127), chVolR(127) {}
+      Channel():
+        freqH(0),
+        freqL(0),
+        freq(0),
+        baseFreq(0),
+        pitch(0),
+        pitch2(0),
+        note(0),
+        ins(-1),
+        active(false),
+        insChanged(true),
+        freqChanged(false),
+        keyOn(false),
+        keyOff(false),
+        inPorta(false),
+        portaPause(false),
+        furnacePCM(false),
+        vol(0),
+        outVol(0),
+        chVolL(127),
+        chVolR(127),
+        chPanL(127),
+        chPanR(127) {}
     };
     Channel chan[16];
     DivDispatchOscBuffer* oscBuf[16];