From a17e91955a0c9ceece6f5383a47fbb47433bdd85 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 11 Dec 2021 13:14:38 -0500
Subject: [PATCH] add reset() for every platform

---
 src/engine/platform/arcade.cpp     | 20 +++++++-----
 src/engine/platform/arcade.h       |  1 +
 src/engine/platform/c64.cpp        | 26 ++++++++++------
 src/engine/platform/c64.h          |  1 +
 src/engine/platform/dummy.cpp      | 11 +++++--
 src/engine/platform/dummy.h        |  1 +
 src/engine/platform/gb.cpp         | 23 +++++++++-----
 src/engine/platform/gb.h           |  1 +
 src/engine/platform/genesis.cpp    | 41 ++++++++++++++----------
 src/engine/platform/genesis.h      |  1 +
 src/engine/platform/genesisext.cpp | 21 ++++++++-----
 src/engine/platform/genesisext.h   |  1 +
 src/engine/platform/nes.cpp        | 50 +++++++++++++-----------------
 src/engine/platform/nes.h          |  1 +
 src/engine/platform/pce.cpp        | 40 ++++++++++++++----------
 src/engine/platform/pce.h          |  1 +
 src/engine/platform/sms.cpp        | 13 ++++++--
 src/engine/platform/sms.h          |  1 +
 src/engine/platform/ym2610.cpp     |  1 +
 19 files changed, 157 insertions(+), 98 deletions(-)

diff --git a/src/engine/platform/arcade.cpp b/src/engine/platform/arcade.cpp
index ccab36b81..e55636043 100644
--- a/src/engine/platform/arcade.cpp
+++ b/src/engine/platform/arcade.cpp
@@ -340,16 +340,12 @@ int DivPlatformArcade::dispatch(DivCommand c) {
   return 1;
 }
 
-bool DivPlatformArcade::isStereo() {
-  return true;
-}
-
-int DivPlatformArcade::init(DivEngine* p, int channels, int sugRate, bool pal) {
-  parent=p;
-  rate=447443;
+void DivPlatformArcade::reset() {
+  while (!writes.empty()) writes.pop();
   memset(&fm,0,sizeof(opm_t));
   OPM_Reset(&fm);
   for (int i=0; i<13; i++) {
+    chan[i]=DivPlatformArcade::Channel();
     chan[i].vol=0x7f;
   }
 
@@ -367,6 +363,16 @@ int DivPlatformArcade::init(DivEngine* p, int channels, int sugRate, bool pal) {
   rWrite(0x19,0xff);
 
   extMode=false;
+}
+
+bool DivPlatformArcade::isStereo() {
+  return true;
+}
+
+int DivPlatformArcade::init(DivEngine* p, int channels, int sugRate, bool pal) {
+  parent=p;
+  rate=447443;
+  reset();
 
   return 13;
 }
diff --git a/src/engine/platform/arcade.h b/src/engine/platform/arcade.h
index c0777cd5a..85521516e 100644
--- a/src/engine/platform/arcade.h
+++ b/src/engine/platform/arcade.h
@@ -48,6 +48,7 @@ class DivPlatformArcade: public DivDispatch {
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     bool isStereo();
     int init(DivEngine* parent, int channels, int sugRate, bool pal);
diff --git a/src/engine/platform/c64.cpp b/src/engine/platform/c64.cpp
index 99e600f40..459d77dd4 100644
--- a/src/engine/platform/c64.cpp
+++ b/src/engine/platform/c64.cpp
@@ -279,6 +279,22 @@ int DivPlatformC64::dispatch(DivCommand c) {
   return 1;
 }
 
+void DivPlatformC64::reset() {
+  for (int i=0; i<3; i++) {
+    chan[i]=DivPlatformC64::Channel();
+  }
+
+  sid.reset();
+
+  sid.write(0x18,0x0f);
+
+  filtControl=0;
+  filtRes=0;
+  filtCut=0;
+  resetTime=1;
+  vol=15;
+}
+
 void DivPlatformC64::setChipModel(bool is6581) {
   if (is6581) {
     sid.set_chip_model(MOS6581);
@@ -295,15 +311,7 @@ int DivPlatformC64::init(DivEngine* p, int channels, int sugRate, bool pal) {
     rate=1022727;
   }
 
-  sid.reset();
-
-  sid.write(0x18,0x0f);
-
-  filtControl=0;
-  filtRes=0;
-  filtCut=0;
-  resetTime=1;
-  vol=15;
+  reset();
 
   return 3;
 }
diff --git a/src/engine/platform/c64.h b/src/engine/platform/c64.h
index cd9f17edd..71d77c724 100644
--- a/src/engine/platform/c64.h
+++ b/src/engine/platform/c64.h
@@ -55,6 +55,7 @@ class DivPlatformC64: public DivDispatch {
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     int init(DivEngine* parent, int channels, int sugRate, bool pal);
     void setChipModel(bool is6581);
diff --git a/src/engine/platform/dummy.cpp b/src/engine/platform/dummy.cpp
index 0cdaf2f1a..ca5b3f5ac 100644
--- a/src/engine/platform/dummy.cpp
+++ b/src/engine/platform/dummy.cpp
@@ -61,12 +61,17 @@ int DivPlatformDummy::dispatch(DivCommand c) {
   return 1;
 }
 
+void DivPlatformDummy::reset() {
+  for (int i=0; i<chans; i++) {
+    chan[i]=DivPlatformDummy::Channel();
+    chan[i].vol=0x0f;
+  }
+}
+
 int DivPlatformDummy::init(DivEngine* p, int channels, int sugRate, bool pal) {
   parent=p;
   rate=65536;
   chans=channels;
-  for (int i=0; i<chans; i++) {
-    chan[i].vol=0x0f;
-  }
+  reset();
   return channels;
 }
diff --git a/src/engine/platform/dummy.h b/src/engine/platform/dummy.h
index c51afc29d..b118e5078 100644
--- a/src/engine/platform/dummy.h
+++ b/src/engine/platform/dummy.h
@@ -17,6 +17,7 @@ class DivPlatformDummy: public DivDispatch {
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     int init(DivEngine* parent, int channels, int sugRate, bool pal);
 };
diff --git a/src/engine/platform/gb.cpp b/src/engine/platform/gb.cpp
index f77cbe3a4..3d6708f6a 100644
--- a/src/engine/platform/gb.cpp
+++ b/src/engine/platform/gb.cpp
@@ -270,14 +270,10 @@ int DivPlatformGB::dispatch(DivCommand c) {
   return 1;
 }
 
-bool DivPlatformGB::isStereo() {
-  return true;
-}
-
-int DivPlatformGB::init(DivEngine* p, int channels, int sugRate, bool pal) {
-  parent=p;
-  rate=262144;
-  gb=new GB_gameboy_t;
+void DivPlatformGB::reset() {
+  for (int i=0; i<4; i++) {
+    chan[i]=DivPlatformGB::Channel();
+  }
   memset(gb,0,sizeof(GB_gameboy_t));
   gb->model=GB_MODEL_DMG_B;
   GB_apu_init(gb);
@@ -286,5 +282,16 @@ int DivPlatformGB::init(DivEngine* p, int channels, int sugRate, bool pal) {
   GB_apu_write(gb,0x26,0x80);
   GB_apu_write(gb,0x25,0xff);
   lastPan=0xff;
+}
+
+bool DivPlatformGB::isStereo() {
+  return true;
+}
+
+int DivPlatformGB::init(DivEngine* p, int channels, int sugRate, bool pal) {
+  parent=p;
+  rate=262144;
+  gb=new GB_gameboy_t;
+  reset();
   return 4;
 }
diff --git a/src/engine/platform/gb.h b/src/engine/platform/gb.h
index a8e3c1dae..a1ed47638 100644
--- a/src/engine/platform/gb.h
+++ b/src/engine/platform/gb.h
@@ -38,6 +38,7 @@ class DivPlatformGB: public DivDispatch {
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     bool isStereo();
     int init(DivEngine* parent, int channels, int sugRate, bool pal);
diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp
index eb6cff0dc..799676ff8 100644
--- a/src/engine/platform/genesis.cpp
+++ b/src/engine/platform/genesis.cpp
@@ -357,23 +357,11 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
   return 1;
 }
 
-bool DivPlatformGenesis::isStereo() {
-  return true;
-}
-
-bool DivPlatformGenesis::keyOffAffectsArp(int ch) {
-  return (ch>5);
-}
-
-int DivPlatformGenesis::init(DivEngine* p, int channels, int sugRate, bool pal) {
-  parent=p;
-  if (pal) {
-    rate=211125;
-  } else {
-    rate=213068;
-  }
+void DivPlatformGenesis::reset() {
+  while (!writes.empty()) writes.pop();
   OPN2_Reset(&fm);
   for (int i=0; i<10; i++) {
+    chan[i]=DivPlatformGenesis::Channel();
     chan[i].vol=0x7f;
   }
 
@@ -398,8 +386,29 @@ int DivPlatformGenesis::init(DivEngine* p, int channels, int sugRate, bool pal)
   delay=0;
   
   // PSG
-  psg.init(p,4,sugRate,pal);
+  psg.reset();
   psgClocks=0;
   psgOut=0;
+}
+
+bool DivPlatformGenesis::isStereo() {
+  return true;
+}
+
+bool DivPlatformGenesis::keyOffAffectsArp(int ch) {
+  return (ch>5);
+}
+
+int DivPlatformGenesis::init(DivEngine* p, int channels, int sugRate, bool pal) {
+  parent=p;
+  if (pal) {
+    rate=211125;
+  } else {
+    rate=213068;
+  }
+  // PSG
+  psg.init(p,4,sugRate,pal);
+
+  reset();
   return 10;
 }
diff --git a/src/engine/platform/genesis.h b/src/engine/platform/genesis.h
index 7d2b546b8..b56fb488c 100644
--- a/src/engine/platform/genesis.h
+++ b/src/engine/platform/genesis.h
@@ -51,6 +51,7 @@ class DivPlatformGenesis: public DivDispatch {
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     bool isStereo();
     bool keyOffAffectsArp(int ch);
diff --git a/src/engine/platform/genesisext.cpp b/src/engine/platform/genesisext.cpp
index e5a4a9694..5d9e94c00 100644
--- a/src/engine/platform/genesisext.cpp
+++ b/src/engine/platform/genesisext.cpp
@@ -254,6 +254,19 @@ void DivPlatformGenesisExt::tick() {
   }
 }
 
+void DivPlatformGenesisExt::reset() {
+  DivPlatformGenesis::reset();
+
+  for (int i=0; i<4; i++) {
+    opChan[i]=DivPlatformGenesisExt::OpChannel();
+    opChan[i].vol=127;
+  }
+
+  // channel 3 mode
+  writes.emplace(0x27,0x40);
+  extMode=true;
+}
+
 bool DivPlatformGenesisExt::keyOffAffectsArp(int ch) {
   return (ch>8);
 }
@@ -261,12 +274,6 @@ bool DivPlatformGenesisExt::keyOffAffectsArp(int ch) {
 int DivPlatformGenesisExt::init(DivEngine* parent, int channels, int sugRate, bool pal) {
   DivPlatformGenesis::init(parent,channels,sugRate,pal);
 
-  for (int i=0; i<4; i++) {
-    opChan[i].vol=127;
-  }
-
-  // channel 3 mode
-  writes.emplace(0x27,0x40);
-  extMode=true;
+  reset();
   return 13;
 }
diff --git a/src/engine/platform/genesisext.h b/src/engine/platform/genesisext.h
index 538a5c8e2..d9c251841 100644
--- a/src/engine/platform/genesisext.h
+++ b/src/engine/platform/genesisext.h
@@ -16,6 +16,7 @@ class DivPlatformGenesisExt: public DivPlatformGenesis {
   OpChannel opChan[4];
   public:
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     bool keyOffAffectsArp(int ch);
     int init(DivEngine* parent, int channels, int sugRate, bool pal);
diff --git a/src/engine/platform/nes.cpp b/src/engine/platform/nes.cpp
index 53df12f24..1b9ea0824 100644
--- a/src/engine/platform/nes.cpp
+++ b/src/engine/platform/nes.cpp
@@ -252,12 +252,6 @@ int DivPlatformNES::dispatch(DivCommand c) {
         sampleBank=parent->song.sample.size()/12;
       }
       break;
-    case DIV_CMD_PANNING: {
-      lastPan&=~(0x11<<c.chan);
-      if (c.value==0) c.value=0x11;
-      lastPan|=c.value<<c.chan;
-      break;
-    }
     case DIV_CMD_LEGATO:
       if (c.chan==3) break;
       chan[c.chan].baseFreq=round(freqBase/pow(2.0f,((float)(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp-12):(0)))/12.0f)));
@@ -280,6 +274,26 @@ int DivPlatformNES::dispatch(DivCommand c) {
   return 1;
 }
 
+void DivPlatformNES::reset() {
+  for (int i=0; i<5; i++) {
+    chan[i]=DivPlatformNES::Channel();
+  }
+
+  dacPeriod=0;
+  dacPos=0;
+  dacRate=0;
+  dacSample=-1;
+  sampleBank=0;
+
+  apu_turn_on();
+  apu.cpu_cycles=0;
+  apu.cpu_opcode_cycle=0;
+
+  apu_wr_reg(0x4015,0x1f);
+  apu_wr_reg(0x4001,0x08);
+  apu_wr_reg(0x4005,0x08);
+}
+
 bool DivPlatformNES::keyOffAffectsArp(int ch) {
   return true;
 }
@@ -294,31 +308,9 @@ int DivPlatformNES::init(DivEngine* p, int channels, int sugRate, bool pal) {
     freqBase=FREQ_BASE;
   }
 
-  dacPeriod=0;
-  dacPos=0;
-  dacRate=0;
-  dacSample=-1;
-  sampleBank=0;
-
   init_nla_table(500,500);
-
-  apu_turn_on();
   apu.addrSpace=new unsigned char[65536];
-  apu.cpu_cycles=0;
-  apu.cpu_opcode_cycle=0;
 
-  apu_wr_reg(0x4015,0x1f);
-  apu_wr_reg(0x4001,0x08);
-  apu_wr_reg(0x4005,0x08);
-  /*apu_wr_reg(0x4000,0x3f);
-  apu_wr_reg(0x4001,0x00);
-  apu_wr_reg(0x4002,0xff);
-  apu_wr_reg(0x4003,0x10);
-  apu_wr_reg(0x4004,0x3f);
-  apu_wr_reg(0x4005,0x00);
-  apu_wr_reg(0x4006,0xfe);
-  apu_wr_reg(0x4007,0x10);*/
-
-  lastPan=0xff;
+  reset();
   return 5;
 }
diff --git a/src/engine/platform/nes.h b/src/engine/platform/nes.h
index 969fad36e..534f55a70 100644
--- a/src/engine/platform/nes.h
+++ b/src/engine/platform/nes.h
@@ -41,6 +41,7 @@ class DivPlatformNES: public DivDispatch {
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     bool keyOffAffectsArp(int ch);
     int init(DivEngine* parent, int channels, int sugRate, bool pal);
diff --git a/src/engine/platform/pce.cpp b/src/engine/platform/pce.cpp
index 5b3dc512b..f2d9f29be 100644
--- a/src/engine/platform/pce.cpp
+++ b/src/engine/platform/pce.cpp
@@ -263,23 +263,12 @@ int DivPlatformPCE::dispatch(DivCommand c) {
   return 1;
 }
 
-bool DivPlatformPCE::isStereo() {
-  return true;
-}
-
-bool DivPlatformPCE::keyOffAffectsArp(int ch) {
-  return true;
-}
-
-
-int DivPlatformPCE::init(DivEngine* p, int channels, int sugRate, bool pal) {
-  parent=p;
-  if (pal) { // technically there is no PAL PC Engine but oh well...
-    rate=1773448;
-  } else {
-    rate=1789773;
+void DivPlatformPCE::reset() {
+  while (!writes.empty()) writes.pop();
+  for (int i=0; i<6; i++) {
+    chan[i]=DivPlatformPCE::Channel();
   }
-  pce=new PCE_PSG(&tempL,&tempR,PCE_PSG::REVISION_HUC6280);
+  pce->Power(0);
   lastPan=0xff;
   tempL=0;
   tempR=0;
@@ -294,5 +283,24 @@ int DivPlatformPCE::init(DivEngine* p, int channels, int sugRate, bool pal) {
     chWrite(i,0x05,chan[i].pan);
   }
   delay=500;
+}
+
+bool DivPlatformPCE::isStereo() {
+  return true;
+}
+
+bool DivPlatformPCE::keyOffAffectsArp(int ch) {
+  return true;
+}
+
+int DivPlatformPCE::init(DivEngine* p, int channels, int sugRate, bool pal) {
+  parent=p;
+  if (pal) { // technically there is no PAL PC Engine but oh well...
+    rate=1773448;
+  } else {
+    rate=1789773;
+  }
+  pce=new PCE_PSG(&tempL,&tempR,PCE_PSG::REVISION_HUC6280);
+  reset();
   return 6;
 }
diff --git a/src/engine/platform/pce.h b/src/engine/platform/pce.h
index f3911dd7d..a36761a55 100644
--- a/src/engine/platform/pce.h
+++ b/src/engine/platform/pce.h
@@ -53,6 +53,7 @@ class DivPlatformPCE: public DivDispatch {
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     bool isStereo();
     bool keyOffAffectsArp(int ch);
diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index 20092bfed..241664e9d 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -159,6 +159,15 @@ int DivPlatformSMS::dispatch(DivCommand c) {
   return 1;
 }
 
+void DivPlatformSMS::reset() {
+  for (int i=0; i<4; i++) {
+    chan[i]=DivPlatformSMS::Channel();
+  }
+  sn->device_start();
+  snNoiseMode=3;
+  updateSNMode=false;
+}
+
 bool DivPlatformSMS::keyOffAffectsArp(int ch) {
   return true;
 }
@@ -171,8 +180,6 @@ int DivPlatformSMS::init(DivEngine* p, int channels, int sugRate, bool pal) {
     rate=223722;
   }
   sn=new sn76496_device(rate);
-  sn->device_start();
-  snNoiseMode=3;
-  updateSNMode=false;
+  reset();
   return 4;
 }
diff --git a/src/engine/platform/sms.h b/src/engine/platform/sms.h
index e468dd070..ce0482fb9 100644
--- a/src/engine/platform/sms.h
+++ b/src/engine/platform/sms.h
@@ -34,6 +34,7 @@ class DivPlatformSMS: public DivDispatch {
     int acquireOne();
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
     int dispatch(DivCommand c);
+    void reset();
     void tick();
     bool keyOffAffectsArp(int ch);
     int init(DivEngine* parent, int channels, int sugRate, bool pal);
diff --git a/src/engine/platform/ym2610.cpp b/src/engine/platform/ym2610.cpp
index 9e2606b00..01b0a7a69 100644
--- a/src/engine/platform/ym2610.cpp
+++ b/src/engine/platform/ym2610.cpp
@@ -472,6 +472,7 @@ int DivPlatformYM2610::dispatch(DivCommand c) {
 }
 
 void DivPlatformYM2610::reset() {
+  while (!writes.empty()) writes.pop();
   fm->reset();
   for (int i=0; i<13; i++) {
     chan[i]=DivPlatformYM2610::Channel();