GUI: better DPCM mapping, part 2

src/engine/fileOps.cpp

@@ -184,6 +184,7 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
       ds.snNoLowPeriods=true;
       ds.disableSampleMacro=true;
       ds.preNoteNoEffect=true;
+      ds.oldDPCM=true;
       ds.delayBehavior=0;
       ds.jumpTreatment=2;
 
@@ -1856,6 +1857,9 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
     if (ds.version<168) {
       ds.preNoteNoEffect=true;
     }
+    if (ds.version<183) {
+      ds.oldDPCM=true;
+    }
     ds.isDMF=false;
 
     reader.readS(); // reserved
@@ -2374,7 +2378,12 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
       } else {
         reader.readC();
       }
-      for (int i=0; i<5; i++) {
+      if (ds.version>=183) {
+        ds.oldDPCM=reader.readC();
+      } else {
+        reader.readC();
+      }
+      for (int i=0; i<4; i++) {
         reader.readC();
       }
     }
@@ -5438,7 +5447,8 @@ SafeWriter* DivEngine::saveFur(bool notPrimary, bool newPatternFormat) {
   w->writeC(song.brokenPortaLegato);
   w->writeC(song.brokenFMOff);
   w->writeC(song.preNoteNoEffect);
-  for (int i=0; i<5; i++) {
+  w->writeC(song.oldDPCM);
+  for (int i=0; i<4; i++) {
     w->writeC(0);
   }
 

src/engine/instrument.h

@@ -486,8 +486,8 @@ struct DivInstrumentAmiga {
   }
 
   /**
-   * get the sample frequency at specified note.
-   * @return the frequency, or -1 if not using note map.
+   * get the sample playback note at specified note.
+   * @return the note, or -1 if not using note map.
    */
   inline int getFreq(int note) {
     if (useNoteMap) {
@@ -498,6 +498,32 @@ struct DivInstrumentAmiga {
     return note;
   }
 
+  /**
+   * get the DPCM pitch at specified note.
+   * @return the pitch, or -1 if not using note map.
+   */
+  inline signed char getDPCMFreq(int note) {
+    if (useNoteMap) {
+      if (note<0) note=0;
+      if (note>119) note=119;
+      return noteMap[note].dpcmFreq;
+    }
+    return -1;
+  }
+
+  /**
+   * get the DPCM delta counter value at specified note.
+   * @return the delta counter value, or -1 if not using note map.
+   */
+  inline signed char getDPCMDelta(int note) {
+    if (useNoteMap) {
+      if (note<0) note=0;
+      if (note>119) note=119;
+      return noteMap[note].dpcmDelta;
+    }
+    return -1;
+  }
+
   DivInstrumentAmiga():
     initSample(0),
     useNoteMap(false),

src/engine/platform/nes.cpp

@@ -343,6 +343,10 @@ void DivPlatformNES::tick(bool sysTick) {
           } else {
             rWrite(0x4010,calcDPCMRate(dacRate)|(goingToLoop?0x40:0));
           }
+          if (nextDPCMDelta>=0) {
+            rWrite(0x4011,nextDPCMDelta);
+            nextDPCMDelta=-1;
+          }
           rWrite(0x4012,(dpcmAddr>>6)&0xff);
           rWrite(0x4013,dpcmLen&0xff);
           rWrite(0x4015,31);
@@ -373,11 +377,38 @@ int DivPlatformNES::dispatch(DivCommand c) {
   switch (c.cmd) {
     case DIV_CMD_NOTE_ON:
       if (c.chan==4) { // PCM
-        DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_STD);
-        if (ins->type==DIV_INS_AMIGA) {
+        DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_NES);
+        if (ins->type==DIV_INS_AMIGA || (ins->type==DIV_INS_NES && !parent->song.oldDPCM)) {
+          if (ins->type==DIV_INS_NES) {
+            if (!dpcmMode) {
+              dpcmMode=true;
+              if (dumpWrites) addWrite(0xffff0002,0);
+              dacSample=-1;
+              rWrite(0x4015,15);
+              rWrite(0x4010,0);
+              rWrite(0x4012,0);
+              rWrite(0x4013,0);
+              rWrite(0x4015,31);
+            }
+
+            if (ins->amiga.useNoteMap) {
+              nextDPCMFreq=ins->amiga.getDPCMFreq(c.value);
+              if (nextDPCMFreq<0 || nextDPCMFreq>15) nextDPCMFreq=lastDPCMFreq;
+              lastDPCMFreq=nextDPCMFreq;
+              nextDPCMDelta=ins->amiga.getDPCMDelta(c.value);
+            } else {
+              if (c.value==DIV_NOTE_NULL) {
+                nextDPCMFreq=lastDPCMFreq;
+              } else {
+                nextDPCMFreq=c.value&15;
+              }
+            }
+          }
           if (c.value!=DIV_NOTE_NULL) {
             dacSample=ins->amiga.getSample(c.value);
-            c.value=ins->amiga.getFreq(c.value);
+            if (ins->type==DIV_INS_AMIGA) {
+              c.value=ins->amiga.getFreq(c.value);
+            }
           }
           if (dacSample<0 || dacSample>=parent->song.sampleLen) {
             dacSample=-1;
@@ -452,7 +483,7 @@ int DivPlatformNES::dispatch(DivCommand c) {
       }
       chan[c.chan].active=true;
       chan[c.chan].keyOn=true;
-      chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_STD));
+      chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_NES));
       if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) {
         chan[c.chan].outVol=chan[c.chan].vol;
       }
@@ -614,7 +645,7 @@ int DivPlatformNES::dispatch(DivCommand c) {
       break;
     case DIV_CMD_PRE_PORTA:
       if (chan[c.chan].active && c.value2) {
-        if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_STD));
+        if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_NES));
       }
       if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_PERIODIC(chan[c.chan].note);
       chan[c.chan].inPorta=c.value;
@@ -700,6 +731,8 @@ void DivPlatformNES::reset() {
   goingToLoop=false;
   countMode=false;
   nextDPCMFreq=-1;
+  nextDPCMDelta=-1;
+  lastDPCMFreq=15;
   linearCount=255;
 
   if (useNP) {

src/engine/platform/nes.h

@@ -54,6 +54,8 @@ class DivPlatformNES: public DivDispatch {
   unsigned char apuType;
   unsigned char linearCount;
   signed char nextDPCMFreq;
+  signed char nextDPCMDelta;
+  signed char lastDPCMFreq;
   bool dpcmMode;
   bool dpcmModeDefault;
   bool dacAntiClickOn;

src/engine/song.h

@@ -377,6 +377,7 @@ struct DivSong {
   bool brokenPortaLegato;
   bool brokenFMOff;
   bool preNoteNoEffect;
+  bool oldDPCM;
 
   std::vector<DivInstrument*> ins;
   std::vector<DivWavetable*> wave;
@@ -496,7 +497,8 @@ struct DivSong {
     patchbayAuto(true),
     brokenPortaLegato(false),
     brokenFMOff(false),
-    preNoteNoEffect(false) {
+    preNoteNoEffect(false),
+    oldDPCM(false) {
     for (int i=0; i<DIV_MAX_CHIPS; i++) {
       system[i]=DIV_SYSTEM_NULL;
       systemVol[i]=1.0;