fix sample issues, part 3

src/engine/platform/k007232.cpp

@@ -281,7 +281,9 @@ int DivPlatformK007232::dispatch(DivCommand c) {
       chan[c.chan].macroVolMul=ins->type==DIV_INS_AMIGA?64:15;
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].sample=ins->amiga.getSample(c.value);
+        chan[c.chan].sampleNote=c.value;
         c.value=ins->amiga.getFreq(c.value);
+        chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
       }
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);

src/engine/platform/k053260.cpp

@@ -230,7 +230,9 @@ int DivPlatformK053260::dispatch(DivCommand c) {
       chan[c.chan].macroVolMul=ins->type==DIV_INS_AMIGA?64:127;
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].sample=ins->amiga.getSample(c.value);
+        chan[c.chan].sampleNote=c.value;
         c.value=ins->amiga.getFreq(c.value);
+        chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
       }
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);

src/engine/platform/lynx.cpp

@@ -236,7 +236,9 @@ int DivPlatformLynx::dispatch(DivCommand c) {
       if (c.value!=DIV_NOTE_NULL) {
         if (chan[c.chan].pcm) {
           chan[c.chan].sample=ins->amiga.getSample(c.value);
+          chan[c.chan].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           chan[c.chan].sampleBaseFreq=NOTE_FREQUENCY(c.value);
           chan[c.chan].sampleAccum=0;
           chan[c.chan].samplePos=0;

src/engine/platform/mmc5.cpp

@@ -178,7 +178,9 @@ int DivPlatformMMC5::dispatch(DivCommand c) {
         if (ins->type==DIV_INS_AMIGA) {
           if (c.value!=DIV_NOTE_NULL) {
             dacSample=ins->amiga.getSample(c.value);
+            chan[c.chan].sampleNote=c.value;
             c.value=ins->amiga.getFreq(c.value);
+            chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           }
           if (dacSample<0 || dacSample>=parent->song.sampleLen) {
             dacSample=-1;

src/engine/platform/nes.cpp

@@ -407,7 +407,9 @@ int DivPlatformNES::dispatch(DivCommand c) {
           if (c.value!=DIV_NOTE_NULL) {
             dacSample=ins->amiga.getSample(c.value);
             if (ins->type==DIV_INS_AMIGA) {
+              chan[c.chan].sampleNote=c.value;
               c.value=ins->amiga.getFreq(c.value);
+              chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
             }
           }
           if (dacSample<0 || dacSample>=parent->song.sampleLen) {

src/engine/platform/pce.cpp

@@ -285,7 +285,9 @@ int DivPlatformPCE::dispatch(DivCommand c) {
           if (skipRegisterWrites) break;
           if (c.value!=DIV_NOTE_NULL) {
             chan[c.chan].dacSample=ins->amiga.getSample(c.value);
+            chan[c.chan].sampleNote=c.value;
             c.value=ins->amiga.getFreq(c.value);
+            chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           }
           if (chan[c.chan].dacSample<0 || chan[c.chan].dacSample>=parent->song.sampleLen) {
             chan[c.chan].dacSample=-1;

src/engine/platform/pcmdac.cpp

@@ -326,7 +326,9 @@ int DivPlatformPCMDAC::dispatch(DivCommand c) {
       } else {
         if (c.value!=DIV_NOTE_NULL) {
           chan[0].sample=ins->amiga.getSample(c.value);
+          chan[c.chan].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
         }
         chan[0].useWave=false;
       }

src/engine/platform/qsound.cpp

@@ -451,7 +451,9 @@ int DivPlatformQSound::dispatch(DivCommand c) {
       chan[c.chan].isNewQSound=(ins->type==DIV_INS_QSOUND);
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].sample=ins->amiga.getSample(c.value);
+        chan[c.chan].sampleNote=c.value;
         c.value=ins->amiga.getFreq(c.value);
+        chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
       }
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].baseFreq=QS_NOTE_FREQUENCY(c.value);

src/engine/platform/rf5c68.cpp

@@ -184,7 +184,9 @@ int DivPlatformRF5C68::dispatch(DivCommand c) {
       chan[c.chan].macroVolMul=ins->type==DIV_INS_AMIGA?64:255;
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].sample=ins->amiga.getSample(c.value);
+        chan[c.chan].sampleNote=c.value;
         c.value=ins->amiga.getFreq(c.value);
+        chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
       }
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value);

src/engine/platform/segapcm.cpp

@@ -189,7 +189,9 @@ int DivPlatformSegaPCM::dispatch(DivCommand c) {
         chan[c.chan].isNewSegaPCM=(ins->type==DIV_INS_SEGAPCM);
         if (c.value!=DIV_NOTE_NULL) {
           chan[c.chan].pcm.sample=ins->amiga.getSample(c.value);
+          chan[c.chan].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
         }
         if (chan[c.chan].pcm.sample<0 || chan[c.chan].pcm.sample>=parent->song.sampleLen) {
           chan[c.chan].pcm.sample=-1;

src/engine/platform/snes.cpp

@@ -345,7 +345,9 @@ int DivPlatformSNES::dispatch(DivCommand c) {
       } else {
         if (c.value!=DIV_NOTE_NULL) {
           chan[c.chan].sample=ins->amiga.getSample(c.value);
+          chan[c.chan].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
         }
         chan[c.chan].useWave=false;
       }

src/engine/platform/su.cpp

@@ -282,7 +282,9 @@ int DivPlatformSoundUnit::dispatch(DivCommand c) {
       if (chan[c.chan].pcm) {
         if (c.value!=DIV_NOTE_NULL) {
           chan[c.chan].sample=ins->amiga.getSample(c.value);
+          chan[c.chan].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
         }
       }
       if (c.value!=DIV_NOTE_NULL) {

src/engine/platform/swan.cpp

@@ -265,7 +265,9 @@ int DivPlatformSwan::dispatch(DivCommand c) {
           if (ins->type==DIV_INS_AMIGA || ins->amiga.useSample) {
             if (c.value!=DIV_NOTE_NULL) {
               dacSample=ins->amiga.getSample(c.value);
+              chan[c.chan].sampleNote=c.value;
               c.value=ins->amiga.getFreq(c.value);
+              chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
             }
             if (dacSample<0 || dacSample>=parent->song.sampleLen) {
               dacSample=-1;

src/engine/platform/vera.cpp

@@ -302,7 +302,9 @@ int DivPlatformVERA::dispatch(DivCommand c) {
         if (c.value!=DIV_NOTE_NULL) {
           DivInstrument* ins=parent->getIns(chan[16].ins,DIV_INS_VERA);
           chan[16].pcm.sample=ins->amiga.getSample(c.value);
+          chan[16].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[16].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
         }
         if (chan[16].pcm.sample<0 || chan[16].pcm.sample>=parent->song.sampleLen) {
           chan[16].pcm.sample=-1;

src/engine/platform/vrc6.cpp

@@ -242,7 +242,9 @@ int DivPlatformVRC6::dispatch(DivCommand c) {
           if (ins->type==DIV_INS_AMIGA || ins->amiga.useSample) {
             if (c.value!=DIV_NOTE_NULL) {
               chan[c.chan].dacSample=ins->amiga.getSample(c.value);
+              chan[c.chan].sampleNote=c.value;
               c.value=ins->amiga.getFreq(c.value);
+              chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
             }
             if (chan[c.chan].dacSample<0 || chan[c.chan].dacSample>=parent->song.sampleLen) {
               chan[c.chan].dacSample=-1;

src/engine/platform/x1_010.cpp

@@ -543,7 +543,9 @@ int DivPlatformX1_010::dispatch(DivCommand c) {
           chan[c.chan].macroInit(ins);
           if (c.value!=DIV_NOTE_NULL) {
             chan[c.chan].sample=ins->amiga.getSample(c.value);
+            chan[c.chan].sampleNote=c.value;
             c.value=ins->amiga.getFreq(c.value);
+            chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           }
           if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
             DivSample* s=parent->getSample(chan[c.chan].sample);

src/engine/platform/ym2608.cpp

@@ -919,7 +919,9 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
           }
           if (c.value!=DIV_NOTE_NULL) {
             chan[c.chan].sample=ins->amiga.getSample(c.value);
+            chan[c.chan].sampleNote=c.value;
             c.value=ins->amiga.getFreq(c.value);
+            chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           }
           if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
             DivSample* s=parent->getSample(chan[c.chan].sample);

src/engine/platform/ym2610.cpp

@@ -850,7 +850,9 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
           }
           if (c.value!=DIV_NOTE_NULL) {
             chan[c.chan].sample=ins->amiga.getSample(c.value);
+            chan[c.chan].sampleNote=c.value;
             c.value=ins->amiga.getFreq(c.value);
+            chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           }
           if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
             DivSample* s=parent->getSample(chan[c.chan].sample);

src/engine/platform/ym2610b.cpp

@@ -917,7 +917,9 @@ int DivPlatformYM2610B::dispatch(DivCommand c) {
           }
           if (c.value!=DIV_NOTE_NULL) {
             chan[c.chan].sample=ins->amiga.getSample(c.value);
+            chan[c.chan].sampleNote=c.value;
             c.value=ins->amiga.getFreq(c.value);
+            chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           }
           if (chan[c.chan].sample>=0 && chan[c.chan].sample<parent->song.sampleLen) {
             DivSample* s=parent->getSample(chan[c.chan].sample);

src/engine/platform/ymz280b.cpp

@@ -213,7 +213,9 @@ int DivPlatformYMZ280B::dispatch(DivCommand c) {
       chan[c.chan].macroVolMul=ins->type==DIV_INS_AMIGA?64:255;
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].sample=ins->amiga.getSample(c.value);
+        chan[c.chan].sampleNote=c.value;
         c.value=ins->amiga.getFreq(c.value);
+        chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
       }
       if (c.value!=DIV_NOTE_NULL) {
         chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value);

src/engine/platform/zxbeeperquadtone.cpp

@@ -187,7 +187,9 @@ int DivPlatformZXBeeperQuadTone::dispatch(DivCommand c) {
         DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_AMIGA);
         if (c.value!=DIV_NOTE_NULL) {
           curSample=ins->amiga.getSample(c.value);
+          chan[c.chan].sampleNote=c.value;
           c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].sampleNoteDelta=c.value-chan[c.chan].sampleNote;
           chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);
           chan[c.chan].freqChanged=true;
           chan[c.chan].note=c.value;