From 677f7fe682fc163f5aa001ce4b1cee03455a3cd6 Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Wed, 26 Jul 2023 19:16:57 -0500
Subject: [PATCH] ES5506: some cleanup

and fix sample map... ugh

issue #1282
---
 src/engine/platform/es5506.cpp | 40 +++-------------------------------
 src/engine/sysDef.cpp          |  1 -
 src/gui/insEdit.cpp            |  1 +
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/engine/platform/es5506.cpp b/src/engine/platform/es5506.cpp
index c44cdb0cf..4f8745bda 100644
--- a/src/engine/platform/es5506.cpp
+++ b/src/engine/platform/es5506.cpp
@@ -360,26 +360,6 @@ void DivPlatformES5506::tick(bool sysTick) {
         }
       }
     }
-    if (chan[i].pcm.isNoteMap) {
-    // note map macros
-      if (chan[i].std.wave.had) {
-        if (chan[i].std.wave.val>=0 && chan[i].std.wave.val<120) {
-          if (chan[i].pcm.next!=chan[i].std.wave.val) {
-            chan[i].pcm.next=chan[i].std.wave.val;
-            chan[i].pcmChanged.index=1;
-          }
-        }
-      }
-    } else if (!chan[i].pcm.isNoteMap) {
-      if (chan[i].std.wave.had) {
-        if (chan[i].std.wave.val>=0 && chan[i].std.wave.val<parent->song.sampleLen) {
-          if (chan[i].pcm.next!=chan[i].std.wave.val) {
-            chan[i].pcm.next=chan[i].std.wave.val;
-            chan[i].pcmChanged.index=1;
-          }
-        }
-      }
-    }
     // update registers
     if (chan[i].volChanged.changed) {
       // calculate volume (16 bit)
@@ -432,7 +412,7 @@ void DivPlatformES5506::tick(bool sysTick) {
               off=(double)center/8363.0;
             }
             if (ins->amiga.useNoteMap) {
-              chan[i].pcm.note=next;
+              //chan[i].pcm.note=next;
             }
             // get loop mode
             DivSampleLoopMode loopMode=s->isLoopable()?s->loopMode:DIV_SAMPLE_LOOP_MAX;
@@ -748,13 +728,13 @@ int DivPlatformES5506::dispatch(DivCommand c) {
       if (((ins->amiga.useNoteMap) && (c.value>=0 && c.value<120)) ||
           ((!ins->amiga.useNoteMap) && (ins->amiga.initSample>=0 && ins->amiga.initSample<parent->song.sampleLen))) {
         int sample=ins->amiga.getSample(c.value);
-        c.value=ins->amiga.getFreq(c.value);
         if (sample>=0 && sample<parent->song.sampleLen) {
           sampleValid=true;
           chan[c.chan].volMacroMax=ins->type==DIV_INS_AMIGA?64:0xfff;
           chan[c.chan].panMacroMax=ins->type==DIV_INS_AMIGA?127:0xfff;
-          chan[c.chan].pcm.note=c.value;
           chan[c.chan].pcm.next=ins->amiga.useNoteMap?c.value:sample;
+          c.value=ins->amiga.getFreq(c.value);
+          chan[c.chan].pcm.note=c.value;
           chan[c.chan].filter=ins->es5506.filter;
           chan[c.chan].envelope=ins->es5506.envelope;
         }
@@ -870,20 +850,6 @@ int DivPlatformES5506::dispatch(DivCommand c) {
       chan[c.chan].pitch=c.value;
       chan[c.chan].freqChanged=true;
       break;
-    // sample commands
-    case DIV_CMD_WAVE:
-      if (!chan[c.chan].useWave) {
-        if (chan[c.chan].active) {
-          DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_ES5506);
-          if (((ins->amiga.useNoteMap) && (c.value>=0 && c.value<120)) ||
-              ((!ins->amiga.useNoteMap) && (c.value>=0 && c.value<parent->song.sampleLen))) {
-            chan[c.chan].pcm.next=c.value;
-            chan[c.chan].pcmChanged.index=1;
-          }
-        }
-      }
-      // reserved for useWave
-      break;
     // Filter commands
     case DIV_CMD_ES5506_FILTER_MODE:
       if (!chan[c.chan].active) {
diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp
index e242f0a39..f999a2d6f 100644
--- a/src/engine/sysDef.cpp
+++ b/src/engine/sysDef.cpp
@@ -1542,7 +1542,6 @@ void DivEngine::registerSystems() {
   );
 
   EffectHandlerMap es5506PreEffectHandlerMap={
-      {0x10, {DIV_CMD_WAVE, "10xx: Change waveform (00 to FF)",effectVal}},
       {0x11, {DIV_CMD_ES5506_FILTER_MODE, "11xx: Set filter mode (00 to 03)",effectValAnd<3>}},
       {0x14, {DIV_CMD_ES5506_FILTER_K1, "14xx: Set filter coefficient K1 low byte (00 to FF)",effectValShift<0>,constVal<0x00ff>}},
       {0x15, {DIV_CMD_ES5506_FILTER_K1, "15xx: Set filter coefficient K1 high byte (00 to FF)",effectValShift<8>,constVal<0xff00>}},
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index e3997bf46..341f38a44 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -5563,6 +5563,7 @@ void FurnaceGUI::drawInsEdit() {
           if (ins->type==DIV_INS_MSM6295) waveMax=0;
           if (ins->type==DIV_INS_SEGAPCM) waveMax=0;
           if (ins->type==DIV_INS_K007232) waveMax=0;
+          if (ins->type==DIV_INS_ES5506) waveMax=0;
           if (ins->type==DIV_INS_GA20) waveMax=0;
           if (ins->type==DIV_INS_K053260) waveMax=0;
           if (ins->type==DIV_INS_POKEMINI) waveMax=0;