From e25ab0d46a8f27152cc8e2defaf230918bd9af64 Mon Sep 17 00:00:00 2001
From: cam900 <dbtlrchl@naver.com>
Date: Tue, 15 Nov 2022 11:58:39 +0900
Subject: [PATCH 01/86] Add FM Towns preset with Extended channel 3

---
 src/gui/presets.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index 8b0e5fcc2..82bab766c 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -736,7 +736,13 @@ void FurnaceGUI::initSystemPresets() {
   );
   ENTRY(
     "FM Towns", {
-      DIV_SYSTEM_YM2612, 64, 0, 2, // YM3438
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2"), // YM3438
+      CH(DIV_SYSTEM_RF5C68, 64, 0, ""),
+    }
+  );
+  ENTRY(
+    "FM Towns (extended channel 3)", {
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2"), // YM3438
       CH(DIV_SYSTEM_RF5C68, 64, 0, ""),
     }
   );

From 8c356f9a28d3f7ab54c962e9cc23030dfd3ebf71 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 01:34:18 -0500
Subject: [PATCH 02/86] convert presets to new format, part 6

---
 src/gui/gui.h       |   1 -
 src/gui/presets.cpp | 564 ++++++++++++++++++++++++--------------------
 2 files changed, 307 insertions(+), 258 deletions(-)

diff --git a/src/gui/gui.h b/src/gui/gui.h
index 29ece540b..f8aad134a 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -913,7 +913,6 @@ struct FurnaceGUISysDefChip {
 struct FurnaceGUISysDef {
   const char* name;
   String definition;
-  FurnaceGUISysDef(const char* n, std::initializer_list<int> def);
   FurnaceGUISysDef(const char* n, std::initializer_list<FurnaceGUISysDefChip> def);
 };
 
diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index 82bab766c..e6cb90a6f 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -404,509 +404,579 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
-  /* TODO: everything here
   ENTRY(
     "NEC PC-98 (with Sound Orchestra)", {
-      DIV_SYSTEM_OPN, 64, 0, 4,
-      DIV_SYSTEM_OPL2, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Orchestra; extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 4,
-      DIV_SYSTEM_OPL2, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Orchestra in drums mode)", {
-      DIV_SYSTEM_OPN, 64, 0, 4,
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Orchestra in drums mode; extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 4,
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Orchestra V)", {
-      DIV_SYSTEM_OPN, 64, 0, 4,
-      DIV_SYSTEM_Y8950, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Orchestra V; extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 4,
-      DIV_SYSTEM_Y8950, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Orchestra V in drums mode)", {
-      DIV_SYSTEM_OPN, 64, 0, 4,
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Orchestra V in drums mode; extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 4,
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 4,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=4"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with PC-9801-86)", { // -73 also has OPNA
-      DIV_SYSTEM_PC98, 64, 0, 1,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16), // 2x 16-bit Burr Brown DAC
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PC98, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, // 2x 16-bit Burr Brown DAC
+        "rate=44100\n"
+        "outDepth=16\n"
+      ),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=44100\n"
+        "outDepth=16\n"
+      ),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with PC-9801-86; extended channel 3)", { // -73 also has OPNA
-      DIV_SYSTEM_PC98_EXT, 64, 0, 1,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PC98_EXT, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=44100\n"
+        "outDepth=16\n"
+      ),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=44100\n"
+        "outDepth=16\n"
+      ),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
-    ENTRY(
+  ENTRY(
     "NEC PC-98 (with PC-9801-73)", {
-      DIV_SYSTEM_PC98, 64, 0, 1,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PC98, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
-    ENTRY(
+  ENTRY(
     "NEC PC-98 (with PC-9801-73; extended channel 3)", {
-      DIV_SYSTEM_PC98_EXT, 64, 0, 1,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PC98_EXT, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Blaster 16 for PC-9800 w/PC-9801-26/K compatible)", {
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=44100\n"
+        "outDepth=16\n"
+        "stereo=true\n"
+      ),
+      CH(DIV_SYSTEM_OPL3, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Blaster 16 for PC-9800 w/PC-9801-26/K compatible; extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=44100\n"
+        "outDepth=16\n"
+        "stereo=true\n"
+      ),
+      CH(DIV_SYSTEM_OPL3, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Blaster 16 for PC-9800 w/PC-9801-26/K compatible in drums mode)", {
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      DIV_SYSTEM_OPL3_DRUMS, 64, 0, 2,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=44100\n"
+        "outDepth=16\n"
+        "stereo=true\n"
+      ),
+      CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with Sound Blaster 16 for PC-9800 w/PC-9801-26/K compatible in drums mode; extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      DIV_SYSTEM_OPL3_DRUMS, 64, 0, 2,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=44100\n"
+        "outDepth=16\n"
+        "stereo=true\n"
+      ),
+      CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "ZX Spectrum (48K)", {
-      CH(DIV_SYSTEM_SFX_BEEPER, 64, 0, ""),
+      CH(DIV_SYSTEM_SFX_BEEPER, 64, 0, "")
     }
   );
   ENTRY(
     "ZX Spectrum (128K)", {
-      DIV_SYSTEM_AY8910, 64, 0, 1, //beeper was also included
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1") //beeper was also included
     }
   );
   ENTRY(
     "ZX Spectrum (128K) with TurboSound FM", {
-      DIV_SYSTEM_AY8910, 64, 0, 1,
-      DIV_SYSTEM_OPN, 64, 0, 1,
-      DIV_SYSTEM_OPN, 64, 0, 1,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "ZX Spectrum (128K) with TurboSound FM (extended channel 3 on first OPN)", {
-      DIV_SYSTEM_AY8910, 64, 0, 1,
-      DIV_SYSTEM_OPN_EXT, 64, 0, 1,
-      DIV_SYSTEM_OPN, 64, 0, 1,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "ZX Spectrum (128K) with TurboSound FM (extended channel 3 on second OPN)", {
-      DIV_SYSTEM_AY8910, 64, 0, 1,
-      DIV_SYSTEM_OPN, 64, 0, 1,
-      DIV_SYSTEM_OPN_EXT, 64, 0, 1,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "ZX Spectrum (128K) with TurboSound FM (extended channel 3 on both OPNs)", {
-      DIV_SYSTEM_AY8910, 64, 0, 1,
-      DIV_SYSTEM_OPN_EXT, 64, 0, 1,
-      DIV_SYSTEM_OPN_EXT, 64, 0, 1,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "ZX Spectrum (128K) with TurboSound", {
-      DIV_SYSTEM_AY8910, 64, 0, 1,
-      DIV_SYSTEM_AY8910, 64, 0, 1, // or YM2149
-      DIV_SYSTEM_AY8910, 64, 0, 1, // or YM2149
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1"), // or YM2149
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=1") // or YM2149
     }
   );
   ENTRY(
     "Amstrad CPC", {
-      DIV_SYSTEM_AY8910, 64, 0, 5,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=5")
     }
   );
   ENTRY(
     "Atari ST", {
-      DIV_SYSTEM_AY8910, 64, 0, 19,
+      CH(DIV_SYSTEM_AY8910, 64, 0,
+        "clockSel=3\n"
+        "chipType=1\n"
+      )
     }
   );
-    ENTRY(
+  ENTRY(
     "Atari STE", {
-      DIV_SYSTEM_AY8910, 64, 0, 19,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 50667|(7<<16),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 50667|(7<<16),
+      CH(DIV_SYSTEM_AY8910, 64, 0,
+        "clockSel=3\n"
+        "chipType=1\n"
+      ),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=50668\n"
+        "outDepth=8\n"
+      ),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=50668\n"
+        "outDepth=8\n"
+      )
     }
   );
   ENTRY(
     "SAM Coupé", {
-      CH(DIV_SYSTEM_SAA1099, 64, 0, ""),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "")
     }
   );
   ENTRY(
     "BBC Micro", {
-      DIV_SYSTEM_SMS, 64, 0, 0x42, // SN76489A 4MHz
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=2\n"
+        "chipType=4\n" // SN76489A 4MHz
+      )
     }
   );
   ENTRY(
     "PC (barebones)", {
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "IBM PCjr", {
       // it can be enable sound output at once
-      DIV_SYSTEM_SMS, 64, 0, 0x44, // SN76496
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=5") // SN76496
     }
   );
   ENTRY(
     "Tandy 1000", {
-      DIV_SYSTEM_SMS, 64, 0, 0x44, // NCR 8496 or SN76496 or Tandy PSSJ(with 8 bit DAC)
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=5"), // NCR 8496 or SN76496 or Tandy PSSJ(with 8 bit DAC)
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Covox Sound Master", {
-      DIV_SYSTEM_AY8930, 64, 0, 3,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_AY8930, 64, 0, "clockSel=3"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + SSI 2001", {
-      DIV_SYSTEM_C64_6581, 64, 0, 2,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Game Blaster", {
-      DIV_SYSTEM_SAA1099, 64, 0, 1,
-      DIV_SYSTEM_SAA1099, 64, 0, 1,
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
-    ENTRY(
+  ENTRY(
     "PC + AdLib", {
       CH(DIV_SYSTEM_OPL2, 64, 0, ""),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
-      ENTRY(
+  ENTRY(
     "PC + AdLib (drums mode)", {
       CH(DIV_SYSTEM_OPL2, 64, 0, ""),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Sound Blaster", {
       CH(DIV_SYSTEM_OPL2, 64, 0, ""),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=22050\n"
+        "outDepth=8\n"
+      )
     }
   );
   ENTRY(
     "PC + AdLib/Sound Blaster (drums mode)", {
       CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, ""),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=22050\n"
+        "outDepth=8\n"
+      )
     }
   );
   ENTRY(
     "PC + Sound Blaster w/Game Blaster Compatible", {
       CH(DIV_SYSTEM_OPL2, 64, 0, ""),
-      DIV_SYSTEM_SAA1099, 64, 0, 1,
-      DIV_SYSTEM_SAA1099, 64, 0, 1,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=22050\n"
+        "outDepth=8\n"
+      ),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Sound Blaster w/Game Blaster Compatible (drums mode)", {
       CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, ""),
-      DIV_SYSTEM_SAA1099, 64, 0, 1,
-      DIV_SYSTEM_SAA1099, 64, 0, 1,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=22050\n"
+        "outDepth=8\n"
+      ),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Sound Blaster Pro", {
-      DIV_SYSTEM_OPL2, 64, -127, 0,
-      DIV_SYSTEM_OPL2, 64, 127, 0,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16)|(1<<20), //alternatively 44.1 khz mono
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL2, 64, -127, ""),
+      CH(DIV_SYSTEM_OPL2, 64, 127, ""),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=22050\n"
+        "outDepth=8\n"
+        "stereo=true\n"
+      ), //alternatively 44.1 khz mono
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Sound Blaster Pro (drums mode)", {
-      DIV_SYSTEM_OPL2_DRUMS, 64, -127, 0,
-      DIV_SYSTEM_OPL2_DRUMS, 64, 127, 0,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16)|(1<<20), //alternatively 44.1 khz mono
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, -127, ""),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 127, ""),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=22050\n"
+        "outDepth=8\n"
+        "stereo=true\n"
+      ), //alternatively 44.1 khz mono
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Sound Blaster Pro 2", {
       CH(DIV_SYSTEM_OPL3, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=44100\n"
+        "outDepth=16\n"
+        "stereo=true\n"
+      ),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + Sound Blaster Pro 2 (drums mode)", {
       CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=44100\n"
+        "outDepth=16\n"
+        "stereo=true\n"
+      ),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + PC-FXGA", {
-      DIV_SYSTEM_PCE, 64, 0, 0, // HuC6230 (WSG from HuC6280 but with built in 2 OKI ADPCM playback engines)
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_PCE, 64, 0, ""), // HuC6230 (WSG from HuC6280 but with built in 2 OKI ADPCM playback engines)
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "PC + SAAYM", {
-      DIV_SYSTEM_YM2151, 64, 0, 0, // 3.58MHz or 4MHz selectable via jumper
-      DIV_SYSTEM_SAA1099, 64, 0, 1, // 7.16MHz or 8MHz selectable via jumper
-      DIV_SYSTEM_SAA1099, 64, 0, 1, // ""
-      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""), // 3.58MHz or 4MHz selectable via jumper
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"), // 7.16MHz or 8MHz selectable via jumper
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"), // ""
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
   );
   ENTRY(
     "Sharp X1", {
-      DIV_SYSTEM_AY8910, 64, 0, 3,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=3")
     }
   );
   ENTRY(
     "Sharp X1 + FM Addon", {
-      DIV_SYSTEM_AY8910, 64, 0, 3,
-      DIV_SYSTEM_YM2151, 64, 0, 2,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=3"),
+      CH(DIV_SYSTEM_YM2151, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "Sharp X68000", {
-      DIV_SYSTEM_YM2151, 64, 0, 2,
-      CH(DIV_SYSTEM_MSM6258, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2151, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_MSM6258, 64, 0, "")
     }
   );
   ENTRY(
     "FM Towns", {
       CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2"), // YM3438
-      CH(DIV_SYSTEM_RF5C68, 64, 0, ""),
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "")
     }
   );
   ENTRY(
     "FM Towns (extended channel 3)", {
       CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2"), // YM3438
-      CH(DIV_SYSTEM_RF5C68, 64, 0, ""),
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "")
     }
   );
   ENTRY(
     "Commander X16", {
       CH(DIV_SYSTEM_VERA, 64, 0, ""),
-      CH(DIV_SYSTEM_YM2151, 32, 0, ""),
+      CH(DIV_SYSTEM_YM2151, 32, 0, "")
     }
   );
   ENTRY(
     "TI-99/4A", {
-      DIV_SYSTEM_SMS, 64, 0, 0x182, // SN94624 447KHz
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=6\n"
+        "chipType=8\n" // SN94624 447KHz
+      )
     }
   );
-  */
   CATEGORY_END;
 
-  /* TODO: everything here
   CATEGORY_BEGIN("FM","chips which use frequency modulation (FM) to generate sound.\nsome of these also pack more (like square and sample channels).");
   ENTRY(
     "Yamaha YM2151 (OPM)", {
-      CH(DIV_SYSTEM_YM2151, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2151, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2203 (OPN)", {
-      DIV_SYSTEM_OPN, 64, 0, 3,
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=3")
     }
   );
   ENTRY(
     "Yamaha YM2203 (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 3,
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=3")
     }
   );
   ENTRY(
     "Yamaha YM2608 (OPNA)", {
-      CH(DIV_SYSTEM_PC98, 64, 0, ""),
+      CH(DIV_SYSTEM_PC98, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2608 (extended channel 3)", {
-      CH(DIV_SYSTEM_PC98_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_PC98_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2610 (OPNB)", {
-      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2610 (extended channel 2)", {
-      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2610B (OPNB2)", {
-      CH(DIV_SYSTEM_YM2610B, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610B, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2610B (extended channel 3)", {
-      CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2612 (OPN2)", {
-      DIV_SYSTEM_YM2612, 64, 0, (int)0x80000000,
+      CH(DIV_SYSTEM_YM2612, 64, 0, "ladderEffect=true")
     }
   );
   ENTRY(
     "Yamaha YM2612 (extended channel 3)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, (int)0x80000000,
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "ladderEffect=true")
     }
   );
   ENTRY(
     "Yamaha YM2612 (OPN2) with DualPCM", {
-      DIV_SYSTEM_YM2612_FRAC, 64, 0, (int)0x80000000,
+      CH(DIV_SYSTEM_YM2612_FRAC, 64, 0, "ladderEffect=true")
     }
   );
   ENTRY(
     "Yamaha YM2612 (extended channel 3) with DualPCM", {
-      DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, (int)0x80000000,
+      CH(DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, "ladderEffect=true")
     }
   );
   ENTRY(
     "Yamaha YM2413 (OPLL)", {
-      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2413 (drums mode)", {
-      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM2414 (OPZ)", {
-      CH(DIV_SYSTEM_OPZ, 64, 0, ""),
+      CH(DIV_SYSTEM_OPZ, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3438 (OPN2C)", {
-      CH(DIV_SYSTEM_YM2612, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2612, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3438 (extended channel 3)", {
-      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3438 (OPN2C) with DualPCM", {
-      CH(DIV_SYSTEM_YM2612_FRAC, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2612_FRAC, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3438 (extended channel 3) with DualPCM", {
-      CH(DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3526 (OPL)", {
-      CH(DIV_SYSTEM_OPL, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3526 (drums mode)", {
-      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha Y8950", {
-      CH(DIV_SYSTEM_Y8950, 64, 0, ""),
+      CH(DIV_SYSTEM_Y8950, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha Y8950 (drums mode)", {
-      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3812 (OPL2)", {
-      CH(DIV_SYSTEM_OPL2, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL2, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YM3812 (drums mode)", {
-      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YMF262 (OPL3)", {
-      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL3, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YMF262 (drums mode)", {
-      CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, "")
     }
   );
   if (settings.hiddenSystems) {
     ENTRY(
       "Yamaha YMU759 (MA-2)", {
-        CH(DIV_SYSTEM_YMU759, 64, 0, ""),
-        0
+        CH(DIV_SYSTEM_YMU759, 64, 0, "")
       }
     );
   }
@@ -915,27 +985,27 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Square","these chips generate square/pulse tones only (but may include noise).");
   ENTRY(
     "TI SN76489", {
-      DIV_SYSTEM_SMS, 64, 0, 4,
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=1")
     }
   );
   ENTRY(
     "TI SN76489A", {
-      DIV_SYSTEM_SMS, 64, 0, 0x40,
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=4")
     }
   );
   ENTRY(
     "TI SN76496", {
-      DIV_SYSTEM_SMS, 64, 0, 0x44,
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=5")
     }
   );
   ENTRY(
     "NCR 8496", {
-      DIV_SYSTEM_SMS, 64, 0, 0x48,
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=6")
     }
   );
   ENTRY(
     "Tandy PSSJ 3-voice sound", {
-      DIV_SYSTEM_SMS, 64, 0, 0x4c,
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=7")
       // 8 bit DAC
     }
   );
@@ -946,62 +1016,68 @@ void FurnaceGUI::initSystemPresets() {
   );
   ENTRY(
     "Sega PSG (SN76489-like, Stereo)", {
-      DIV_SYSTEM_SMS, 64, 0, 0xc,
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=3")
     }
   );
   ENTRY(
     "TI SN94624", {
-      DIV_SYSTEM_SMS, 64, 0, 0x182,
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=6\n"
+        "chipType=8\n"
+      )
     }
   );
   ENTRY(
     "TI SN76494", {
-      DIV_SYSTEM_SMS, 64, 0, 0x186,
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=6\n"
+        "chipType=9\n"
+      )
     }
   );
   ENTRY(
     "Toshiba T6W28", {
-      CH(DIV_SYSTEM_T6W28, 64, 0, ""),
+      CH(DIV_SYSTEM_T6W28, 64, 0, "")
     }
   );
   ENTRY(
     "AY-3-8910", {
-      CH(DIV_SYSTEM_AY8910, 64, 0, ""),
+      CH(DIV_SYSTEM_AY8910, 64, 0, "")
     }
   );
   ENTRY(
     "AY-3-8914", {
-      DIV_SYSTEM_AY8910, 64, 0, 48,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=3")
     }
   );
   ENTRY(
     "Yamaha YM2149(F)", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1")
     }
   );
   ENTRY(
     "Philips SAA1099", {
-      CH(DIV_SYSTEM_SAA1099, 64, 0, ""),
+      CH(DIV_SYSTEM_SAA1099, 64, 0, "")
     }
   );
   ENTRY(
     "PC Speaker", {
-      CH(DIV_SYSTEM_PCSPKR, 32, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 32, 0, "")
     }
   );
   ENTRY(
     "Commodore VIC", {
-      DIV_SYSTEM_VIC20, 64, 0, 1,
+      CH(DIV_SYSTEM_VIC20, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "OKI MSM5232", {
-      CH(DIV_SYSTEM_MSM5232, 64, 0, ""),
+      CH(DIV_SYSTEM_MSM5232, 64, 0, "")
     }
   );
   ENTRY(
     "Pong", {
-      CH(DIV_SYSTEM_PONG, 64, 0, ""),
+      CH(DIV_SYSTEM_PONG, 64, 0, "")
     }
   );
   CATEGORY_END;
@@ -1009,52 +1085,52 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Sample","chips/systems which use PCM or ADPCM samples for sound synthesis.");
   ENTRY(
     "Amiga", {
-      CH(DIV_SYSTEM_AMIGA, 64, 0, ""),
+      CH(DIV_SYSTEM_AMIGA, 64, 0, "")
     }
   );
   ENTRY(
     "SegaPCM", {
-      CH(DIV_SYSTEM_SEGAPCM, 64, 0, ""),
+      CH(DIV_SYSTEM_SEGAPCM, 64, 0, "")
     }
   );
   ENTRY(
     "Capcom QSound", {
-      CH(DIV_SYSTEM_QSOUND, 64, 0, ""),
+      CH(DIV_SYSTEM_QSOUND, 64, 0, "")
     }
   );
   ENTRY(
     "Seta/Allumer X1-010", {
-      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
+      CH(DIV_SYSTEM_X1_010, 64, 0, "")
     }
   );
   ENTRY(
     "Yamaha YMZ280B (PCMD8)", {
-      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, "")
     }
   );
   ENTRY(
     "Ricoh RF5C68", {
-      CH(DIV_SYSTEM_RF5C68, 64, 0, ""),
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "")
     }
   ); 
   ENTRY(
     "OKI MSM6258", {
-      CH(DIV_SYSTEM_MSM6258, 64, 0, ""),
+      CH(DIV_SYSTEM_MSM6258, 64, 0, "")
     }
   );
   ENTRY(
     "OKI MSM6295", {
-      CH(DIV_SYSTEM_MSM6295, 64, 0, ""),
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "")
     }
   );
   ENTRY(
     "SNES", {
-      CH(DIV_SYSTEM_SNES, 64, 0, ""),
+      CH(DIV_SYSTEM_SNES, 64, 0, "")
     }
   );
   ENTRY(
     "Generic PCM DAC", {
-      CH(DIV_SYSTEM_PCM_DAC, 64, 0, ""),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, "")
     }
   );
   CATEGORY_END;
@@ -1062,67 +1138,67 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Wavetable","chips which use user-specified waveforms to generate sound.");
   ENTRY(
     "PC Engine", {
-      CH(DIV_SYSTEM_PCE, 64, 0, ""),
+      CH(DIV_SYSTEM_PCE, 64, 0, "")
     }
   );
   ENTRY(
     "Commodore PET (pseudo-wavetable)", {
-      CH(DIV_SYSTEM_PET, 64, 0, ""),
+      CH(DIV_SYSTEM_PET, 64, 0, "")
     }
   );
   ENTRY(
     "Konami Bubble System WSG", {
-      CH(DIV_SYSTEM_BUBSYS_WSG, 64, 0, ""),
+      CH(DIV_SYSTEM_BUBSYS_WSG, 64, 0, "")
     }
   );
   ENTRY(
     "Konami SCC", {
-      CH(DIV_SYSTEM_SCC, 64, 0, ""),
+      CH(DIV_SYSTEM_SCC, 64, 0, "")
     }
   );
   ENTRY(
     "Konami SCC+", {
-      CH(DIV_SYSTEM_SCC_PLUS, 64, 0, ""),
+      CH(DIV_SYSTEM_SCC_PLUS, 64, 0, "")
     }
   );
   ENTRY(
     "Namco WSG", {
-      CH(DIV_SYSTEM_NAMCO, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO, 64, 0, "")
     }
   );
   ENTRY(
     "Namco C15 (8-channel mono)", {
-      CH(DIV_SYSTEM_NAMCO_15XX, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO_15XX, 64, 0, "")
     }
   );
   ENTRY(
     "Namco C30 (8-channel stereo)", {
-      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, "")
     }
   );
   ENTRY(
     "Namco 163", {
-      CH(DIV_SYSTEM_N163, 64, 0, ""),
+      CH(DIV_SYSTEM_N163, 64, 0, "")
     }
   );
   ENTRY(
     "Famicom Disk System (chip)", {
-      CH(DIV_SYSTEM_FDS, 64, 0, ""),
+      CH(DIV_SYSTEM_FDS, 64, 0, "")
     }
   );
   ENTRY(
     "WonderSwan", {
-      CH(DIV_SYSTEM_SWAN, 64, 0, ""),
+      CH(DIV_SYSTEM_SWAN, 64, 0, "")
     }
   );
   ENTRY(
     "Virtual Boy", {
-      CH(DIV_SYSTEM_VBOY, 64, 0, ""),
+      CH(DIV_SYSTEM_VBOY, 64, 0, "")
     }
   );
   ENTRY(
     "Seta/Allumer X1-010", {
-      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
+      CH(DIV_SYSTEM_X1_010, 64, 0, "")
     }
   );
   CATEGORY_END;
@@ -1130,64 +1206,64 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Specialized","chips/systems with unique sound synthesis methods.");
   ENTRY(
     "MOS Technology SID (6581)", {
-      DIV_SYSTEM_C64_6581, 64, 0, 1,
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "MOS Technology SID (8580)", {
-      DIV_SYSTEM_C64_8580, 64, 0, 1,
+      CH(DIV_SYSTEM_C64_8580, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Microchip AY8930", {
-      CH(DIV_SYSTEM_AY8930, 64, 0, ""),
+      CH(DIV_SYSTEM_AY8930, 64, 0, "")
     }
   );
   ENTRY(
     "Game Boy", {
-      CH(DIV_SYSTEM_GB, 64, 0, ""),
+      CH(DIV_SYSTEM_GB, 64, 0, "")
     }
   );
   ENTRY(
     "Atari Lynx", {
-      CH(DIV_SYSTEM_LYNX, 64, 0, ""),
+      CH(DIV_SYSTEM_LYNX, 64, 0, "")
     }
   );
   ENTRY(
     "Atari TIA", {
-      CH(DIV_SYSTEM_TIA, 64, 0, ""),
+      CH(DIV_SYSTEM_TIA, 64, 0, "")
     }
   );
   ENTRY(
     "NES (Ricoh 2A03)", {
-      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_NES, 64, 0, "")
     }
   );
   ENTRY(
     "Commander X16 (VERA only)", {
-      CH(DIV_SYSTEM_VERA, 64, 0, ""),
+      CH(DIV_SYSTEM_VERA, 64, 0, "")
     }
   );
   ENTRY(
     "ZX Spectrum (beeper only)", {
-      CH(DIV_SYSTEM_SFX_BEEPER, 64, 0, ""),
+      CH(DIV_SYSTEM_SFX_BEEPER, 64, 0, "")
     }
   );
   if (settings.hiddenSystems) {
     ENTRY(
       "Dummy System", {
-        CH(DIV_SYSTEM_DUMMY, 64, 0, ""),
-        0
+        CH(DIV_SYSTEM_DUMMY, 64, 0, "")
       }
     );
   }
   ENTRY(
     "tildearrow Sound Unit", {
-      CH(DIV_SYSTEM_SOUND_UNIT, 64, 0, ""),
+      CH(DIV_SYSTEM_SOUND_UNIT, 64, 0, "")
     }
   );
   CATEGORY_END;
 
+  /* TODO: everything here
   CATEGORY_BEGIN("Arcade systems","INSERT COIN");
   ENTRY(
     "Pong", {
@@ -1956,112 +2032,86 @@ void FurnaceGUI::initSystemPresets() {
     }
   );
   CATEGORY_END;
+  */
 
   CATEGORY_BEGIN("DefleMask-compatible","these configurations are compatible with DefleMask.\nselect this if you need to save as .dmf or work with that program.");
   ENTRY(
     "Sega Genesis", {
       CH(DIV_SYSTEM_YM2612, 64, 0, ""),
-      CH(DIV_SYSTEM_SMS, 32, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, "")
     }
   );
   ENTRY(
     "Sega Genesis (extended channel 3)", {
       CH(DIV_SYSTEM_YM2612_EXT, 64, 0, ""),
-      CH(DIV_SYSTEM_SMS, 32, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, "")
     }
   );
   ENTRY(
     "Sega Master System", {
-      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 64, 0, "")
     }
   );
   ENTRY(
     "Sega Master System (with FM expansion)", {
       CH(DIV_SYSTEM_SMS, 64, 0, ""),
-      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL, 64, 0, "")
     }
   );
   ENTRY(
     "Game Boy", {
-      CH(DIV_SYSTEM_GB, 64, 0, ""),
+      CH(DIV_SYSTEM_GB, 64, 0, "")
     }
   );
   ENTRY(
     "NEC PC Engine/TurboGrafx-16", {
-      CH(DIV_SYSTEM_PCE, 64, 0, ""),
+      CH(DIV_SYSTEM_PCE, 64, 0, "")
     }
   );
   ENTRY(
     "NES", {
-      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_NES, 64, 0, "")
     }
   );
   ENTRY(
     "Famicom with Konami VRC7", {
       CH(DIV_SYSTEM_NES, 64, 0, ""),
-      CH(DIV_SYSTEM_VRC7, 64, 0, ""),
+      CH(DIV_SYSTEM_VRC7, 64, 0, "")
     }
   );
   ENTRY(
     "Famicom Disk System", {
       CH(DIV_SYSTEM_NES, 64, 0, ""),
-      CH(DIV_SYSTEM_FDS, 64, 0, ""),
+      CH(DIV_SYSTEM_FDS, 64, 0, "")
     }
   );
   ENTRY(
     "Commodore 64 (6581 SID)", {
-      DIV_SYSTEM_C64_6581, 64, 0, 1,
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Commodore 64 (8580 SID)", {
-      DIV_SYSTEM_C64_8580, 64, 0, 1,
+      CH(DIV_SYSTEM_C64_8580, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Arcade (YM2151 and SegaPCM)", {
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
-      CH(DIV_SYSTEM_SEGAPCM_COMPAT, 64, 0, ""),
+      CH(DIV_SYSTEM_SEGAPCM_COMPAT, 64, 0, "")
     }
   );
   ENTRY(
     "Neo Geo CD", {
-      CH(DIV_SYSTEM_YM2610, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610, 64, 0, "")
     }
   );
   ENTRY(
     "Neo Geo CD (extended channel 2)", {
-      CH(DIV_SYSTEM_YM2610_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610_EXT, 64, 0, "")
     }
   );
   CATEGORY_END;
-  */
-}
-
-FurnaceGUISysDef::FurnaceGUISysDef(const char* n, std::initializer_list<int> def):
-  name(n) {
-  std::vector<int> uncompiled=def;
-  int index=0;
-
-  for (size_t i=0; i<uncompiled.size(); i+=4) {
-    if (uncompiled[i]==0) break;
-
-    DivConfig oldFlags;
-    DivEngine::convertOldFlags(uncompiled[i+3],oldFlags,(DivSystem)uncompiled[i]);
-
-    definition+=fmt::sprintf(
-      "id%d=%d\nvol%d=%d\npan%d=%d\nflags%d=%s\n",
-      index,
-      DivEngine::systemToFileFur((DivSystem)uncompiled[i]),
-      index,
-      uncompiled[i+1],
-      index,
-      uncompiled[i+2],
-      index,
-      oldFlags.toBase64()
-    );
-    index++;
-  }
 }
 
 FurnaceGUISysDef::FurnaceGUISysDef(const char* n, std::initializer_list<FurnaceGUISysDefChip> def):

From e41efa9f1803323f6709760b3493ef02688fe10a Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 02:27:20 -0500
Subject: [PATCH 03/86] GUI: convert presets to new format, part 7

---
 src/gui/presets.cpp | 569 +++++++++++++++++++++++++-------------------
 1 file changed, 321 insertions(+), 248 deletions(-)

diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index e6cb90a6f..ba3f6b02d 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -1263,18 +1263,17 @@ void FurnaceGUI::initSystemPresets() {
   );
   CATEGORY_END;
 
-  /* TODO: everything here
   CATEGORY_BEGIN("Arcade systems","INSERT COIN");
   ENTRY(
     "Pong", {
-      CH(DIV_SYSTEM_PONG, 64, 0, ""),
+      CH(DIV_SYSTEM_PONG, 64, 0, "")
     }
   );
   ENTRY(
     "Bally Midway MCR", {
       // SSIO sound board
-      DIV_SYSTEM_AY8910, 64, 0, 3, // 2MHz
-      DIV_SYSTEM_AY8910, 64, 0, 3, // 2MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=3"), // 2MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=3") // 2MHz
       // additional sound boards, mostly software controlled DAC
     }
   );
@@ -1282,8 +1281,11 @@ void FurnaceGUI::initSystemPresets() {
     "Williams/Midway Y/T unit w/ADPCM sound board", {
       // ADPCM sound board
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 15624|(7<<16), // variable via OPM timer?
-      CH(DIV_SYSTEM_MSM6295, 64, 0, ""),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=15625\n"
+        "outDepth=8\n"
+      ), // variable via OPM timer?
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "")
     }
   );
   ENTRY(
@@ -1292,7 +1294,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_AY8910, 64, 0, ""),
       CH(DIV_SYSTEM_AY8910, 64, 0, ""),
       CH(DIV_SYSTEM_AY8910, 64, 0, ""),
-      CH(DIV_SYSTEM_AY8910, 64, 0, ""),
+      CH(DIV_SYSTEM_AY8910, 64, 0, "")
       // additional discrete sound logics
     }
   );
@@ -1300,739 +1302,810 @@ void FurnaceGUI::initSystemPresets() {
     "Konami Bubble System", {
       CH(DIV_SYSTEM_AY8910, 64, 0, ""),
       CH(DIV_SYSTEM_AY8910, 64, 0, ""),
-      CH(DIV_SYSTEM_BUBSYS_WSG, 64, 0, ""),
+      CH(DIV_SYSTEM_BUBSYS_WSG, 64, 0, "")
       // VLM5030 exists but not used for music at all
     }
   );
   ENTRY(
     "Konami Battlantis", {
-      DIV_SYSTEM_OPL2, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPL2, 64, 0, 3, // ""
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=3")  // ""
     }
   );
   ENTRY(
     "Konami Battlantis (drums mode on first OPL2)", {
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPL2, 64, 0, 3, // ""
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=3") // ""
     }
   );
   ENTRY(
     "Konami Battlantis (drums mode on second OPL2)", {
-      DIV_SYSTEM_OPL2, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // ""
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=3") // ""
     }
   );
   ENTRY(
     "Konami Battlantis (drums mode on both OPL2s)", {
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // ""
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=3") // ""
     }
   );
   ENTRY(
     "Konami Hexion", {
-      DIV_SYSTEM_SCC, 64, 0, 2, // 1.5MHz (3MHz input)
-      DIV_SYSTEM_MSM6295, 64, 0, 1,
+      CH(DIV_SYSTEM_SCC, 64, 0, "clockSel=2"), // 1.5MHz (3MHz input)
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Sega Kyugo", {
-      DIV_SYSTEM_AY8910, 64, 0, 14,
-      DIV_SYSTEM_AY8910, 64, 0, 14,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14"),
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14")
     }
   );
   ENTRY(
     "Sega System 1", {
-      DIV_SYSTEM_SMS, 64, 0, 0x42, // SN76489A 4MHz
-      DIV_SYSTEM_SMS, 64, 0, 0x0141, // SN76489A 2MHz
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=2\n"
+        "chipType=4\n"
+      ), // SN76489A 4MHz
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=5\n"
+        "chipType=4\n"
+      ) // SN76489A 2MHz
     }
   );
   ENTRY(
     "Sega System E", {
       CH(DIV_SYSTEM_SMS, 64, 0, ""),
-      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 64, 0, "")
     }
   );
   ENTRY(
     "Sega System E (with FM expansion)", {
       CH(DIV_SYSTEM_SMS, 64, 0, ""),
       CH(DIV_SYSTEM_SMS, 64, 0, ""),
-      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL, 64, 0, "")
     }
   );
   ENTRY(
     "Sega System E (with FM expansion in drums mode)", {
       CH(DIV_SYSTEM_SMS, 64, 0, ""),
       CH(DIV_SYSTEM_SMS, 64, 0, ""),
-      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Sega Hang-On", {
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_SEGAPCM, 64, 0, 0, // discrete logics, 62.5KHz output rate
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_SEGAPCM, 64, 0, "") // discrete logics, 62.5KHz output rate
     }
   );
   ENTRY(
     "Sega Hang-On (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_SEGAPCM, 64, 0, 0, // discrete logics, 62.5KHz output rate
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_SEGAPCM, 64, 0, "") // discrete logics, 62.5KHz output rate
     }
   );
   ENTRY(
     "Sega OutRun/X Board", {
-      DIV_SYSTEM_YM2151, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_SEGAPCM, 64, 0, 0, // ASIC, 31.25KHz output rate
+      CH(DIV_SYSTEM_YM2151, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_SEGAPCM, 64, 0, "") // ASIC, 31.25KHz output rate
     }
   );
   ENTRY(
     "Sega System 24", {
-      DIV_SYSTEM_YM2151, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 61499|(7<<16), // software controlled, variable rate via configurable timers
+      CH(DIV_SYSTEM_YM2151, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=61500\n"
+        "outDepth=8\n"
+      ) // software controlled, variable rate via configurable timers
     }
   );
   ENTRY(
     "Sega System 18", {
-      DIV_SYSTEM_YM2612, 64, 0, 2, // discrete 8MHz YM3438
-      DIV_SYSTEM_YM2612, 64, 0, 2, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2"), // discrete 8MHz YM3438
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=1") // 10MHz
     }
   );
   ENTRY(
     "Sega System 18 (extended channel 3 on first OPN2C)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // discrete 8MHz YM3438
-      DIV_SYSTEM_YM2612, 64, 0, 2, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2"), // discrete 8MHz YM3438
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=1") // 10MHz
     }
   );
   ENTRY(
     "Sega System 18 (extended channel 3 on second OPN2C)", {
-      DIV_SYSTEM_YM2612, 64, 0, 2, // discrete 8MHz YM3438
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2"), // discrete 8MHz YM3438
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=1") // 10MHz
     }
   );
   ENTRY(
     "Sega System 18 (extended channel 3 on both OPN2Cs)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // discrete 8MHz YM3438
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2"), // discrete 8MHz YM3438
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=1") // 10MHz
     }
   );
   ENTRY(
     "Sega System 32", {
-      DIV_SYSTEM_YM2612, 64, 0, 4, // discrete 8.05MHz YM3438
-      DIV_SYSTEM_YM2612, 64, 0, 4, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 2, // 12.5MHz
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=4"), // discrete 8.05MHz YM3438
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=4"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=2") // 12.5MHz
     }
   );
   ENTRY(
     "Sega System 32 (extended channel 3 on first OPN2C)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 4, // discrete 8.05MHz YM3438
-      DIV_SYSTEM_YM2612, 64, 0, 4, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 2, // 12.5MHz
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=4"), // discrete 8.05MHz YM3438
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=4"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=2") // 12.5MHz
     }
   );
   ENTRY(
     "Sega System 32 (extended channel 3 on second OPN2C)", {
-      DIV_SYSTEM_YM2612, 64, 0, 4, // discrete 8.05MHz YM3438
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 4, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 2, // 12.5MHz
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=4"), // discrete 8.05MHz YM3438
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=4"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=2") // 12.5MHz
     }
   );
   ENTRY(
     "Sega System 32 (extended channel 3 on both OPN2Cs)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 4, // discrete 8.05MHz YM3438
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 4, // ^^
-      DIV_SYSTEM_RF5C68, 64, 0, 2, // 12.5MHz
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=4"), // discrete 8.05MHz YM3438
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=4"), // ^^
+      CH(DIV_SYSTEM_RF5C68, 64, 0, "clockSel=2") // 12.5MHz
     }
   );
   ENTRY(
     "Capcom Exed Eyes", {
-      DIV_SYSTEM_AY8910, 64, 0, 4, // 1.5MHz
-      DIV_SYSTEM_SMS, 64, 0, 0x0104, // SN76489 3MHz
-      DIV_SYSTEM_SMS, 64, 0, 0x0104, // SN76489 3MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=4"), // 1.5MHz
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=4\n"
+        "chipType=1\n"
+      ), // SN76489 3MHz
+      CH(DIV_SYSTEM_SMS, 64, 0,
+        "clockSel=4\n"
+        "chipType=1\n"
+      ) // SN76489 3MHz
     }
   );
   ENTRY(
     "Capcom Arcade", { // 1943, Side arms, etc
-      DIV_SYSTEM_OPN, 64, 0, 5, // 4 or 1.5MHz; various per games
-      DIV_SYSTEM_OPN, 64, 0, 5,
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 4 or 1.5MHz; various per games
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5")
     }
   );
   ENTRY(
     "Capcom Arcade (extended channel 3 on first OPN)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5,
-      DIV_SYSTEM_OPN, 64, 0, 5,
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5")
     }
   );
   ENTRY(
     "Capcom Arcade (extended channel 3 on second OPN)", {
-      DIV_SYSTEM_OPN, 64, 0, 5,
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5,
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5")
     }
   );
   ENTRY(
     "Capcom Arcade (extended channel 3 on both OPNs)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5,
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5,
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5")
     }
   );
   ENTRY(
     "Capcom CPS-1", { 
-      DIV_SYSTEM_YM2151, 64, 0, 0, // 3.58MHz
-      CH(DIV_SYSTEM_MSM6295, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""), // 3.58MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "")
     }
   );
   ENTRY(
     "Capcom CPS-2 (QSound)", {
-      CH(DIV_SYSTEM_QSOUND, 64, 0, ""),
+      CH(DIV_SYSTEM_QSOUND, 64, 0, "")
     }
   );
   ENTRY(
     "Jaleco Ginga NinkyouDen", {
-      DIV_SYSTEM_AY8910, 64, 0, 16, // 1.79MHz
-      DIV_SYSTEM_Y8950, 64, 0, 0, // 3.58MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"), // 1.79MHz
+      CH(DIV_SYSTEM_Y8950, 64, 0, "") // 3.58MHz
     }
   );
   ENTRY(
     "Jaleco Ginga NinkyouDen (drums mode)", {
-      DIV_SYSTEM_AY8910, 64, 0, 16, // 1.79MHz
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 0, // 3.58MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"), // 1.79MHz
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "") // 3.58MHz
     }
   );
   ENTRY(
     "Jaleco Mega System 1", {
-      DIV_SYSTEM_YM2151, 64, 0, 1, // 3.5MHz (7MHz / 2)
-      DIV_SYSTEM_MSM6295, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 2, // 4MHz
+      CH(DIV_SYSTEM_YM2151, 64, 0, "clockSel=1"), // 3.5MHz (7MHz / 2)
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=2") // 4MHz
     }
   );
   ENTRY(
     "NMK 16-bit Arcade", {
-      DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz; optional
-      DIV_SYSTEM_MSM6295, 64, 0, 130, // 4MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 130, // ^^
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 1.5MHz; optional
+      CH(DIV_SYSTEM_MSM6295, 64, 0,
+        "clockSel=2\n"
+        "rateSel=true\n"
+      ), // 4MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0,
+        "clockSel=2\n"
+        "rateSel=true\n"
+      ) // ^^
     }
   );
   ENTRY(
     "NMK 16-bit Arcade (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz; optional
-      DIV_SYSTEM_MSM6295, 64, 0, 130, // 4MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 130, // ^^
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"), // 1.5MHz; optional
+      CH(DIV_SYSTEM_MSM6295, 64, 0,
+        "clockSel=2\n"
+        "rateSel=true\n"
+      ), // 4MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0,
+        "clockSel=2\n"
+        "rateSel=true\n"
+      ) // ^^
     }
   );
   ENTRY(
     "Kaneko DJ Boy", {
-      DIV_SYSTEM_OPN, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, -127, 12, // 1.5MHz, Left output
-      DIV_SYSTEM_MSM6295, 64, 127, 12, // 1.5MHz, Right output
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, -127, "clockSel=12"), // 1.5MHz, Left output
+      CH(DIV_SYSTEM_MSM6295, 64, 127, "clockSel=12"), // 1.5MHz, Right output
     }
   );
   ENTRY(
     "Kaneko DJ Boy (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, -127, 12, // 1.5MHz, Left output
-      DIV_SYSTEM_MSM6295, 64, 127, 12, // 1.5MHz, Right output
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, -127, "clockSel=12"), // 1.5MHz, Left output
+      CH(DIV_SYSTEM_MSM6295, 64, 127, "clockSel=12") // 1.5MHz, Right output
     }
   );
   ENTRY(
     "Kaneko Air Buster", {
-      DIV_SYSTEM_OPN, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 141, // 3MHz
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0,
+        "clockSel=13\n"
+        "rateSel=true\n"
+      ) // 3MHz
     }
   );
   ENTRY(
     "Kaneko Air Buster (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 141, // 3MHz
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0,
+        "clockSel=13\n"
+        "rateSel=true\n"
+      ) // 3MHz
     }
   );
   ENTRY(
     "Kaneko Toybox System", {
-      DIV_SYSTEM_AY8910, 64, 0, 19, // YM2149 2MHz
-      DIV_SYSTEM_AY8910, 64, 0, 19, // ^^
-      DIV_SYSTEM_MSM6295, 64, 0, 8, // 2MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0,
+        "clockSel=3\n"
+        "chipType=1\n"
+      ), // YM2149 2MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0,
+        "clockSel=3\n"
+        "chipType=1\n"
+      ), // ^^
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=8") // 2MHz
     }
   );
   ENTRY(
     "Kaneko Jackie Chan", {
-      DIV_SYSTEM_YMZ280B, 64, 0, 3, // 16MHz
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, "clockSel=3") // 16MHz
     }
   );
   ENTRY(
     "Super Kaneko Nova System", {
-      DIV_SYSTEM_YMZ280B, 64, 0, 4, // 16.67MHz (33.33MHz / 2)
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, "clockSel=4") // 16.67MHz (33.33MHz / 2)
     }
   );
   ENTRY(
     "Tecmo Ninja Gaiden", { // Ninja Gaiden, Raiga, etc
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1MHz
     }
   );
   ENTRY(
     "Tecmo Ninja Gaiden (extended channel 3 on first OPN)", { // Ninja Gaiden, Raiga, etc
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1MHz
     }
   );
   ENTRY(
     "Tecmo Ninja Gaiden (extended channel 3 on second OPN)", { // Ninja Gaiden, Raiga, etc
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1MHz
     }
   );
   ENTRY(
     "Tecmo Ninja Gaiden (extended channel 3 on both OPNs)", { // Ninja Gaiden, Raiga, etc
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1MHz
     }
   );
   ENTRY(
     "Tecmo System", {
       CH(DIV_SYSTEM_OPL3, 64, 0, ""),
       CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
-      DIV_SYSTEM_MSM6295, 64, 0, 8, // 2MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=8") // 2MHz
     }
   );
   ENTRY(
     "Tecmo System (drums mode)", {
       CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, ""),
       CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
-      DIV_SYSTEM_MSM6295, 64, 0, 8, // 2MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=8") // 2MHz
     }
   );
   ENTRY(
     "Seibu Kaihatsu Raiden", { // Raiden, Seibu cup soccer, Zero team, etc
-      DIV_SYSTEM_OPL2, 64, 0, 0, // YM3812 3.58MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1 or 1.023MHz (28.636363MHz / 28); various per games
+      CH(DIV_SYSTEM_OPL2, 64, 0, ""), // YM3812 3.58MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1 or 1.023MHz (28.636363MHz / 28); various per games
     }
   );
   ENTRY(
     "Seibu Kaihatsu Raiden (drums mode)", { // Raiden, Seibu cup soccer, Zero team, etc
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0, // YM3812 3.58MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1 or 1.023MHz (28.636363MHz / 28); various per games
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, ""), // YM3812 3.58MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1 or 1.023MHz (28.636363MHz / 28); various per games
     }
   );
   ENTRY(
     "Sunsoft Shanghai 3", {
-      DIV_SYSTEM_AY8910, 64, 0, 20, // YM2149 1.5MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 1, // 1.056MHz
+      CH(DIV_SYSTEM_AY8910, 64, 0,
+        "clockSel=4\n"
+        "chipType=1\n"
+      ), // YM2149 1.5MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=1") // 1.056MHz
     }
   );
   ENTRY(
     "Sunsoft Arcade", {
-      DIV_SYSTEM_YM2612, 64, 0, 2, // discrete YM3438 8MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 1, // 1.056MHz
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2"), // discrete YM3438 8MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=1") // 1.056MHz
     }
   );
   ENTRY(
     "Sunsoft Arcade (extended channel 3)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // discrete YM3438 8MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 1, // 1.056MHz
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2"), // discrete YM3438 8MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=1") // 1.056MHz
     }
   );
   ENTRY(
     "Atari Klax", { 
-      DIV_SYSTEM_MSM6295, 64, 0, 7, // 0.895MHz (3.579545MHz / 4)
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=7") // 0.895MHz (3.579545MHz / 4)
     }
   );
   ENTRY(
-    "Atari Rampart", { 
-      DIV_SYSTEM_OPLL, 64, 0, 0, // 3.579545MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 14, // 1.193MHz (3.579545MHz / 3)
+    "Atari Rampart", {
+      CH(DIV_SYSTEM_OPLL, 64, 0, ""), // 3.579545MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=14") // 1.193MHz (3.579545MHz / 3)
     }
   );
   ENTRY(
     "Atari Rampart (drums mode)", { 
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0, // 3.579545MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 14, // 1.193MHz (3.579545MHz / 3)
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""), // 3.579545MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=14") // 1.193MHz (3.579545MHz / 3)
     }
   );
   ENTRY(
     "Atari JSA IIIs", { 
-      DIV_SYSTEM_YM2151, 64, 0, 0, // 3.579545MHz
-      DIV_SYSTEM_MSM6295, 64, -127, 14, // 1.193MHz (3.579545MHz / 3), Left output
-      DIV_SYSTEM_MSM6295, 64, 127, 14, // 1.193MHz (3.579545MHz / 3), Right output
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""), // 3.579545MHz
+      CH(DIV_SYSTEM_MSM6295, 64, -127, "clockSel=14"), // 1.193MHz (3.579545MHz / 3), Left output
+      CH(DIV_SYSTEM_MSM6295, 64, 127, "clockSel=14") // 1.193MHz (3.579545MHz / 3), Right output
     }
   );
   ENTRY(
     "Data East Karnov", {
-      DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL, 64, 0, 3, // 3MHz
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=3") // 3MHz
     }
   );
   ENTRY(
     "Data East Karnov (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL, 64, 0, 3, // 3MHz
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=3") // 3MHz
     }
   );
   ENTRY(
     "Data East Karnov (drums mode)", {
-      DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 3, // 3MHz
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=3") // 3MHz
     }
   );
   ENTRY(
     "Data East Karnov (extended channel 3; drums mode)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 3, // 3MHz
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=3") // 3MHz
     }
   );
   ENTRY(
     "Data East Arcade", { // Bad dudes, Robocop, etc
-      DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL2, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1 to 1.056MHz; various per games or optional
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1 to 1.056MHz; various per games or optional
     }
   );
   ENTRY(
     "Data East Arcade (extended channel 3)", { // Bad dudes, Robocop, etc
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL2, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1 to 1.056MHz; various per games or optional
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1 to 1.056MHz; various per games or optional
     }
   );
   ENTRY(
     "Data East Arcade (drums mode)", { // Bad dudes, Robocop, etc
-      DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1 to 1.056MHz; various per games or optional
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1 to 1.056MHz; various per games or optional
     }
   );
   ENTRY(
     "Data East Arcade (extended channel 3; drums mode)", { // Bad dudes, Robocop, etc
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1 to 1.056MHz; various per games or optional
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "") // 1 to 1.056MHz; various per games or optional
     }
   );
   ENTRY(
     "Data East PCX", {
-      DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
-      CH(DIV_SYSTEM_PCE, 64, 0, ""),
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_PCE, 64, 0, "")
       // software controlled MSM5205
     }
   );
   ENTRY(
     "Data East PCX (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz
-      CH(DIV_SYSTEM_PCE, 64, 0, ""),
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=5"), // 1.5MHz
+      CH(DIV_SYSTEM_PCE, 64, 0, "")
       // software controlled MSM5205
     }
   );
   ENTRY(
     "Data East Dark Seal", { // Dark Seal, Crude Buster, Vapor Trail, etc
-      DIV_SYSTEM_YM2151, 64, 0, 0, // 3.580MHz (32.22MHz / 9)
-      DIV_SYSTEM_OPN, 64, 0, 2, // 4.0275MHz (32.22MHz / 8); optional
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1.007MHz (32.22MHz / 32)
-      DIV_SYSTEM_MSM6295, 64, 0, 8, // 2.014MHz (32.22MHz / 16); optional
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""), // 3.580MHz (32.22MHz / 9)
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4.0275MHz (32.22MHz / 8); optional
+      CH(DIV_SYSTEM_MSM6295, 64, 0, ""), // 1.007MHz (32.22MHz / 32)
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=8") // 2.014MHz (32.22MHz / 16); optional
       // HuC6280 is for control them, internal sound isn't used
     }
   );
   ENTRY(
     "Data East Dark Seal (extended channel 3)", { // Dark Seal, Crude Buster, Vapor Trail, etc
-      DIV_SYSTEM_YM2151, 64, 0, 0, // 3.580MHz (32.22MHz / 9)
-      DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4.0275MHz (32.22MHz / 8); optional
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1.007MHz (32.22MHz / 32)
-      DIV_SYSTEM_MSM6295, 64, 0, 8, // 2.014MHz (32.22MHz / 16); optional
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""), // 3.580MHz (32.22MHz / 9)
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4.0275MHz (32.22MHz / 8); optional
+      CH(DIV_SYSTEM_MSM6295, 64, 0, ""), // 1.007MHz (32.22MHz / 32)
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=8") // 2.014MHz (32.22MHz / 16); optional
       // HuC6280 is for control them, internal sound isn't used
     }
   );
   ENTRY(
     "Data East Deco 156", {
-      DIV_SYSTEM_MSM6295, 64, 0, 0, // 1 or 1.007MHz (32.22MHz / 32); various per games
-      DIV_SYSTEM_MSM6295, 64, 0, 8, // 1 or 2 or 2.014MHz (32.22MHz / 16); various per games
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=0"), // 1 or 1.007MHz (32.22MHz / 32); various per games
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=8") // 1 or 2 or 2.014MHz (32.22MHz / 16); various per games
     }
   );
   ENTRY(
     "Data East MLC", {
-      DIV_SYSTEM_YMZ280B, 64, 0, 5, // 14MHz
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, "clockSel=5") // 14MHz
     }
   );
   ENTRY(
     "SNK Ikari Warriors", {
-      DIV_SYSTEM_OPL, 64, 0, 2,
-      DIV_SYSTEM_OPL, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Ikari Warriors (drums mode on first OPL)", {
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_OPL, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Ikari Warriors (drums mode on second OPL)", {
-      DIV_SYSTEM_OPL, 64, 0, 2,
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Ikari Warriors (drums mode on both OPLs)", {
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Triple Z80", {
-      DIV_SYSTEM_Y8950, 64, 0, 2,
-      DIV_SYSTEM_OPL, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Triple Z80 (drums mode on Y8950)", {
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_OPL, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Triple Z80 (drums mode on OPL)", {
-      DIV_SYSTEM_Y8950, 64, 0, 2,
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Triple Z80 (drums mode on Y8950 and OPL)", {
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Chopper I", {
-      DIV_SYSTEM_Y8950, 64, 0, 2,
-      DIV_SYSTEM_OPL2, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Chopper I (drums mode on Y8950)", {
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_OPL2, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Chopper I (drums mode on OPL2)", {
-      DIV_SYSTEM_Y8950, 64, 0, 2,
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Chopper I (drums mode on Y8950 and OPL2)", {
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Touchdown Fever", {
-      DIV_SYSTEM_OPL, 64, 0, 2,
-      DIV_SYSTEM_Y8950, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Touchdown Fever (drums mode on OPL)", {
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_Y8950, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Touchdown Fever (drums mode on Y8950)", {
-      DIV_SYSTEM_OPL, 64, 0, 2,
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "SNK Touchdown Fever (drums mode on OPL and Y8950)", {
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"),
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2")
     }
   );
   ENTRY(
     "Alpha denshi Alpha-68K", {
-      DIV_SYSTEM_OPN, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPLL, 64, 0, 0, // 3.58MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 7613|(7<<16), // software controlled 8 bit DAC
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPLL, 64, 0, "clockSel=0"), // 3.58MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=7614\n"
+        "outDepth=8\n"
+      ) // software controlled 8 bit DAC
     }
   );
   ENTRY(
     "Alpha denshi Alpha-68K (extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPLL, 64, 0, 0, // 3.58MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 7613|(7<<16), // software controlled 8 bit DAC
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPLL, 64, 0, "clockSel=0"), // 3.58MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=7614\n"
+        "outDepth=8\n"
+      ) // software controlled 8 bit DAC
     }
   );
   ENTRY(
     "Alpha denshi Alpha-68K (drums mode)", {
-      DIV_SYSTEM_OPN, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0, // 3.58MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 7613|(7<<16), // software controlled 8 bit DAC
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "clockSel=0"), // 3.58MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=7614\n"
+        "outDepth=8\n"
+      ) // software controlled 8 bit DAC
     }
   );
   ENTRY(
     "Alpha denshi Alpha-68K (extended channel 3; drums mode)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 3, // 3MHz
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0, // 3.58MHz
-      DIV_SYSTEM_PCM_DAC, 64, 0, 7613|(7<<16), // software controlled 8 bit DAC
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=3"), // 3MHz
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "clockSel=0"), // 3.58MHz
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=7614\n"
+        "outDepth=8\n"
+      ) // software controlled 8 bit DAC
     }
   );
   ENTRY(
     "Neo Geo MVS", {
-      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, "")
     }
   );
   ENTRY(
     "Neo Geo MVS (extended channel 2)", {
-      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "Nichibutsu Mag Max", {
-      DIV_SYSTEM_AY8910, 64, 0, 13,
-      DIV_SYSTEM_AY8910, 64, 0, 13,
-      DIV_SYSTEM_AY8910, 64, 0, 13,
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=13"),
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=13"),
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=13")
     }
   );
   ENTRY(
     "Namco (3-channel WSG)", { // Pac-Man, Galaga, Xevious, etc
-      CH(DIV_SYSTEM_NAMCO, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO, 64, 0, "")
     }
   );
   ENTRY(
     "Namco Mappy", { // Mappy, Super Pac-Man, Libble Rabble, etc
-      CH(DIV_SYSTEM_NAMCO_15XX, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO_15XX, 64, 0, "")
     }
   );
   ENTRY(
     "Namco Pac-Land", { // Pac-Land, Baraduke, Sky kid, etc
-      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, "")
     }
   );
   ENTRY(
     "Namco System 86", { // without expansion board case; Hopping Mappy, etc
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
-      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, "")
     }
   );
   ENTRY(
     "Namco Thunder Ceptor", {
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
       CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 7999|(7<<16), // M65C02 software driven, correct sample rate?
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
+        "rate=8000\n"
+        "outDepth=8\n"
+      ) // M65C02 software driven, correct sample rate?
     }
   );
   ENTRY(
     "Namco System 1", {
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
       CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 5999|(7<<16), // sample rate verified from https://github.com/mamedev/mame/blob/master/src/devices/sound/n63701x.cpp
-      DIV_SYSTEM_PCM_DAC, 64, 0, 5999|(7<<16), // ""
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=6000\n"
+        "outDepth=8\n"
+      ), // sample rate verified from https://github.com/mamedev/mame/blob/master/src/devices/sound/n63701x.cpp
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=6000\n"
+        "outDepth=8\n"
+      ) // ""
     }
   );
   ENTRY(
     "Taito Arcade", {
-      CH(DIV_SYSTEM_YM2610B, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610B, 64, 0, "")
     }
   );
   ENTRY(
     "Taito Arcade (extended channel 3)", {
-      CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "Seta 1", {
-      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
+      CH(DIV_SYSTEM_X1_010, 64, 0, "")
     }
   );
   ENTRY(
     "Seta 1 + FM addon", {
       CH(DIV_SYSTEM_X1_010, 64, 0, ""),
-      DIV_SYSTEM_YM2612, 64, 0, 2, // Discrete YM3438
+      CH(DIV_SYSTEM_YM2612, 64, 0, "clockSel=2") // Discrete YM3438
     }
   );
   ENTRY(
     "Seta 1 + FM addon (extended channel 3)", {
       CH(DIV_SYSTEM_X1_010, 64, 0, ""),
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // Discrete YM3438
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, "clockSel=2") // Discrete YM3438
     }
   );
   ENTRY(
     "Seta 2", {
-      DIV_SYSTEM_X1_010, 64, 0, 1,
+      CH(DIV_SYSTEM_X1_010, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Cave 68000", {
-      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, "")
     }
   );
   ENTRY(
     "Coreland Cyber Tank", {
-      DIV_SYSTEM_Y8950, 64, -127, 0, // 3.58MHz, Left output
-      DIV_SYSTEM_Y8950, 64, 127, 0, // 3.58MHz, Right output
+      CH(DIV_SYSTEM_Y8950, 64, -127, ""), // 3.58MHz, Left output
+      CH(DIV_SYSTEM_Y8950, 64, 127, "") // 3.58MHz, Right output
     }
   );
   ENTRY(
     "Coreland Cyber Tank (drums mode)", {
-      DIV_SYSTEM_Y8950, 64, -127, 0, // 3.58MHz, Left output
-      DIV_SYSTEM_Y8950, 64, 127, 0, // 3.58MHz, Right output
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, -127, ""), // 3.58MHz, Left output
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 127, "") // 3.58MHz, Right output
     }
   );
   ENTRY(
     "ICE Skimaxx", {
-      DIV_SYSTEM_MSM6295, 64, -127, 130, // 4MHz, Left output
-      DIV_SYSTEM_MSM6295, 64, 127, 130, // 4MHz, Right output
-      DIV_SYSTEM_MSM6295, 64, -127, 8, // 2MHz, Left output
-      DIV_SYSTEM_MSM6295, 64, 127, 8, // 2MHz, Right output
+      CH(DIV_SYSTEM_MSM6295, 64, -127,
+        "clockSel=2\n"
+        "rateSel=true\n"
+      ), // 4MHz, Left output
+      CH(DIV_SYSTEM_MSM6295, 64, 127,
+        "clockSel=2\n"
+        "rateSel=true\n"
+      ), // 4MHz, Right output
+      CH(DIV_SYSTEM_MSM6295, 64, -127, "clockSel=8"), // 2MHz, Left output
+      CH(DIV_SYSTEM_MSM6295, 64, 127, "clockSel=8") // 2MHz, Right output
     }
   );
   ENTRY(
     "Toaplan 1", {
-      DIV_SYSTEM_OPL2, 64, 0, 5, // 3.5MHz
+      CH(DIV_SYSTEM_OPL2, 64, 0, "clockSel=5") // 3.5MHz
     }
   );
   ENTRY(
     "Toaplan 1 (drums mode)", {
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 5, // 3.5MHz
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=5") // 3.5MHz
     }
   );
   ENTRY(
     "Dynax/Nakanihon 3rd generation hardware", {
-      DIV_SYSTEM_AY8910, 64, 0, 0, // AY or YM, optional - 1.79MHz or 3.58MHz; various per game
+      CH(DIV_SYSTEM_AY8910, 64, 0, ""), // AY or YM, optional - 1.79MHz or 3.58MHz; various per game
       CH(DIV_SYSTEM_OPLL, 64, 0, ""),
-      DIV_SYSTEM_MSM6295, 64, 0, 6, // 1.023MHz mostly
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=6") // 1.023MHz mostly
     }
   );
   ENTRY(
     "Dynax/Nakanihon 3rd generation hardware (drums mode)", {
-      DIV_SYSTEM_AY8910, 64, 0, 0, // AY or YM, optional - 1.79MHz or 3.58MHz; various per game
+      CH(DIV_SYSTEM_AY8910, 64, 0, ""), // AY or YM, optional - 1.79MHz or 3.58MHz; various per game
       CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""),
-      DIV_SYSTEM_MSM6295, 64, 0, 6, // 1.023MHz mostly
+      CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=6") // 1.023MHz mostly
     }
   );
   ENTRY(
     "Dynax/Nakanihon Real Break", {
       CH(DIV_SYSTEM_OPLL, 64, 0, ""),
-      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, "")
     }
   );
   ENTRY(
     "Dynax/Nakanihon Real Break (drums mode)", {
       CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""),
-      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, "")
     }
   );
   ENTRY(
     "Irem M72", {
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
-      DIV_SYSTEM_PCM_DAC, 64, 0, 7811|(7<<16),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=7812\n"
+        "outDepth=8\n"
+      )
     }
   );
   CATEGORY_END;
-  */
 
   CATEGORY_BEGIN("DefleMask-compatible","these configurations are compatible with DefleMask.\nselect this if you need to save as .dmf or work with that program.");
   ENTRY(

From 1ce7a67659d35e7cd67d107e8a65bbf960a1f154 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 02:29:24 -0500
Subject: [PATCH 04/86] convert presets to new format, part 8

the final one
---
 src/gui/presets.cpp | 58 ++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index ba3f6b02d..74d0e0122 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -388,7 +388,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=55930\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // variable rate, Mono DAC
     }
   );
@@ -465,11 +465,11 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_PC98, 64, 0, "clockSel=1"),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, // 2x 16-bit Burr Brown DAC
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
       ),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
       ),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
@@ -479,11 +479,11 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_PC98_EXT, 64, 0, "clockSel=1"),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
       ),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
       ),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
@@ -505,7 +505,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
         "stereo=true\n"
       ),
       CH(DIV_SYSTEM_OPL3, 64, 0, "clockSel=2"),
@@ -517,7 +517,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
         "stereo=true\n"
       ),
       CH(DIV_SYSTEM_OPL3, 64, 0, "clockSel=2"),
@@ -529,7 +529,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=2"), // 4MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
         "stereo=true\n"
       ),
       CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, "clockSel=2"),
@@ -541,7 +541,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=2"), // 4MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
         "stereo=true\n"
       ),
       CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, "clockSel=2"),
@@ -614,11 +614,11 @@ void FurnaceGUI::initSystemPresets() {
       ),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=50668\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=50668\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       )
     }
   );
@@ -689,7 +689,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=22050\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       )
     }
   );
@@ -699,7 +699,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=22050\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       )
     }
   );
@@ -710,7 +710,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=22050\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
@@ -722,7 +722,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_SAA1099, 64, 0, "clockSel=1"),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=22050\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
     }
@@ -733,7 +733,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPL2, 64, 127, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=22050\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
         "stereo=true\n"
       ), //alternatively 44.1 khz mono
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
@@ -745,7 +745,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPL2_DRUMS, 64, 127, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=22050\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
         "stereo=true\n"
       ), //alternatively 44.1 khz mono
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
@@ -756,7 +756,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPL3, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
         "stereo=true\n"
       ),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
@@ -767,7 +767,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=44100\n"
-        "outDepth=16\n"
+        "outDepth=15\n"
         "stereo=true\n"
       ),
       CH(DIV_SYSTEM_PCSPKR, 64, 0, "")
@@ -1283,7 +1283,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=15625\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ), // variable via OPM timer?
       CH(DIV_SYSTEM_MSM6295, 64, 0, "")
     }
@@ -1397,7 +1397,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_YM2151, 64, 0, "clockSel=2"), // 4MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=61500\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // software controlled, variable rate via configurable timers
     }
   );
@@ -1901,7 +1901,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPLL, 64, 0, "clockSel=0"), // 3.58MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=7614\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // software controlled 8 bit DAC
     }
   );
@@ -1911,7 +1911,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPLL, 64, 0, "clockSel=0"), // 3.58MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=7614\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // software controlled 8 bit DAC
     }
   );
@@ -1921,7 +1921,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "clockSel=0"), // 3.58MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=7614\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // software controlled 8 bit DAC
     }
   );
@@ -1931,7 +1931,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "clockSel=0"), // 3.58MHz
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=7614\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // software controlled 8 bit DAC
     }
   );
@@ -1979,7 +1979,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0, 
         "rate=8000\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // M65C02 software driven, correct sample rate?
     }
   );
@@ -1989,11 +1989,11 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=6000\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ), // sample rate verified from https://github.com/mamedev/mame/blob/master/src/devices/sound/n63701x.cpp
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=6000\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       ) // ""
     }
   );
@@ -2101,7 +2101,7 @@ void FurnaceGUI::initSystemPresets() {
       CH(DIV_SYSTEM_YM2151, 64, 0, ""),
       CH(DIV_SYSTEM_PCM_DAC, 64, 0,
         "rate=7812\n"
-        "outDepth=8\n"
+        "outDepth=7\n"
       )
     }
   );

From 1a35ce478f57657b7268cd0e508ab33ca3672774 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 02:46:04 -0500
Subject: [PATCH 05/86] GUI: fix visualizer in centered pattern mode

issue #727
---
 src/gui/debugWindow.cpp | 27 +++++++++++++++++++++++++++
 src/gui/pattern.cpp     |  8 ++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/gui/debugWindow.cpp b/src/gui/debugWindow.cpp
index 447ea12d5..fd8920ae8 100644
--- a/src/gui/debugWindow.cpp
+++ b/src/gui/debugWindow.cpp
@@ -386,6 +386,33 @@ void FurnaceGUI::drawDebug() {
       ImGui::Text("System Managed Scale: %d",sysManagedScale);
       ImGui::TreePop();
     }
+    if (ImGui::TreeNode("Visualizer Debug")) {
+      if (ImGui::BeginTable("visX",3,ImGuiTableFlags_Borders)) {
+        ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+        ImGui::TableNextColumn();
+        ImGui::Text("channel");
+        ImGui::TableNextColumn();
+        ImGui::Text("patChanX");
+        ImGui::TableNextColumn();
+        ImGui::Text("patChanSlideY");
+
+        for (int i=0; i<e->getTotalChannelCount(); i++) {
+          ImGui::TableNextRow();
+          ImGui::TableNextColumn();
+          ImGui::Text("%d",i);
+          ImGui::TableNextColumn();
+          ImGui::Text("%f",patChanX[i]);
+          ImGui::TableNextColumn();
+          ImGui::Text("%f",patChanSlideY[i]);
+        }
+
+        ImGui::EndTable();
+      }
+      
+      ImGui::Text("particle count: %ld",particles.size());
+
+      ImGui::TreePop();
+    }
     if (ImGui::TreeNode("Playground")) {
       if (pgSys<0 || pgSys>=e->song.systemLen) pgSys=0;
       if (ImGui::BeginCombo("Chip",fmt::sprintf("%d. %s",pgSys+1,e->getSystemName(e->song.system[pgSys])).c_str())) {
diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index dbfee3026..51f34eb31 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -133,14 +133,14 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
   for (int j=0; j<chans; j++) {
     // check if channel is not hidden
     if (!e->curSubSong->chanShow[j]) {
-      patChanX[j]=ImGui::GetCursorPosX();
+      patChanX[j]=ImGui::GetCursorScreenPos().x;
       continue;
     }
     int chanVolMax=e->getMaxVolumeChan(j);
     if (chanVolMax<1) chanVolMax=1;
     const DivPattern* pat=patCache[j];
     ImGui::TableNextColumn();
-    patChanX[j]=ImGui::GetCursorPosX();
+    patChanX[j]=ImGui::GetCursorScreenPos().x;
 
     // selection highlight flags
     int sel1XSum=sel1.xCoarse*32+sel1.xFine;
@@ -331,7 +331,7 @@ inline void FurnaceGUI::patternRow(int i, bool isPlaying, float lineHeight, int
     ImGui::PopStyleColor();
   }
   ImGui::TableNextColumn();
-  patChanX[chans]=ImGui::GetCursorPosX();
+  patChanX[chans]=ImGui::GetCursorScreenPos().x;
 }
 
 void FurnaceGUI::drawPattern() {
@@ -966,7 +966,7 @@ void FurnaceGUI::drawPattern() {
     if (fancyPattern) { // visualizer
       e->getCommandStream(cmdStream);
       ImDrawList* dl=ImGui::GetWindowDrawList();
-      ImVec2 off=ImGui::GetWindowPos();
+      ImVec2 off=ImVec2(0.0f,ImGui::GetWindowPos().y);
       
       // commands
       for (DivCommand& i: cmdStream) {

From d1c0cdf7d13233135c874de5a4c3aeb75f1f3032 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 02:53:37 -0500
Subject: [PATCH 06/86] GUI: fix split button in centered pattern mode

issue #727
---
 src/gui/pattern.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index 51f34eb31..ec158d650 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -652,7 +652,7 @@ void FurnaceGUI::drawPattern() {
           }
           case 3: // split button
             ImGui::Dummy(ImVec2(1.0f,2.0f*dpiScale));
-            ImGui::SetCursorPosX(minLabelArea.x);
+            //ImGui::SetCursorPosX(minLabelArea.x);
             ImGui::TextUnformatted(chanID);
             ImGui::SameLine();
             ImGui::PushFont(mainFont);

From dd62b387c702fe07f09af5a0752d71d8e4e4cdfc Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 03:05:43 -0500
Subject: [PATCH 07/86] sdafglhjddsfjhsfda;

---
 src/gui/debugWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/debugWindow.cpp b/src/gui/debugWindow.cpp
index fd8920ae8..17ac924b0 100644
--- a/src/gui/debugWindow.cpp
+++ b/src/gui/debugWindow.cpp
@@ -409,7 +409,7 @@ void FurnaceGUI::drawDebug() {
         ImGui::EndTable();
       }
       
-      ImGui::Text("particle count: %ld",particles.size());
+      ImGui::Text("particle count: %d",(int)particles.size());
 
       ImGui::TreePop();
     }

From 319d02aec66fd1dafde5daca147ae69719ae4e1c Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 03:14:26 -0500
Subject: [PATCH 08/86] SAA1099: fix frequency table going crazy

if there is more than one SAA
---
 extern/SAASound/src/SAAFreq.cpp | 12 ------------
 extern/SAASound/src/SAAFreq.h   |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/extern/SAASound/src/SAAFreq.cpp b/extern/SAASound/src/SAAFreq.cpp
index 0058c35af..5d0dd952a 100755
--- a/extern/SAASound/src/SAAFreq.cpp
+++ b/extern/SAASound/src/SAAFreq.cpp
@@ -12,18 +12,6 @@
 #include "SAAFreq.h"
 #include "defns.h"
 
-#ifdef SAAFREQ_FIXED_CLOCKRATE
-// 'load in' the data for the static frequency lookup table
-// precomputed for a fixed clockrate
-// See: tools/freqdat.py
-const unsigned long CSAAFreq::m_FreqTable[2048] = {
-#include "SAAFreq.dat"
-};
-#else
-unsigned long CSAAFreq::m_FreqTable[2048];
-unsigned long CSAAFreq::m_nClockRate = 0;
-#endif // SAAFREQ_FIXED_CLOCKRATE
-
 const int INITIAL_LEVEL = 1;
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extern/SAASound/src/SAAFreq.h b/extern/SAASound/src/SAAFreq.h
index 478754621..716c085e0 100755
--- a/extern/SAASound/src/SAAFreq.h
+++ b/extern/SAASound/src/SAAFreq.h
@@ -20,8 +20,8 @@ private:
 	const static unsigned long m_FreqTable[2048];
 #else
 	// we'll calculate the frequency lookup table at runtime.
-	static unsigned long m_FreqTable[2048];
-	static unsigned long m_nClockRate;
+	unsigned long m_FreqTable[2048];
+	unsigned long m_nClockRate;
 #endif
 
 	unsigned long m_nCounter;

From a5411837928a9b4c005c04f1619a398631ddd0a8 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 03:20:07 -0500
Subject: [PATCH 09/86] SAA1099: fix output being static

this caused problems with multi-SAA songs
---
 extern/SAASound/src/SAAImpl.cpp | 5 +++--
 extern/SAASound/src/SAAImpl.h   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extern/SAASound/src/SAAImpl.cpp b/extern/SAASound/src/SAAImpl.cpp
index 6602feee9..55665b6de 100644
--- a/extern/SAASound/src/SAAImpl.cpp
+++ b/extern/SAASound/src/SAAImpl.cpp
@@ -26,7 +26,9 @@ m_uParamRate(0),
 m_nClockRate(EXTERNAL_CLK_HZ),
 m_nSampleRate(SAMPLE_RATE_HZ),
 m_nOversample(DEFAULT_OVERSAMPLE),
-m_bHighpass(false)
+m_bHighpass(false),
+filterout_z1_left_mixed(0),
+filterout_z1_right_mixed(0)
 {
 #ifdef USE_CONFIG_FILE
 	m_Config.ReadConfig();
@@ -301,7 +303,6 @@ void scale_for_output(unsigned int left_input, unsigned int right_input,
 void CSAASoundInternal::GenerateMany(BYTE* pBuffer, unsigned long nSamples, DivDispatchOscBuffer** oscBuf)
 {
 	unsigned int left_mixed, right_mixed;
-	static double filterout_z1_left_mixed = 0, filterout_z1_right_mixed = 0;
 
 #if defined(DEBUGSAA) || defined(USE_CONFIG_FILE)
 	BYTE* pBufferStart = pBuffer;
diff --git a/extern/SAASound/src/SAAImpl.h b/extern/SAASound/src/SAAImpl.h
index f5f58d556..50de979df 100755
--- a/extern/SAASound/src/SAAImpl.h
+++ b/extern/SAASound/src/SAAImpl.h
@@ -36,6 +36,7 @@ private:
 	unsigned int m_nSampleRate;
 	unsigned int m_nOversample;
 	bool m_bHighpass;
+  double filterout_z1_left_mixed, filterout_z1_right_mixed;
 #ifdef USE_CONFIG_FILE
 	SAAConfig m_Config;
 #endif

From 4be68f99c5bd3d44a9896386cf5f6804f2fce3d2 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 03:25:42 -0500
Subject: [PATCH 10/86] GUI: fix volume bar on ExtCh

---
 src/gui/chanOsc.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gui/chanOsc.cpp b/src/gui/chanOsc.cpp
index 851ca6ede..24c25f4bd 100644
--- a/src/gui/chanOsc.cpp
+++ b/src/gui/chanOsc.cpp
@@ -77,7 +77,12 @@ void FurnaceGUI::calcChanOsc() {
   int chans=e->getTotalChannelCount();
   
   for (int i=0; i<chans; i++) {
+    int tryAgain=i;
     DivDispatchOscBuffer* buf=e->getOscBuffer(i);
+    while (buf==NULL) {
+      if (--tryAgain<0) break;
+      buf=e->getOscBuffer(tryAgain);
+    }
     if (buf!=NULL && e->curSubSong->chanShow[i]) {
       // 30ms should be enough
       int displaySize=(float)(buf->rate)*0.03f;

From 91e19b864e2021b7f7083132d03c78cfd52aabc2 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 16:09:24 -0500
Subject: [PATCH 11/86] GUI: fix unsigned detune (again)

---
 src/gui/insEdit.cpp | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index b762e0924..35646a67c 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -333,6 +333,16 @@ const char* snesGainModes[5]={
   "Increase (bent line)"
 };
 
+const int detuneMap[2][8]={
+  {-3, -2, -1, 0, 1, 2, 3, 4},
+  { 7,  6,  5, 0, 1, 2, 3, 4}
+};
+
+const int detuneUnmap[2][11]={
+  {0, 1, 2, 3, 4, 5, 6, 7, 0, 0, 0},
+  {0, 0, 0, 3, 4, 5, 6, 7, 2, 1, 0}
+};
+
 // do not change these!
 // anything other than a checkbox will look ugly!
 //
@@ -2739,11 +2749,13 @@ void FurnaceGUI::drawInsEdit() {
                     }
 
                     if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                      int detune=(op.dt&7)-(settings.unsignedDetune?0:3);
+                      int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
                       ImGui::TableNextColumn();
                       CENTER_VSLIDER;
                       if (CWVSliderInt("##DT",ImVec2(20.0f*dpiScale,sliderHeight),&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4)) { PARAMETER
-                        op.dt=detune+(settings.unsignedDetune?0:3);
+                        if (detune<-3) detune=-3;
+                        if (detune>7) detune=7;
+                        op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
                       }
 
                       if (ins->type!=DIV_INS_FM) {
@@ -3078,11 +3090,13 @@ void FurnaceGUI::drawInsEdit() {
                           snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
                           P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
 
-                          int detune=(op.dt&7)-(settings.unsignedDetune?0:3);
+                          int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
                           snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
                           if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
-                            op.dt=detune+(settings.unsignedDetune?0:3);
+                            if (detune<-3) detune=-3;
+                            if (detune>7) detune=7;
+                            op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
                           } rightClickable
 
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@@ -3100,11 +3114,13 @@ void FurnaceGUI::drawInsEdit() {
                           snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
                           P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
 
-                          int detune=(op.dt&7)-(settings.unsignedDetune?0:3);
+                          int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
                           snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
                           if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
-                            op.dt=detune+(settings.unsignedDetune?0:3);
+                            if (detune<-3) detune=-3;
+                            if (detune>7) detune=7;
+                            op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
                           } rightClickable
 
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
@@ -3241,11 +3257,13 @@ void FurnaceGUI::drawInsEdit() {
                             snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
                             P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
 
-                            int detune=(op.dt&7)-(settings.unsignedDetune?0:3);
+                            int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
                             ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
                             snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
                             if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
-                              op.dt=detune+(settings.unsignedDetune?0:3);
+                              if (detune<-3) detune=-3;
+                              if (detune>7) detune=7;
+                              op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
                             } rightClickable
                           }
 
@@ -3616,12 +3634,14 @@ void FurnaceGUI::drawInsEdit() {
                       
                       if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
                         if (!(ins->type==DIV_INS_OPZ && op.egt)) {
-                          int detune=(op.dt&7)-(settings.unsignedDetune?0:3);
+                          int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
                           ImGui::TableNextRow();
                           ImGui::TableNextColumn();
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
                           if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4)) { PARAMETER
-                            op.dt=detune+(settings.unsignedDetune?0:3);
+                            if (detune<-3) detune=-3;
+                            if (detune>7) detune=7;
+                            op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
                           } rightClickable
                           ImGui::TableNextColumn();
                           ImGui::Text("%s",FM_NAME(FM_DT));

From c1670662968c9c691f9423ac6c7a39392313b32b Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 16:40:27 -0500
Subject: [PATCH 12/86] PCE: finally fix LFO

---
 src/engine/platform/pce.cpp | 15 +++++++++------
 src/engine/platform/pce.h   |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/engine/platform/pce.cpp b/src/engine/platform/pce.cpp
index b40fa92d3..e8a308f17 100644
--- a/src/engine/platform/pce.cpp
+++ b/src/engine/platform/pce.cpp
@@ -252,6 +252,11 @@ void DivPlatformPCE::tick(bool sysTick) {
       chan[i].freqChanged=false;
     }
   }
+  if (updateLFO) {
+    rWrite(0x08,lfoSpeed);
+    rWrite(0x09,lfoMode);
+    updateLFO=false;
+  }
 }
 
 int DivPlatformPCE::dispatch(DivCommand c) {
@@ -389,13 +394,11 @@ int DivPlatformPCE::dispatch(DivCommand c) {
       } else {
         lfoMode=c.value;
       }
-      rWrite(0x08,lfoSpeed);
-      rWrite(0x09,lfoMode);
+      updateLFO=true;
       break;
     case DIV_CMD_PCE_LFO_SPEED:
       lfoSpeed=255-c.value;
-      rWrite(0x08,lfoSpeed);
-      rWrite(0x09,lfoMode);
+      updateLFO=true;
       break;
     case DIV_CMD_NOTE_PORTA: {
       int destFreq=NOTE_PERIODIC(c.value2);
@@ -525,8 +528,7 @@ void DivPlatformPCE::reset() {
   rWrite(0,0);
   rWrite(0x01,0xff);
   // set LFO
-  rWrite(0x08,lfoSpeed);
-  rWrite(0x09,lfoMode);
+  updateLFO=true;
   // set per-channel initial panning
   for (int i=0; i<6; i++) {
     chWrite(i,0x05,isMuted[i]?0:chan[i].pan);
@@ -588,6 +590,7 @@ int DivPlatformPCE::init(DivEngine* p, int channels, int sugRate, const DivConfi
   parent=p;
   dumpWrites=false;
   skipRegisterWrites=false;
+  updateLFO=false;
   for (int i=0; i<6; i++) {
     isMuted[i]=false;
     oscBuf[i]=new DivDispatchOscBuffer;
diff --git a/src/engine/platform/pce.h b/src/engine/platform/pce.h
index a78783108..5645586be 100644
--- a/src/engine/platform/pce.h
+++ b/src/engine/platform/pce.h
@@ -76,6 +76,7 @@ class DivPlatformPCE: public DivDispatch {
   DivDispatchOscBuffer* oscBuf[6];
   bool isMuted[6];
   bool antiClickEnabled;
+  bool updateLFO;
   struct QueuedWrite {
       unsigned char addr;
       unsigned char val;

From 1f6c25643b33662003c0d519a021aea4fdd52dc5 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 16:53:05 -0500
Subject: [PATCH 13/86] OPLL: add setting to not write freq of top/hi-hat

issue #249
---
 src/engine/platform/opll.cpp | 3 ++-
 src/engine/platform/opll.h   | 2 +-
 src/gui/sysConf.cpp          | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/engine/platform/opll.cpp b/src/engine/platform/opll.cpp
index 264f3a7aa..a8b51b107 100644
--- a/src/engine/platform/opll.cpp
+++ b/src/engine/platform/opll.cpp
@@ -247,7 +247,7 @@ void DivPlatformOPLL::tick(bool sysTick) {
       if (chan[i].freq>65535) chan[i].freq=65535;
       int freqt=toFreq(chan[i].freq);
       chan[i].freqL=freqt&0xff;
-      if (i>=6 && properDrums) {
+      if (i>=6 && properDrums && (i<9 || !noTopHatFreq)) {
         immWrite(0x10+drumSlot[i],freqt&0xff);
         immWrite(0x20+drumSlot[i],freqt>>8);
       } else if (i<6 || !drums) {
@@ -963,6 +963,7 @@ void DivPlatformOPLL::setFlags(const DivConfig& flags) {
   for (int i=0; i<11; i++) {
     oscBuf[i]->rate=rate/2;
   }
+  noTopHatFreq=flags.getBool("noTopHatFreq",false);
 }
 
 int DivPlatformOPLL::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) {
diff --git a/src/engine/platform/opll.h b/src/engine/platform/opll.h
index 390d79a96..8dd8743de 100644
--- a/src/engine/platform/opll.h
+++ b/src/engine/platform/opll.h
@@ -82,7 +82,7 @@ class DivPlatformOPLL: public DivDispatch {
 
     bool useYMFM;
     bool drums;
-    bool properDrums, properDrumsSys;
+    bool properDrums, properDrumsSys, noTopHatFreq;
     bool vrc7;
 
     unsigned char patchSet;
diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp
index f1b6822f0..9ac674bc5 100644
--- a/src/gui/sysConf.cpp
+++ b/src/gui/sysConf.cpp
@@ -318,6 +318,7 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
     case DIV_SYSTEM_VRC7: {
       int clockSel=flags.getInt("clockSel",0);
       int patchSet=flags.getInt("patchSet",0);
+      bool noTopHatFreq=flags.getBool("noTopHatFreq",false);
 
       ImGui::Text("Clock rate:");
       if (ImGui::RadioButton("NTSC (3.58MHz)",clockSel==0)) {
@@ -356,12 +357,19 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
         }
       }
 
+      if (type==DIV_SYSTEM_OPLL_DRUMS) {
+        if (ImGui::Checkbox("Ignore top/hi-hat frequency changes",&noTopHatFreq)) {
+          altered=true;
+        }
+      }
+
       if (altered) {
         e->lockSave([&]() {
           flags.set("clockSel",clockSel);
           if (type!=DIV_SYSTEM_VRC7) {
             flags.set("patchSet",patchSet);
           }
+          flags.set("noTopHatFreq",noTopHatFreq);
         });
       }
       break;

From 94512e5b209d70df002e1283fc17ee425e9417e7 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 17:51:43 -0500
Subject: [PATCH 14/86] GUI: OPLL built-in patch preview!

---
 src/gui/gui.h       |    1 +
 src/gui/insEdit.cpp | 2320 ++++++++++++++++++++++---------------------
 2 files changed, 1178 insertions(+), 1143 deletions(-)

diff --git a/src/gui/gui.h b/src/gui/gui.h
index f8aad134a..f57e14429 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1072,6 +1072,7 @@ class FurnaceGUI {
   int displayInsTypeListMakeInsSample;
   float mobileMenuPos, autoButtonSize;
   const int* curSysSection;
+  DivInstrumentFM opllPreview;
 
   String pendingRawSample;
   int pendingRawSampleDepth, pendingRawSampleChannels;
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index 35646a67c..c2e2cb016 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -28,12 +28,16 @@
 #include <imgui.h>
 #include "plot_nolerp.h"
 
+extern "C" {
+#include "../../extern/Nuked-OPLL/opll.h"
+}
+
 const char* ssgEnvTypes[8]={
   "Down Down Down", "Down.", "Down Up Down Up", "Down UP", "Up Up Up", "Up.", "Up Down Up Down", "Up DOWN"
 };
 
 const char* fmParamNames[3][32]={
-  {"Algorithm", "Feedback", "LFO > Freq", "LFO > Amp", "Attack", "Decay", "Decay 2", "Release", "Sustain", "Level", "EnvScale", "Multiplier", "Detune", "Detune 2", "SSG-EG", "AM", "AM Depth", "Vibrato Depth", "Sustained", "Sustained", "Level Scaling", "Sustain", "Vibrato", "Waveform", "Key Scale Rate", "OP2 Half Sine", "OP1 Half Sine", "EnvShift", "Reverb", "Fine", "LFO2 > Freq", "LFO2 > Amp"},
+  {"Algorithm", "Feedback", "LFO > Freq", "LFO > Amp", "Attack", "Decay", "Decay 2", "Release", "Sustain", "Level", "EnvScale", "Multiplier", "Detune", "Detune 2", "SSG-EG", "AM", "AM Depth", "Vibrato Depth", "Sustained", "Sustained", "Level Scaling", "Sustain", "Vibrato", "Waveform", "Scale Rate", "OP2 Half Sine", "OP1 Half Sine", "EnvShift", "Reverb", "Fine", "LFO2 > Freq", "LFO2 > Amp"},
   {"ALG", "FB", "FMS/PMS", "AMS", "AR", "DR", "SR", "RR", "SL", "TL", "KS", "MULT", "DT", "DT2", "SSG-EG", "AM", "AMD", "FMD", "EGT", "EGT", "KSL", "SUS", "VIB", "WS", "KSR", "DC", "DM", "EGS", "REV", "Fine", "FMS/PMS2", "AMS2"},
   {"ALG", "FB", "FMS/PMS", "AMS", "AR", "DR", "D2R", "RR", "SL", "TL", "RS", "MULT", "DT", "DT2", "SSG-EG", "AM", "DAM", "DVB", "EGT", "EGS", "KSL", "SUS", "VIB", "WS", "KSR", "DC", "DM", "EGS", "REV", "Fine", "FMS/PMS2", "AMS2"}
 };
@@ -2443,370 +2447,666 @@ void FurnaceGUI::drawInsEdit() {
               if (ins->fm.opllPreset==16) {
                 ImGui::Text("this volume slider only works in compatibility (non-drums) system.");
               }
+
+              // update OPLL preset preview
+              if (ins->fm.opllPreset>0 && ins->fm.opllPreset<16) {
+                const opll_patch_t* patchROM=OPLL_GetPatchROM(opll_type_ym2413);
+
+                const opll_patch_t* patch=&patchROM[ins->fm.opllPreset-1];
+
+                opllPreview.alg=0;
+                opllPreview.fb=patch->fb;
+                opllPreview.fms=patch->dm;
+                opllPreview.ams=patch->dc;
+
+                opllPreview.op[0].tl=patch->tl;
+                opllPreview.op[1].tl=ins->fm.op[1].tl;
+
+                for (int i=0; i<2; i++) {
+                  opllPreview.op[i].am=patch->am[i];
+                  opllPreview.op[i].vib=patch->vib[i];
+                  opllPreview.op[i].ssgEnv=patch->et[i]?8:0;
+                  opllPreview.op[i].ksr=patch->ksr[i];
+                  opllPreview.op[i].mult=patch->multi[i];
+                  opllPreview.op[i].ar=patch->ar[i];
+                  opllPreview.op[i].dr=patch->dr[i];
+                  opllPreview.op[i].sl=patch->sl[i];
+                  opllPreview.op[i].rr=patch->rr[i];
+                }
+              }
             }
-            if (willDisplayOps) {
-              if (settings.fmLayout==0) {
-                int numCols=15;
-                if (ins->type==DIV_INS_OPL ||ins->type==DIV_INS_OPL_DRUMS) numCols=13;
-                if (ins->type==DIV_INS_OPLL) numCols=12;
-                if (ins->type==DIV_INS_OPZ) numCols=19;
-                if (ImGui::BeginTable("FMOperators",numCols,ImGuiTableFlags_SizingStretchProp|ImGuiTableFlags_BordersH|ImGuiTableFlags_BordersOuterV)) {
-                  // configure columns
-                  ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed); // op name
-                  ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,0.05f); // ar
-                  ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch,0.05f); // dr
-                  ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthStretch,0.05f); // sl
-                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                    ImGui::TableSetupColumn("c4",ImGuiTableColumnFlags_WidthStretch,0.05f); // d2r
-                  }
-                  ImGui::TableSetupColumn("c5",ImGuiTableColumnFlags_WidthStretch,0.05f); // rr
-                  ImGui::TableSetupColumn("c6",ImGuiTableColumnFlags_WidthFixed); // -separator-
-                  ImGui::TableSetupColumn("c7",ImGuiTableColumnFlags_WidthStretch,0.05f); // tl
-                  ImGui::TableSetupColumn("c8",ImGuiTableColumnFlags_WidthStretch,0.05f); // rs/ksl
-                  if (ins->type==DIV_INS_OPZ) {
-                    ImGui::TableSetupColumn("c8z0",ImGuiTableColumnFlags_WidthStretch,0.05f); // egs
-                    ImGui::TableSetupColumn("c8z1",ImGuiTableColumnFlags_WidthStretch,0.05f); // rev
-                  }
-                  ImGui::TableSetupColumn("c9",ImGuiTableColumnFlags_WidthStretch,0.05f); // mult
 
-                  if (ins->type==DIV_INS_OPZ) {
-                    ImGui::TableSetupColumn("c9z",ImGuiTableColumnFlags_WidthStretch,0.05f); // fine
-                  }
+            DivInstrumentFM& fmOrigin=(ins->type==DIV_INS_OPLL && ins->fm.opllPreset>0 && ins->fm.opllPreset<16)?opllPreview:ins->fm;
 
-                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                    ImGui::TableSetupColumn("c10",ImGuiTableColumnFlags_WidthStretch,0.05f); // dt
-                  }
-                  if (ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                    ImGui::TableSetupColumn("c11",ImGuiTableColumnFlags_WidthStretch,0.05f); // dt2
-                  }
-                  ImGui::TableSetupColumn("c15",ImGuiTableColumnFlags_WidthFixed); // am
+            ImGui::BeginDisabled(!willDisplayOps);
+            if (settings.fmLayout==0) {
+              int numCols=15;
+              if (ins->type==DIV_INS_OPL ||ins->type==DIV_INS_OPL_DRUMS) numCols=13;
+              if (ins->type==DIV_INS_OPLL) numCols=12;
+              if (ins->type==DIV_INS_OPZ) numCols=19;
+              if (ImGui::BeginTable("FMOperators",numCols,ImGuiTableFlags_SizingStretchProp|ImGuiTableFlags_BordersH|ImGuiTableFlags_BordersOuterV)) {
+                // configure columns
+                ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed); // op name
+                ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,0.05f); // ar
+                ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch,0.05f); // dr
+                ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthStretch,0.05f); // sl
+                if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                  ImGui::TableSetupColumn("c4",ImGuiTableColumnFlags_WidthStretch,0.05f); // d2r
+                }
+                ImGui::TableSetupColumn("c5",ImGuiTableColumnFlags_WidthStretch,0.05f); // rr
+                ImGui::TableSetupColumn("c6",ImGuiTableColumnFlags_WidthFixed); // -separator-
+                ImGui::TableSetupColumn("c7",ImGuiTableColumnFlags_WidthStretch,0.05f); // tl
+                ImGui::TableSetupColumn("c8",ImGuiTableColumnFlags_WidthStretch,0.05f); // rs/ksl
+                if (ins->type==DIV_INS_OPZ) {
+                  ImGui::TableSetupColumn("c8z0",ImGuiTableColumnFlags_WidthStretch,0.05f); // egs
+                  ImGui::TableSetupColumn("c8z1",ImGuiTableColumnFlags_WidthStretch,0.05f); // rev
+                }
+                ImGui::TableSetupColumn("c9",ImGuiTableColumnFlags_WidthStretch,0.05f); // mult
 
-                  ImGui::TableSetupColumn("c12",ImGuiTableColumnFlags_WidthFixed); // -separator-
-                  if (ins->type!=DIV_INS_OPLL && ins->type!=DIV_INS_OPM) {
-                    ImGui::TableSetupColumn("c13",ImGuiTableColumnFlags_WidthStretch,0.2f); // ssg/waveform
-                  }
-                  ImGui::TableSetupColumn("c14",ImGuiTableColumnFlags_WidthStretch,0.3f); // env
+                if (ins->type==DIV_INS_OPZ) {
+                  ImGui::TableSetupColumn("c9z",ImGuiTableColumnFlags_WidthStretch,0.05f); // fine
+                }
 
-                  // header
-                  ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+                if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                  ImGui::TableSetupColumn("c10",ImGuiTableColumnFlags_WidthStretch,0.05f); // dt
+                }
+                if (ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                  ImGui::TableSetupColumn("c11",ImGuiTableColumnFlags_WidthStretch,0.05f); // dt2
+                }
+                ImGui::TableSetupColumn("c15",ImGuiTableColumnFlags_WidthFixed); // am
+
+                ImGui::TableSetupColumn("c12",ImGuiTableColumnFlags_WidthFixed); // -separator-
+                if (ins->type!=DIV_INS_OPLL && ins->type!=DIV_INS_OPM) {
+                  ImGui::TableSetupColumn("c13",ImGuiTableColumnFlags_WidthStretch,0.2f); // ssg/waveform
+                }
+                ImGui::TableSetupColumn("c14",ImGuiTableColumnFlags_WidthStretch,0.3f); // env
+
+                // header
+                ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+                ImGui::TableNextColumn();
+
+                ImGui::TableNextColumn();
+                CENTER_TEXT(FM_SHORT_NAME(FM_AR));
+                ImGui::TextUnformatted(FM_SHORT_NAME(FM_AR));
+                TOOLTIP_TEXT(FM_NAME(FM_AR));
+                ImGui::TableNextColumn();
+                CENTER_TEXT(FM_SHORT_NAME(FM_DR));
+                ImGui::TextUnformatted(FM_SHORT_NAME(FM_DR));
+                TOOLTIP_TEXT(FM_NAME(FM_DR));
+                if (settings.susPosition==0) {
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_SHORT_NAME(FM_SL));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_SL));
+                  TOOLTIP_TEXT(FM_NAME(FM_SL));
+                }
+                if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_SHORT_NAME(FM_D2R));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_D2R));
+                  TOOLTIP_TEXT(FM_NAME(FM_D2R));
+                }
+                ImGui::TableNextColumn();
+                CENTER_TEXT(FM_SHORT_NAME(FM_RR));
+                ImGui::TextUnformatted(FM_SHORT_NAME(FM_RR));
+                TOOLTIP_TEXT(FM_NAME(FM_RR));
+                if (settings.susPosition==1) {
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_SHORT_NAME(FM_SL));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_SL));
+                  TOOLTIP_TEXT(FM_NAME(FM_SL));
+                }
+                ImGui::TableNextColumn();
+                ImGui::TableNextColumn();
+                CENTER_TEXT(FM_SHORT_NAME(FM_TL));
+                ImGui::TextUnformatted(FM_SHORT_NAME(FM_TL));
+                TOOLTIP_TEXT(FM_NAME(FM_TL));
+                ImGui::TableNextColumn();
+                if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                  CENTER_TEXT(FM_SHORT_NAME(FM_RS));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_RS));
+                  TOOLTIP_TEXT(FM_NAME(FM_RS));
+                } else {
+                  CENTER_TEXT(FM_SHORT_NAME(FM_KSL));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_KSL));
+                  TOOLTIP_TEXT(FM_NAME(FM_KSL));
+                }
+                if (ins->type==DIV_INS_OPZ) {
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_SHORT_NAME(FM_EGSHIFT));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_EGSHIFT));
+                  TOOLTIP_TEXT(FM_NAME(FM_EGSHIFT));
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_SHORT_NAME(FM_REV));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_REV));
+                  TOOLTIP_TEXT(FM_NAME(FM_REV));
+                }
+                ImGui::TableNextColumn();
+                CENTER_TEXT(FM_SHORT_NAME(FM_MULT));
+                ImGui::TextUnformatted(FM_SHORT_NAME(FM_MULT));
+                TOOLTIP_TEXT(FM_NAME(FM_MULT));
+                if (ins->type==DIV_INS_OPZ) {
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_SHORT_NAME(FM_FINE));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_FINE));
+                  TOOLTIP_TEXT(FM_NAME(FM_FINE));
+                }
+                ImGui::TableNextColumn();
+                if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                  CENTER_TEXT(FM_SHORT_NAME(FM_DT));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_DT));
+                  TOOLTIP_TEXT(FM_NAME(FM_DT));
+                  ImGui::TableNextColumn();
+                }
+                if (ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                  CENTER_TEXT(FM_SHORT_NAME(FM_DT2));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_DT2));
+                  TOOLTIP_TEXT(FM_NAME(FM_DT2));
+                  ImGui::TableNextColumn();
+                }
+                if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPM) {
+                  CENTER_TEXT(FM_SHORT_NAME(FM_AM));
+                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_AM));
+                  TOOLTIP_TEXT(FM_NAME(FM_AM));
+                } else {
+                  CENTER_TEXT("Other");
+                  ImGui::TextUnformatted("Other");
+                }
+                ImGui::TableNextColumn();
+                if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPZ) {
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_NAME(FM_WS));
+                  ImGui::TextUnformatted(FM_NAME(FM_WS));
+                } else if (ins->type!=DIV_INS_OPLL && ins->type!=DIV_INS_OPM) {
+                  ImGui::TableNextColumn();
+                  CENTER_TEXT(FM_NAME(FM_SSG));
+                  ImGui::TextUnformatted(FM_NAME(FM_SSG));
+                }
+                ImGui::TableNextColumn();
+                CENTER_TEXT("Envelope");
+                ImGui::TextUnformatted("Envelope");
+
+                float sliderHeight=32.0f*dpiScale;
+
+                for (int i=0; i<opCount; i++) {
+                  DivInstrumentFM::Operator& op=fmOrigin.op[(opCount==4 && ins->type!=DIV_INS_OPL_DRUMS)?opOrder[i]:i];
+                  ImGui::TableNextRow();
                   ImGui::TableNextColumn();
 
-                  ImGui::TableNextColumn();
-                  CENTER_TEXT(FM_SHORT_NAME(FM_AR));
-                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_AR));
-                  TOOLTIP_TEXT(FM_NAME(FM_AR));
-                  ImGui::TableNextColumn();
-                  CENTER_TEXT(FM_SHORT_NAME(FM_DR));
-                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_DR));
-                  TOOLTIP_TEXT(FM_NAME(FM_DR));
-                  if (settings.susPosition==0) {
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_SHORT_NAME(FM_SL));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_SL));
-                    TOOLTIP_TEXT(FM_NAME(FM_SL));
-                  }
-                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_SHORT_NAME(FM_D2R));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_D2R));
-                    TOOLTIP_TEXT(FM_NAME(FM_D2R));
-                  }
-                  ImGui::TableNextColumn();
-                  CENTER_TEXT(FM_SHORT_NAME(FM_RR));
-                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_RR));
-                  TOOLTIP_TEXT(FM_NAME(FM_RR));
-                  if (settings.susPosition==1) {
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_SHORT_NAME(FM_SL));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_SL));
-                    TOOLTIP_TEXT(FM_NAME(FM_SL));
-                  }
-                  ImGui::TableNextColumn();
-                  ImGui::TableNextColumn();
-                  CENTER_TEXT(FM_SHORT_NAME(FM_TL));
-                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_TL));
-                  TOOLTIP_TEXT(FM_NAME(FM_TL));
-                  ImGui::TableNextColumn();
-                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                    CENTER_TEXT(FM_SHORT_NAME(FM_RS));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_RS));
-                    TOOLTIP_TEXT(FM_NAME(FM_RS));
-                  } else {
-                    CENTER_TEXT(FM_SHORT_NAME(FM_KSL));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_KSL));
-                    TOOLTIP_TEXT(FM_NAME(FM_KSL));
-                  }
-                  if (ins->type==DIV_INS_OPZ) {
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_SHORT_NAME(FM_EGSHIFT));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_EGSHIFT));
-                    TOOLTIP_TEXT(FM_NAME(FM_EGSHIFT));
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_SHORT_NAME(FM_REV));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_REV));
-                    TOOLTIP_TEXT(FM_NAME(FM_REV));
-                  }
-                  ImGui::TableNextColumn();
-                  CENTER_TEXT(FM_SHORT_NAME(FM_MULT));
-                  ImGui::TextUnformatted(FM_SHORT_NAME(FM_MULT));
-                  TOOLTIP_TEXT(FM_NAME(FM_MULT));
-                  if (ins->type==DIV_INS_OPZ) {
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_SHORT_NAME(FM_FINE));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_FINE));
-                    TOOLTIP_TEXT(FM_NAME(FM_FINE));
-                  }
-                  ImGui::TableNextColumn();
-                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                    CENTER_TEXT(FM_SHORT_NAME(FM_DT));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_DT));
-                    TOOLTIP_TEXT(FM_NAME(FM_DT));
-                    ImGui::TableNextColumn();
-                  }
-                  if (ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                    CENTER_TEXT(FM_SHORT_NAME(FM_DT2));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_DT2));
-                    TOOLTIP_TEXT(FM_NAME(FM_DT2));
-                    ImGui::TableNextColumn();
-                  }
-                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPM) {
-                    CENTER_TEXT(FM_SHORT_NAME(FM_AM));
-                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_AM));
-                    TOOLTIP_TEXT(FM_NAME(FM_AM));
-                  } else {
-                    CENTER_TEXT("Other");
-                    ImGui::TextUnformatted("Other");
-                  }
-                  ImGui::TableNextColumn();
-                  if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPZ) {
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_NAME(FM_WS));
-                    ImGui::TextUnformatted(FM_NAME(FM_WS));
-                  } else if (ins->type!=DIV_INS_OPLL && ins->type!=DIV_INS_OPM) {
-                    ImGui::TableNextColumn();
-                    CENTER_TEXT(FM_NAME(FM_SSG));
-                    ImGui::TextUnformatted(FM_NAME(FM_SSG));
-                  }
-                  ImGui::TableNextColumn();
-                  CENTER_TEXT("Envelope");
-                  ImGui::TextUnformatted("Envelope");
-
-                  float sliderHeight=32.0f*dpiScale;
-
-                  for (int i=0; i<opCount; i++) {
-                    DivInstrumentFM::Operator& op=ins->fm.op[(opCount==4 && ins->type!=DIV_INS_OPL_DRUMS)?opOrder[i]:i];
-                    ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-
-                    // push colors
-                    if (settings.separateFMColors) {
-                      bool mod=true;
-                      if (ins->type==DIV_INS_OPL_DRUMS) {
-                        mod=false;
-                      } else if (opCount==4) {
-                        if (ins->type==DIV_INS_OPL) {
-                          if (opIsOutputOPL[ins->fm.alg&3][i]) mod=false;
-                        } else {
-                          if (opIsOutput[ins->fm.alg&7][i]) mod=false;
-                        }
-                      } else {
-                        if (i==1 || (ins->type==DIV_INS_OPL && (ins->fm.alg&1))) mod=false;
-                      }
-                      if (mod) {
-                        pushAccentColors(
-                          uiColors[GUI_COLOR_FM_PRIMARY_MOD],
-                          uiColors[GUI_COLOR_FM_SECONDARY_MOD],
-                          uiColors[GUI_COLOR_FM_BORDER_MOD],
-                          uiColors[GUI_COLOR_FM_BORDER_SHADOW_MOD]
-                        );
-                      } else {
-                        pushAccentColors(
-                          uiColors[GUI_COLOR_FM_PRIMARY_CAR],
-                          uiColors[GUI_COLOR_FM_SECONDARY_CAR],
-                          uiColors[GUI_COLOR_FM_BORDER_CAR],
-                          uiColors[GUI_COLOR_FM_BORDER_SHADOW_CAR]
-                        );
-                      }
-                    }
-
-                    if (i==0) sliderHeight=(ImGui::GetContentRegionAvail().y/opCount)-ImGui::GetStyle().ItemSpacing.y;
-
-                    ImGui::PushID(fmt::sprintf("op%d",i).c_str());
-                    String opNameLabel;
+                  // push colors
+                  if (settings.separateFMColors) {
+                    bool mod=true;
                     if (ins->type==DIV_INS_OPL_DRUMS) {
-                      opNameLabel=fmt::sprintf("%s",oplDrumNames[i]);
-                    } else if (ins->type==DIV_INS_OPL && ins->fm.opllPreset==16) {
-                      if (i==1) {
-                        opNameLabel="Kick";
+                      mod=false;
+                    } else if (opCount==4) {
+                      if (ins->type==DIV_INS_OPL) {
+                        if (opIsOutputOPL[fmOrigin.alg&3][i]) mod=false;
                       } else {
-                        opNameLabel="Env";
+                        if (opIsOutput[fmOrigin.alg&7][i]) mod=false;
                       }
                     } else {
-                      opNameLabel=fmt::sprintf("OP%d",i+1);
+                      if (i==1 || (ins->type==DIV_INS_OPL && (fmOrigin.alg&1))) mod=false;
                     }
-                    if (opsAreMutable) {
-                      pushToggleColors(op.enable);
-                      if (ImGui::Button(opNameLabel.c_str())) {
-                        op.enable=!op.enable;
-                        PARAMETER;
-                      }
-                      popToggleColors();
+                    if (mod) {
+                      pushAccentColors(
+                        uiColors[GUI_COLOR_FM_PRIMARY_MOD],
+                        uiColors[GUI_COLOR_FM_SECONDARY_MOD],
+                        uiColors[GUI_COLOR_FM_BORDER_MOD],
+                        uiColors[GUI_COLOR_FM_BORDER_SHADOW_MOD]
+                      );
                     } else {
-                      ImGui::TextUnformatted(opNameLabel.c_str());
+                      pushAccentColors(
+                        uiColors[GUI_COLOR_FM_PRIMARY_CAR],
+                        uiColors[GUI_COLOR_FM_SECONDARY_CAR],
+                        uiColors[GUI_COLOR_FM_BORDER_CAR],
+                        uiColors[GUI_COLOR_FM_BORDER_SHADOW_CAR]
+                      );
                     }
-                    
-                    // drag point
-                    OP_DRAG_POINT;
+                  }
 
-                    int maxTl=127;
-                    if (ins->type==DIV_INS_OPLL) {
-                      if (i==1) {
-                        maxTl=15;
-                      } else {
-                        maxTl=63;
-                      }
+                  if (i==0) sliderHeight=(ImGui::GetContentRegionAvail().y/opCount)-ImGui::GetStyle().ItemSpacing.y;
+
+                  ImGui::PushID(fmt::sprintf("op%d",i).c_str());
+                  String opNameLabel;
+                  if (ins->type==DIV_INS_OPL_DRUMS) {
+                    opNameLabel=fmt::sprintf("%s",oplDrumNames[i]);
+                  } else if (ins->type==DIV_INS_OPL && fmOrigin.opllPreset==16) {
+                    if (i==1) {
+                      opNameLabel="Kick";
+                    } else {
+                      opNameLabel="Env";
                     }
-                    if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
+                  } else {
+                    opNameLabel=fmt::sprintf("OP%d",i+1);
+                  }
+                  if (opsAreMutable) {
+                    pushToggleColors(op.enable);
+                    if (ImGui::Button(opNameLabel.c_str())) {
+                      op.enable=!op.enable;
+                      PARAMETER;
+                    }
+                    popToggleColors();
+                  } else {
+                    ImGui::TextUnformatted(opNameLabel.c_str());
+                  }
+                  
+                  // drag point
+                  OP_DRAG_POINT;
+
+                  int maxTl=127;
+                  if (ins->type==DIV_INS_OPLL) {
+                    if (i==1) {
+                      maxTl=15;
+                    } else {
                       maxTl=63;
                     }
-                    int maxArDr=(ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM)?31:15;
-                    bool ssgOn=op.ssgEnv&8;
-                    bool ksrOn=op.ksr;
-                    bool vibOn=op.vib;
-                    bool susOn=op.sus;
-                    unsigned char ssgEnv=op.ssgEnv&7;
+                  }
+                  if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
+                    maxTl=63;
+                  }
+                  int maxArDr=(ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM)?31:15;
+                  bool ssgOn=op.ssgEnv&8;
+                  bool ksrOn=op.ksr;
+                  bool vibOn=op.vib;
+                  bool susOn=op.sus;
+                  unsigned char ssgEnv=op.ssgEnv&7;
+
+                  ImGui::TableNextColumn();
+                  op.ar&=maxArDr;
+                  CENTER_VSLIDER;
+                  P(CWVSliderScalar("##AR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ar,&maxArDr,&_ZERO));
+
+                  ImGui::TableNextColumn();
+                  op.dr&=maxArDr;
+                  CENTER_VSLIDER;
+                  P(CWVSliderScalar("##DR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dr,&maxArDr,&_ZERO));
+
+                  if (settings.susPosition==0) {
+                    ImGui::TableNextColumn();
+                    op.sl&=15;
+                    CENTER_VSLIDER;
+                    P(CWVSliderScalar("##SL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO));
+                  }
+
+                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                    ImGui::TableNextColumn();
+                    op.d2r&=31;
+                    CENTER_VSLIDER;
+                    P(CWVSliderScalar("##D2R",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.d2r,&_THIRTY_ONE,&_ZERO));
+                  }
+
+                  ImGui::TableNextColumn();
+                  op.rr&=15;
+                  CENTER_VSLIDER;
+                  P(CWVSliderScalar("##RR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.rr,&_FIFTEEN,&_ZERO));
+
+                  if (settings.susPosition==1) {
+                    ImGui::TableNextColumn();
+                    op.sl&=15;
+                    CENTER_VSLIDER;
+                    P(CWVSliderScalar("##SL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO));
+                  }
+
+                  ImGui::TableNextColumn();
+                  ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
+
+                  ImGui::TableNextColumn();
+                  op.tl&=maxTl;
+                  CENTER_VSLIDER;
+                  P(CWVSliderScalar("##TL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.tl,&maxTl,&_ZERO));
+
+                  ImGui::TableNextColumn();
+                  CENTER_VSLIDER;
+                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                    P(CWVSliderScalar("##RS",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE));
+                  } else {
+                    P(CWVSliderScalar("##KSL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE));
+                  }
+
+                  if (ins->type==DIV_INS_OPZ) {
+                    ImGui::TableNextColumn();
+                    CENTER_VSLIDER;
+                    P(CWVSliderScalar("##EGS",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE));
 
                     ImGui::TableNextColumn();
-                    op.ar&=maxArDr;
                     CENTER_VSLIDER;
+                    P(CWVSliderScalar("##REV",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dam,&_ZERO,&_SEVEN));
+                  }
+
+                  ImGui::TableNextColumn();
+                  CENTER_VSLIDER;
+                  P(CWVSliderScalar("##MULT",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN));
+
+                  if (ins->type==DIV_INS_OPZ) {
+                    ImGui::TableNextColumn();
+                    CENTER_VSLIDER;
+                    P(CWVSliderScalar("##FINE",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN));
+                  }
+
+                  if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                    int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
+                    ImGui::TableNextColumn();
+                    CENTER_VSLIDER;
+                    if (CWVSliderInt("##DT",ImVec2(20.0f*dpiScale,sliderHeight),&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4)) { PARAMETER
+                      if (detune<-3) detune=-3;
+                      if (detune>7) detune=7;
+                      op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
+                    }
+
+                    if (ins->type!=DIV_INS_FM) {
+                      ImGui::TableNextColumn();
+                      CENTER_VSLIDER;
+                      P(CWVSliderScalar("##DT2",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE)); rightClickable
+                    }
+
+                    ImGui::TableNextColumn();
+                    bool amOn=op.am;
+                    if (ins->type==DIV_INS_OPZ) {
+                      bool egtOn=op.egt;
+                      if (egtOn) {
+                        ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*4.0-ImGui::GetStyle().ItemSpacing.y*3.0));
+                      } else {
+                        ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*2.0-ImGui::GetStyle().ItemSpacing.y*1.0));
+                      }
+                      if (ImGui::Checkbox("AM",&amOn)) { PARAMETER
+                        op.am=amOn;
+                      }
+                      if (ImGui::Checkbox("Fixed",&egtOn)) { PARAMETER
+                        op.egt=egtOn;
+                      }
+                      if (egtOn) {
+                        int block=op.dt;
+                        int freqNum=(op.mult<<4)|(op.dvb&15);
+                        if (ImGui::InputInt("Block",&block,1,1)) {
+                          if (block<0) block=0;
+                          if (block>7) block=7;
+                          op.dt=block;
+                        }
+                        if (ImGui::InputInt("FreqNum",&freqNum,1,16)) {
+                          if (freqNum<0) freqNum=0;
+                          if (freqNum>255) freqNum=255;
+                          op.mult=freqNum>>4;
+                          op.dvb=freqNum&15;
+                        }
+                      }
+                    } else {
+                      ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()));
+                      if (ImGui::Checkbox("##AM",&amOn)) { PARAMETER
+                        op.am=amOn;
+                      }
+                    }
+
+                    if (ins->type!=DIV_INS_OPL && ins->type!=DIV_INS_OPL_DRUMS && ins->type!=DIV_INS_OPZ && ins->type!=DIV_INS_OPM) {
+                      ImGui::TableNextColumn();
+                      ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
+                      ImGui::TableNextColumn();
+                      ImGui::BeginDisabled(!ssgOn);
+                      drawSSGEnv(op.ssgEnv&7,ImVec2(ImGui::GetContentRegionAvail().x,sliderHeight-ImGui::GetFrameHeightWithSpacing()));
+                      ImGui::EndDisabled();
+                      if (ImGui::Checkbox("##SSGOn",&ssgOn)) { PARAMETER
+                        op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
+                      }
+
+                      ImGui::SameLine();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      if (CWSliderScalar("##SSG",ImGuiDataType_U8,&ssgEnv,&_ZERO,&_SEVEN,ssgEnvTypes[ssgEnv])) { PARAMETER
+                        op.ssgEnv=(op.ssgEnv&8)|(ssgEnv&7);
+                      }
+                    }
+                  } else if (ins->type!=DIV_INS_OPM) {
+                    ImGui::TableNextColumn();
+                    bool amOn=op.am;
+                    ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*4.0-ImGui::GetStyle().ItemSpacing.y*3.0));
+                    if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
+                      op.am=amOn;
+                    }
+                    if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
+                      op.vib=vibOn;
+                    }
+                    if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
+                      op.ksr=ksrOn;
+                    }
+                    if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
+                      if (ImGui::Checkbox(FM_NAME(FM_SUS),&susOn)) { PARAMETER
+                        op.sus=susOn;
+                      }
+                    } else if (ins->type==DIV_INS_OPLL) {
+                      if (ImGui::Checkbox(FM_NAME(FM_EGS),&ssgOn)) { PARAMETER
+                        op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
+                      }
+                    }
+                  }
+
+                  if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPZ) {
+                    ImGui::TableNextColumn();
+                    ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
+                    ImGui::TableNextColumn();
+
+                    drawWaveform(op.ws&7,ins->type==DIV_INS_OPZ,ImVec2(ImGui::GetContentRegionAvail().x,sliderHeight-ImGui::GetFrameHeightWithSpacing()));
+                    ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                    P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
+                    if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
+                      ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
+                    }
+                  } else if (ins->type==DIV_INS_OPLL || ins->type==DIV_INS_OPM) {
+                    ImGui::TableNextColumn();
+                    ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
+                  }
+
+                  ImGui::TableNextColumn();
+                  drawFMEnv(op.tl&maxTl,op.ar&maxArDr,op.dr&maxArDr,(ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPLL)?((op.rr&15)*2):op.d2r&31,op.rr&15,op.sl&15,op.sus,op.ssgEnv&8,fmOrigin.alg,maxTl,maxArDr,15,ImVec2(ImGui::GetContentRegionAvail().x,sliderHeight),ins->type);
+
+                  if (settings.separateFMColors) {
+                    popAccentColors();
+                  }
+
+                  ImGui::PopID();
+                }
+
+                ImGui::EndTable();
+              }
+            } else if (settings.fmLayout>=4 && settings.fmLayout<=6) { // alternate
+              int columns=2;
+              switch (settings.fmLayout) {
+                case 4: // 2x2
+                  columns=2;
+                  break;
+                case 5: // 1x4
+                  columns=1;
+                  break;
+                case 6: // 4x1
+                  columns=opCount;
+                  break;
+              }
+              char tempID[1024];
+              ImVec2 oldPadding=ImGui::GetStyle().CellPadding;
+              ImGui::PushStyleVar(ImGuiStyleVar_CellPadding,ImVec2(8.0f*dpiScale,4.0f*dpiScale));
+              if (ImGui::BeginTable("AltFMOperators",columns,ImGuiTableFlags_SizingStretchSame|ImGuiTableFlags_BordersInner)) {
+                for (int i=0; i<opCount; i++) {
+                  DivInstrumentFM::Operator& op=fmOrigin.op[(opCount==4 && ins->type!=DIV_INS_OPL_DRUMS)?opOrder[i]:i];
+                  if ((settings.fmLayout!=6 && ((i+1)&1)) || i==0 || settings.fmLayout==5) ImGui::TableNextRow();
+                  ImGui::TableNextColumn();
+                  ImGui::PushID(fmt::sprintf("op%d",i).c_str());
+
+                  // push colors
+                  if (settings.separateFMColors) {
+                    bool mod=true;
+                    if (ins->type==DIV_INS_OPL_DRUMS) {
+                      mod=false;
+                    } else if (opCount==4) {
+                      if (ins->type==DIV_INS_OPL) {
+                        if (opIsOutputOPL[fmOrigin.alg&3][i]) mod=false;
+                      } else {
+                        if (opIsOutput[fmOrigin.alg&7][i]) mod=false;
+                      }
+                    } else {
+                      if (i==1 || (ins->type==DIV_INS_OPL && (fmOrigin.alg&1))) mod=false;
+                    }
+                    if (mod) {
+                      pushAccentColors(
+                        uiColors[GUI_COLOR_FM_PRIMARY_MOD],
+                        uiColors[GUI_COLOR_FM_SECONDARY_MOD],
+                        uiColors[GUI_COLOR_FM_BORDER_MOD],
+                        uiColors[GUI_COLOR_FM_BORDER_SHADOW_MOD]
+                      );
+                    } else {
+                      pushAccentColors(
+                        uiColors[GUI_COLOR_FM_PRIMARY_CAR],
+                        uiColors[GUI_COLOR_FM_SECONDARY_CAR],
+                        uiColors[GUI_COLOR_FM_BORDER_CAR],
+                        uiColors[GUI_COLOR_FM_BORDER_SHADOW_CAR]
+                      );
+                    }
+                  }
+
+                  ImGui::Dummy(ImVec2(dpiScale,dpiScale));
+                  if (ins->type==DIV_INS_OPL_DRUMS) {
+                    snprintf(tempID,1024,"%s",oplDrumNames[i]);
+                  } else if (ins->type==DIV_INS_OPL && fmOrigin.opllPreset==16) {
+                    if (i==1) {
+                      snprintf(tempID,1024,"Envelope 2 (kick only)");
+                    } else {
+                      snprintf(tempID,1024,"Envelope");
+                    }
+                  } else {
+                    snprintf(tempID,1024,"Operator %d",i+1);
+                  }
+                  float nextCursorPosX=ImGui::GetCursorPosX()+0.5*(ImGui::GetContentRegionAvail().x-ImGui::CalcTextSize(tempID).x-(opsAreMutable?(ImGui::GetStyle().FramePadding.x*2.0f):0.0f));
+                  OP_DRAG_POINT;
+                  ImGui::SameLine();
+                  ImGui::SetCursorPosX(nextCursorPosX);
+                  if (opsAreMutable) {
+                    pushToggleColors(op.enable);
+                    if (ImGui::Button(tempID)) {
+                      op.enable=!op.enable;
+                      PARAMETER;
+                    }
+                    popToggleColors();
+                  } else {
+                    ImGui::TextUnformatted(tempID);
+                  }
+
+                  float sliderHeight=200.0f*dpiScale;
+                  float waveWidth=140.0*dpiScale;
+                  float waveHeight=sliderHeight-ImGui::GetFrameHeightWithSpacing()*((ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPL)?5.0f:4.5f);
+
+                  int maxTl=127;
+                  if (ins->type==DIV_INS_OPLL) {
+                    if (i==1) {
+                      maxTl=15;
+                    } else {
+                      maxTl=63;
+                    }
+                  }
+                  if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
+                    maxTl=63;
+                  }
+                  int maxArDr=(ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM)?31:15;
+
+                  bool ssgOn=op.ssgEnv&8;
+                  bool ksrOn=op.ksr;
+                  bool vibOn=op.vib;
+                  bool egtOn=op.egt;
+                  bool susOn=op.sus; // yawn
+                  unsigned char ssgEnv=op.ssgEnv&7;
+
+                  ImGui::PushStyleVar(ImGuiStyleVar_CellPadding,oldPadding);
+                  if (ImGui::BeginTable("opParams",4,ImGuiTableFlags_BordersInnerV)) {
+                    ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed);
+                    ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,waveWidth);
+                    ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch);
+                    ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed);
+
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+                    float textY=ImGui::GetCursorPosY();
+                    CENTER_TEXT_20(FM_SHORT_NAME(FM_AR));
+                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_AR));
+                    TOOLTIP_TEXT(FM_NAME(FM_AR));
+                    ImGui::TableNextColumn();
+                    if (ins->type==DIV_INS_FM) {
+                      ImGui::Text("SSG-EG");
+                    } else {
+                      ImGui::Text("Waveform");
+                    }
+                    ImGui::TableNextColumn();
+                    ImGui::Text("Envelope");
+                    ImGui::TableNextColumn();
+                    CENTER_TEXT(FM_SHORT_NAME(FM_TL));
+                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_TL));
+                    TOOLTIP_TEXT(FM_NAME(FM_TL));
+
+                    // A/D/S/R
+                    ImGui::TableNextColumn();
+
+                    op.ar&=maxArDr;
                     P(CWVSliderScalar("##AR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ar,&maxArDr,&_ZERO));
 
-                    ImGui::TableNextColumn();
+                    ImGui::SameLine();
                     op.dr&=maxArDr;
-                    CENTER_VSLIDER;
+                    float textX_DR=ImGui::GetCursorPosX();
                     P(CWVSliderScalar("##DR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dr,&maxArDr,&_ZERO));
 
+                    float textX_SL=0.0f;
                     if (settings.susPosition==0) {
-                      ImGui::TableNextColumn();
+                      ImGui::SameLine();
                       op.sl&=15;
-                      CENTER_VSLIDER;
+                      textX_SL=ImGui::GetCursorPosX();
                       P(CWVSliderScalar("##SL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO));
                     }
 
+                    float textX_D2R=0.0f;
                     if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                      ImGui::TableNextColumn();
+                      ImGui::SameLine();
                       op.d2r&=31;
-                      CENTER_VSLIDER;
+                      textX_D2R=ImGui::GetCursorPosX();
                       P(CWVSliderScalar("##D2R",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.d2r,&_THIRTY_ONE,&_ZERO));
                     }
 
-                    ImGui::TableNextColumn();
+                    ImGui::SameLine();
                     op.rr&=15;
-                    CENTER_VSLIDER;
+                    float textX_RR=ImGui::GetCursorPosX();
                     P(CWVSliderScalar("##RR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.rr,&_FIFTEEN,&_ZERO));
 
                     if (settings.susPosition==1) {
-                      ImGui::TableNextColumn();
+                      ImGui::SameLine();
                       op.sl&=15;
-                      CENTER_VSLIDER;
+                      textX_SL=ImGui::GetCursorPosX();
                       P(CWVSliderScalar("##SL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO));
                     }
 
-                    ImGui::TableNextColumn();
-                    ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
+                    ImVec2 prevCurPos=ImGui::GetCursorPos();
+                    
+                    // labels
+                    ImGui::SetCursorPos(ImVec2(textX_DR,textY));
+                    CENTER_TEXT_20(FM_SHORT_NAME(FM_DR));
+                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_DR));
+                    TOOLTIP_TEXT(FM_NAME(FM_DR));
 
-                    ImGui::TableNextColumn();
-                    op.tl&=maxTl;
-                    CENTER_VSLIDER;
-                    P(CWVSliderScalar("##TL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.tl,&maxTl,&_ZERO));
+                    ImGui::SetCursorPos(ImVec2(textX_SL,textY));
+                    CENTER_TEXT_20(FM_SHORT_NAME(FM_SL));
+                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_SL));
+                    TOOLTIP_TEXT(FM_NAME(FM_SL));
 
-                    ImGui::TableNextColumn();
-                    CENTER_VSLIDER;
-                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                      P(CWVSliderScalar("##RS",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE));
-                    } else {
-                      P(CWVSliderScalar("##KSL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE));
-                    }
-
-                    if (ins->type==DIV_INS_OPZ) {
-                      ImGui::TableNextColumn();
-                      CENTER_VSLIDER;
-                      P(CWVSliderScalar("##EGS",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE));
-
-                      ImGui::TableNextColumn();
-                      CENTER_VSLIDER;
-                      P(CWVSliderScalar("##REV",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dam,&_ZERO,&_SEVEN));
-                    }
-
-                    ImGui::TableNextColumn();
-                    CENTER_VSLIDER;
-                    P(CWVSliderScalar("##MULT",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN));
-
-                    if (ins->type==DIV_INS_OPZ) {
-                      ImGui::TableNextColumn();
-                      CENTER_VSLIDER;
-                      P(CWVSliderScalar("##FINE",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN));
-                    }
+                    ImGui::SetCursorPos(ImVec2(textX_RR,textY));
+                    CENTER_TEXT_20(FM_SHORT_NAME(FM_RR));
+                    ImGui::TextUnformatted(FM_SHORT_NAME(FM_RR));
+                    TOOLTIP_TEXT(FM_NAME(FM_RR));
 
                     if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                      int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
-                      ImGui::TableNextColumn();
-                      CENTER_VSLIDER;
-                      if (CWVSliderInt("##DT",ImVec2(20.0f*dpiScale,sliderHeight),&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4)) { PARAMETER
-                        if (detune<-3) detune=-3;
-                        if (detune>7) detune=7;
-                        op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
-                      }
+                      ImGui::SetCursorPos(ImVec2(textX_D2R,textY));
+                      CENTER_TEXT_20(FM_SHORT_NAME(FM_D2R));
+                      ImGui::TextUnformatted(FM_SHORT_NAME(FM_D2R));
+                      TOOLTIP_TEXT(FM_NAME(FM_D2R));
+                    }
 
-                      if (ins->type!=DIV_INS_FM) {
-                        ImGui::TableNextColumn();
-                        CENTER_VSLIDER;
-                        P(CWVSliderScalar("##DT2",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE)); rightClickable
-                      }
-
-                      ImGui::TableNextColumn();
-                      bool amOn=op.am;
-                      if (ins->type==DIV_INS_OPZ) {
-                        bool egtOn=op.egt;
-                        if (egtOn) {
-                          ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*4.0-ImGui::GetStyle().ItemSpacing.y*3.0));
-                        } else {
-                          ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*2.0-ImGui::GetStyle().ItemSpacing.y*1.0));
-                        }
-                        if (ImGui::Checkbox("AM",&amOn)) { PARAMETER
-                          op.am=amOn;
-                        }
-                        if (ImGui::Checkbox("Fixed",&egtOn)) { PARAMETER
-                          op.egt=egtOn;
-                        }
-                        if (egtOn) {
-                          int block=op.dt;
-                          int freqNum=(op.mult<<4)|(op.dvb&15);
-                          if (ImGui::InputInt("Block",&block,1,1)) {
-                            if (block<0) block=0;
-                            if (block>7) block=7;
-                            op.dt=block;
-                          }
-                          if (ImGui::InputInt("FreqNum",&freqNum,1,16)) {
-                            if (freqNum<0) freqNum=0;
-                            if (freqNum>255) freqNum=255;
-                            op.mult=freqNum>>4;
-                            op.dvb=freqNum&15;
-                          }
-                        }
-                      } else {
-                        ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()));
-                        if (ImGui::Checkbox("##AM",&amOn)) { PARAMETER
-                          op.am=amOn;
-                        }
-                      }
-
-                      if (ins->type!=DIV_INS_OPL && ins->type!=DIV_INS_OPL_DRUMS && ins->type!=DIV_INS_OPZ && ins->type!=DIV_INS_OPM) {
-                        ImGui::TableNextColumn();
-                        ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
-                        ImGui::TableNextColumn();
+                    ImGui::SetCursorPos(prevCurPos);
+                    
+                    ImGui::TableNextColumn();
+                    switch (ins->type) {
+                      case DIV_INS_FM: {
+                        // SSG
                         ImGui::BeginDisabled(!ssgOn);
-                        drawSSGEnv(op.ssgEnv&7,ImVec2(ImGui::GetContentRegionAvail().x,sliderHeight-ImGui::GetFrameHeightWithSpacing()));
+                        drawSSGEnv(op.ssgEnv&7,ImVec2(waveWidth,waveHeight));
                         ImGui::EndDisabled();
                         if (ImGui::Checkbox("##SSGOn",&ssgOn)) { PARAMETER
                           op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
@@ -2817,812 +3117,531 @@ void FurnaceGUI::drawInsEdit() {
                         if (CWSliderScalar("##SSG",ImGuiDataType_U8,&ssgEnv,&_ZERO,&_SEVEN,ssgEnvTypes[ssgEnv])) { PARAMETER
                           op.ssgEnv=(op.ssgEnv&8)|(ssgEnv&7);
                         }
-                      }
-                    } else if (ins->type!=DIV_INS_OPM) {
-                      ImGui::TableNextColumn();
-                      bool amOn=op.am;
-                      ImGui::SetCursorPosY(ImGui::GetCursorPosY()+0.5*(sliderHeight-ImGui::GetFrameHeight()*4.0-ImGui::GetStyle().ItemSpacing.y*3.0));
-                      if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
-                        op.am=amOn;
-                      }
-                      if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
-                        op.vib=vibOn;
-                      }
-                      if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
-                        op.ksr=ksrOn;
-                      }
-                      if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
-                        if (ImGui::Checkbox(FM_NAME(FM_SUS),&susOn)) { PARAMETER
-                          op.sus=susOn;
-                        }
-                      } else if (ins->type==DIV_INS_OPLL) {
-                        if (ImGui::Checkbox(FM_NAME(FM_EGS),&ssgOn)) { PARAMETER
-                          op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
-                        }
-                      }
-                    }
-
-                    if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPZ) {
-                      ImGui::TableNextColumn();
-                      ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
-                      ImGui::TableNextColumn();
-
-                      drawWaveform(op.ws&7,ins->type==DIV_INS_OPZ,ImVec2(ImGui::GetContentRegionAvail().x,sliderHeight-ImGui::GetFrameHeightWithSpacing()));
-                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                      P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
-                      if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
-                        ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
-                      }
-                    } else if (ins->type==DIV_INS_OPLL || ins->type==DIV_INS_OPM) {
-                      ImGui::TableNextColumn();
-                      ImGui::Dummy(ImVec2(4.0f*dpiScale,2.0f*dpiScale));
-                    }
-
-                    ImGui::TableNextColumn();
-                    drawFMEnv(op.tl&maxTl,op.ar&maxArDr,op.dr&maxArDr,(ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPLL)?((op.rr&15)*2):op.d2r&31,op.rr&15,op.sl&15,op.sus,op.ssgEnv&8,ins->fm.alg,maxTl,maxArDr,15,ImVec2(ImGui::GetContentRegionAvail().x,sliderHeight),ins->type);
-
-                    if (settings.separateFMColors) {
-                      popAccentColors();
-                    }
-
-                    ImGui::PopID();
-                  }
-
-                  ImGui::EndTable();
-                }
-              } else if (settings.fmLayout>=4 && settings.fmLayout<=6) { // alternate
-                int columns=2;
-                switch (settings.fmLayout) {
-                  case 4: // 2x2
-                    columns=2;
-                    break;
-                  case 5: // 1x4
-                    columns=1;
-                    break;
-                  case 6: // 4x1
-                    columns=opCount;
-                    break;
-                }
-                char tempID[1024];
-                ImVec2 oldPadding=ImGui::GetStyle().CellPadding;
-                ImGui::PushStyleVar(ImGuiStyleVar_CellPadding,ImVec2(8.0f*dpiScale,4.0f*dpiScale));
-                if (ImGui::BeginTable("AltFMOperators",columns,ImGuiTableFlags_SizingStretchSame|ImGuiTableFlags_BordersInner)) {
-                  for (int i=0; i<opCount; i++) {
-                    DivInstrumentFM::Operator& op=ins->fm.op[(opCount==4 && ins->type!=DIV_INS_OPL_DRUMS)?opOrder[i]:i];
-                    if ((settings.fmLayout!=6 && ((i+1)&1)) || i==0 || settings.fmLayout==5) ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::PushID(fmt::sprintf("op%d",i).c_str());
-
-                    // push colors
-                    if (settings.separateFMColors) {
-                      bool mod=true;
-                      if (ins->type==DIV_INS_OPL_DRUMS) {
-                        mod=false;
-                      } else if (opCount==4) {
-                        if (ins->type==DIV_INS_OPL) {
-                          if (opIsOutputOPL[ins->fm.alg&3][i]) mod=false;
-                        } else {
-                          if (opIsOutput[ins->fm.alg&7][i]) mod=false;
-                        }
-                      } else {
-                        if (i==1 || (ins->type==DIV_INS_OPL && (ins->fm.alg&1))) mod=false;
-                      }
-                      if (mod) {
-                        pushAccentColors(
-                          uiColors[GUI_COLOR_FM_PRIMARY_MOD],
-                          uiColors[GUI_COLOR_FM_SECONDARY_MOD],
-                          uiColors[GUI_COLOR_FM_BORDER_MOD],
-                          uiColors[GUI_COLOR_FM_BORDER_SHADOW_MOD]
-                        );
-                      } else {
-                        pushAccentColors(
-                          uiColors[GUI_COLOR_FM_PRIMARY_CAR],
-                          uiColors[GUI_COLOR_FM_SECONDARY_CAR],
-                          uiColors[GUI_COLOR_FM_BORDER_CAR],
-                          uiColors[GUI_COLOR_FM_BORDER_SHADOW_CAR]
-                        );
-                      }
-                    }
-
-                    ImGui::Dummy(ImVec2(dpiScale,dpiScale));
-                    if (ins->type==DIV_INS_OPL_DRUMS) {
-                      snprintf(tempID,1024,"%s",oplDrumNames[i]);
-                    } else if (ins->type==DIV_INS_OPL && ins->fm.opllPreset==16) {
-                      if (i==1) {
-                        snprintf(tempID,1024,"Envelope 2 (kick only)");
-                      } else {
-                        snprintf(tempID,1024,"Envelope");
-                      }
-                    } else {
-                      snprintf(tempID,1024,"Operator %d",i+1);
-                    }
-                    float nextCursorPosX=ImGui::GetCursorPosX()+0.5*(ImGui::GetContentRegionAvail().x-ImGui::CalcTextSize(tempID).x-(opsAreMutable?(ImGui::GetStyle().FramePadding.x*2.0f):0.0f));
-                    OP_DRAG_POINT;
-                    ImGui::SameLine();
-                    ImGui::SetCursorPosX(nextCursorPosX);
-                    if (opsAreMutable) {
-                      pushToggleColors(op.enable);
-                      if (ImGui::Button(tempID)) {
-                        op.enable=!op.enable;
-                        PARAMETER;
-                      }
-                      popToggleColors();
-                    } else {
-                      ImGui::TextUnformatted(tempID);
-                    }
-
-                    float sliderHeight=200.0f*dpiScale;
-                    float waveWidth=140.0*dpiScale;
-                    float waveHeight=sliderHeight-ImGui::GetFrameHeightWithSpacing()*((ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPL)?5.0f:4.5f);
-
-                    int maxTl=127;
-                    if (ins->type==DIV_INS_OPLL) {
-                      if (i==1) {
-                        maxTl=15;
-                      } else {
-                        maxTl=63;
-                      }
-                    }
-                    if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
-                      maxTl=63;
-                    }
-                    int maxArDr=(ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM)?31:15;
-
-                    bool ssgOn=op.ssgEnv&8;
-                    bool ksrOn=op.ksr;
-                    bool vibOn=op.vib;
-                    bool egtOn=op.egt;
-                    bool susOn=op.sus; // yawn
-                    unsigned char ssgEnv=op.ssgEnv&7;
-
-                    ImGui::PushStyleVar(ImGuiStyleVar_CellPadding,oldPadding);
-                    if (ImGui::BeginTable("opParams",4,ImGuiTableFlags_BordersInnerV)) {
-                      ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed);
-                      ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,waveWidth);
-                      ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch);
-                      ImGui::TableSetupColumn("c3",ImGuiTableColumnFlags_WidthFixed);
-
-                      ImGui::TableNextRow();
-                      ImGui::TableNextColumn();
-                      float textY=ImGui::GetCursorPosY();
-                      CENTER_TEXT_20(FM_SHORT_NAME(FM_AR));
-                      ImGui::TextUnformatted(FM_SHORT_NAME(FM_AR));
-                      TOOLTIP_TEXT(FM_NAME(FM_AR));
-                      ImGui::TableNextColumn();
-                      if (ins->type==DIV_INS_FM) {
-                        ImGui::Text("SSG-EG");
-                      } else {
-                        ImGui::Text("Waveform");
-                      }
-                      ImGui::TableNextColumn();
-                      ImGui::Text("Envelope");
-                      ImGui::TableNextColumn();
-                      CENTER_TEXT(FM_SHORT_NAME(FM_TL));
-                      ImGui::TextUnformatted(FM_SHORT_NAME(FM_TL));
-                      TOOLTIP_TEXT(FM_NAME(FM_TL));
-
-                      // A/D/S/R
-                      ImGui::TableNextColumn();
-
-                      op.ar&=maxArDr;
-                      P(CWVSliderScalar("##AR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.ar,&maxArDr,&_ZERO));
-
-                      ImGui::SameLine();
-                      op.dr&=maxArDr;
-                      float textX_DR=ImGui::GetCursorPosX();
-                      P(CWVSliderScalar("##DR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.dr,&maxArDr,&_ZERO));
-
-                      float textX_SL=0.0f;
-                      if (settings.susPosition==0) {
-                        ImGui::SameLine();
-                        op.sl&=15;
-                        textX_SL=ImGui::GetCursorPosX();
-                        P(CWVSliderScalar("##SL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO));
-                      }
-
-                      float textX_D2R=0.0f;
-                      if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                        ImGui::SameLine();
-                        op.d2r&=31;
-                        textX_D2R=ImGui::GetCursorPosX();
-                        P(CWVSliderScalar("##D2R",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.d2r,&_THIRTY_ONE,&_ZERO));
-                      }
-
-                      ImGui::SameLine();
-                      op.rr&=15;
-                      float textX_RR=ImGui::GetCursorPosX();
-                      P(CWVSliderScalar("##RR",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.rr,&_FIFTEEN,&_ZERO));
-
-                      if (settings.susPosition==1) {
-                        ImGui::SameLine();
-                        op.sl&=15;
-                        textX_SL=ImGui::GetCursorPosX();
-                        P(CWVSliderScalar("##SL",ImVec2(20.0f*dpiScale,sliderHeight),ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO));
-                      }
-
-                      ImVec2 prevCurPos=ImGui::GetCursorPos();
-                      
-                      // labels
-                      ImGui::SetCursorPos(ImVec2(textX_DR,textY));
-                      CENTER_TEXT_20(FM_SHORT_NAME(FM_DR));
-                      ImGui::TextUnformatted(FM_SHORT_NAME(FM_DR));
-                      TOOLTIP_TEXT(FM_NAME(FM_DR));
-
-                      ImGui::SetCursorPos(ImVec2(textX_SL,textY));
-                      CENTER_TEXT_20(FM_SHORT_NAME(FM_SL));
-                      ImGui::TextUnformatted(FM_SHORT_NAME(FM_SL));
-                      TOOLTIP_TEXT(FM_NAME(FM_SL));
-
-                      ImGui::SetCursorPos(ImVec2(textX_RR,textY));
-                      CENTER_TEXT_20(FM_SHORT_NAME(FM_RR));
-                      ImGui::TextUnformatted(FM_SHORT_NAME(FM_RR));
-                      TOOLTIP_TEXT(FM_NAME(FM_RR));
-
-                      if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                        ImGui::SetCursorPos(ImVec2(textX_D2R,textY));
-                        CENTER_TEXT_20(FM_SHORT_NAME(FM_D2R));
-                        ImGui::TextUnformatted(FM_SHORT_NAME(FM_D2R));
-                        TOOLTIP_TEXT(FM_NAME(FM_D2R));
-                      }
-
-                      ImGui::SetCursorPos(prevCurPos);
-                      
-                      ImGui::TableNextColumn();
-                      switch (ins->type) {
-                        case DIV_INS_FM: {
-                          // SSG
-                          ImGui::BeginDisabled(!ssgOn);
-                          drawSSGEnv(op.ssgEnv&7,ImVec2(waveWidth,waveHeight));
-                          ImGui::EndDisabled();
-                          if (ImGui::Checkbox("##SSGOn",&ssgOn)) { PARAMETER
-                            op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
-                          }
-
-                          ImGui::SameLine();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          if (CWSliderScalar("##SSG",ImGuiDataType_U8,&ssgEnv,&_ZERO,&_SEVEN,ssgEnvTypes[ssgEnv])) { PARAMETER
-                            op.ssgEnv=(op.ssgEnv&8)|(ssgEnv&7);
-                          }
-                          
-                          // params
-                          ImGui::Separator();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
-                          P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
-
-                          int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
-                          if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
-                            if (detune<-3) detune=-3;
-                            if (detune>7) detune=7;
-                            op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
-                          } rightClickable
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_RS));
-                          P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE,tempID)); rightClickable
-
-                          break;
-                        }
-                        case DIV_INS_OPM: {
-                          drawWaveform(0,true,ImVec2(waveWidth,waveHeight));
-                          
-                          // params
-                          ImGui::Separator();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
-                          P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
-
-                          int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
-                          if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
-                            if (detune<-3) detune=-3;
-                            if (detune>7) detune=7;
-                            op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
-                          } rightClickable
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT2));
-                          P(CWSliderScalar("##DT2",ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE,tempID)); rightClickable
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_RS));
-                          P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE,tempID)); rightClickable
-                          break;
-                        }
-                        case DIV_INS_OPLL:
-                          // waveform
-                          drawWaveform(i==0?(ins->fm.ams&1):(ins->fm.fms&1),ins->type==DIV_INS_OPZ,ImVec2(waveWidth,waveHeight));
-
-                          // params
-                          ImGui::Separator();
-                          if (ImGui::BeginTable("FMParamsInner",2)) {
-                            ImGui::TableNextRow();
-                            ImGui::TableNextColumn();
-                            bool amOn=op.am;
-                            if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
-                              op.am=amOn;
-                            }
-                            ImGui::TableNextColumn();
-                            if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
-                              op.ksr=ksrOn;
-                            }
-
-                            ImGui::TableNextRow();
-                            ImGui::TableNextColumn();
-                            if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
-                              op.vib=vibOn;
-                            }
-                            ImGui::TableNextColumn();
-                            if (ImGui::Checkbox(FM_NAME(FM_EGS),&ssgOn)) { PARAMETER
-                              op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
-                            }
-                            
-                            ImGui::EndTable();
-                          }
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
-                          P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_KSL));
-                          P(CWSliderScalar("##KSL",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE,tempID)); rightClickable
-
-                          break;
-                        case DIV_INS_OPL:
-                        case DIV_INS_OPL_DRUMS:
-                          // waveform
-                          drawWaveform(op.ws&7,ins->type==DIV_INS_OPZ,ImVec2(waveWidth,waveHeight));
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
-                          if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
-                            ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
-                          }
-
-                          // params
-                          ImGui::Separator();
-                          if (ImGui::BeginTable("FMParamsInner",2)) {
-                            ImGui::TableNextRow();
-                            ImGui::TableNextColumn();
-                            bool amOn=op.am;
-                            if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
-                              op.am=amOn;
-                            }
-                            ImGui::TableNextColumn();
-                            if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
-                              op.ksr=ksrOn;
-                            }
-
-                            ImGui::TableNextRow();
-                            ImGui::TableNextColumn();
-                            if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
-                              op.vib=vibOn;
-                            }
-                            ImGui::TableNextColumn();
-                            if (ImGui::Checkbox(FM_NAME(FM_SUS),&susOn)) { PARAMETER
-                              op.sus=susOn;
-                            }
-                            
-                            ImGui::EndTable();
-                          }
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
-                          P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_KSL));
-                          P(CWSliderScalar("##KSL",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE,tempID)); rightClickable
-
-                          break;
-                        case DIV_INS_OPZ: {
-                          // waveform
-                          drawWaveform(op.ws&7,ins->type==DIV_INS_OPZ,ImVec2(waveWidth,waveHeight));
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
-                          if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
-                            ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
-                          }
-
-                          // params
-                          ImGui::Separator();
-                          if (egtOn) {
-                            int block=op.dt;
-                            int freqNum=(op.mult<<4)|(op.dvb&15);
-                            ImGui::Text("Block");
-                            ImGui::SameLine();
-                            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                            ImVec2 cursorAlign=ImGui::GetCursorPos();
-                            if (ImGui::InputInt("##Block",&block,1,1)) {
-                              if (block<0) block=0;
-                              if (block>7) block=7;
-                              op.dt=block;
-                            }
-                            
-                            ImGui::Text("Freq");
-                            ImGui::SameLine();
-                            ImGui::SetCursorPos(ImVec2(cursorAlign.x,ImGui::GetCursorPosY()));
-                            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                            if (ImGui::InputInt("##FreqNum",&freqNum,1,16)) {
-                              if (freqNum<0) freqNum=0;
-                              if (freqNum>255) freqNum=255;
-                              op.mult=freqNum>>4;
-                              op.dvb=freqNum&15;
-                            }
-                          } else {
-                            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                            snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
-                            P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
-
-                            int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
-                            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                            snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
-                            if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
-                              if (detune<-3) detune=-3;
-                              if (detune>7) detune=7;
-                              op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
-                            } rightClickable
-                          }
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT2));
-                          P(CWSliderScalar("##DT2",ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE,tempID)); rightClickable
-                          if (ImGui::IsItemHovered()) {
-                            ImGui::SetTooltip("Only on YM2151 (OPM)");
-                          }
-
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_RS));
-                          P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE,tempID)); rightClickable
-                          break;
-                        }
-                        default:
-                          break;
-                      }
-
-                      ImGui::TableNextColumn();
-                      float envHeight=sliderHeight;//-ImGui::GetStyle().ItemSpacing.y*2.0f;
-                      if (ins->type==DIV_INS_OPZ) {
-                        envHeight-=ImGui::GetFrameHeightWithSpacing()*2.0f;
-                      }
-                      drawFMEnv(op.tl&maxTl,op.ar&maxArDr,op.dr&maxArDr,(ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPLL)?((op.rr&15)*2):op.d2r&31,op.rr&15,op.sl&15,op.sus,op.ssgEnv&8,ins->fm.alg,maxTl,maxArDr,15,ImVec2(ImGui::GetContentRegionAvail().x,envHeight),ins->type);
-
-                      if (ins->type==DIV_INS_OPZ) {
+                        
+                        // params
                         ImGui::Separator();
-                        if (ImGui::BeginTable("FMParamsInnerOPZ",2)) {
-                          ImGui::TableNextRow();
-                          ImGui::TableNextColumn();
-                          if (!egtOn) {
-                            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                            snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_FINE));
-                            P(CWSliderScalar("##FINE",ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN,tempID)); rightClickable
-                          }
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
+                        P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
 
+                        int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
+                        if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
+                          if (detune<-3) detune=-3;
+                          if (detune>7) detune=7;
+                          op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
+                        } rightClickable
+
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_RS));
+                        P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE,tempID)); rightClickable
+
+                        break;
+                      }
+                      case DIV_INS_OPM: {
+                        drawWaveform(0,true,ImVec2(waveWidth,waveHeight));
+                        
+                        // params
+                        ImGui::Separator();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
+                        P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
+
+                        int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
+                        if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
+                          if (detune<-3) detune=-3;
+                          if (detune>7) detune=7;
+                          op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
+                        } rightClickable
+
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT2));
+                        P(CWSliderScalar("##DT2",ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE,tempID)); rightClickable
+
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_RS));
+                        P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE,tempID)); rightClickable
+                        break;
+                      }
+                      case DIV_INS_OPLL:
+                        // waveform
+                        drawWaveform(i==0?(fmOrigin.ams&1):(fmOrigin.fms&1),ins->type==DIV_INS_OPZ,ImVec2(waveWidth,waveHeight));
+
+                        // params
+                        ImGui::Separator();
+                        if (ImGui::BeginTable("FMParamsInner",2)) {
+                          ImGui::TableNextRow();
                           ImGui::TableNextColumn();
                           bool amOn=op.am;
                           if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
                             op.am=amOn;
                           }
-                          ImGui::SameLine();
-                          if (ImGui::Checkbox("Fixed",&egtOn)) { PARAMETER
-                            op.egt=egtOn;
+                          ImGui::TableNextColumn();
+                          if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
+                            op.ksr=ksrOn;
                           }
 
                           ImGui::TableNextRow();
                           ImGui::TableNextColumn();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_EGSHIFT));
-                          P(CWSliderScalar("##EGShift",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE,tempID)); rightClickable
-
+                          if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
+                            op.vib=vibOn;
+                          }
                           ImGui::TableNextColumn();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_REV));
-                          P(CWSliderScalar("##REV",ImGuiDataType_U8,&op.dam,&_ZERO,&_SEVEN,tempID)); rightClickable
-
-                          ImGui::TableNextColumn();
-
-
+                          if (ImGui::Checkbox(FM_NAME(FM_EGS),&ssgOn)) { PARAMETER
+                            op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
+                          }
+                          
                           ImGui::EndTable();
                         }
-                      }
 
-                      ImGui::TableNextColumn();
-                      op.tl&=maxTl;
-                      P(CWVSliderScalar("##TL",ImVec2(ImGui::GetFrameHeight(),sliderHeight-((ins->type==DIV_INS_FM || ins->type==DIV_INS_OPM)?(ImGui::GetFrameHeightWithSpacing()+ImGui::CalcTextSize(FM_SHORT_NAME(FM_AM)).y+ImGui::GetStyle().ItemSpacing.y):0.0f)),ImGuiDataType_U8,&op.tl,&maxTl,&_ZERO));
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
+                        P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
 
-                      if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPM) {
-                        CENTER_TEXT(FM_SHORT_NAME(FM_AM));
-                        ImGui::TextUnformatted(FM_SHORT_NAME(FM_AM));
-                        TOOLTIP_TEXT(FM_NAME(FM_AM));
-                        bool amOn=op.am;
-                        if (ImGui::Checkbox("##AM",&amOn)) { PARAMETER
-                          op.am=amOn;
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_KSL));
+                        P(CWSliderScalar("##KSL",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE,tempID)); rightClickable
+
+                        break;
+                      case DIV_INS_OPL:
+                      case DIV_INS_OPL_DRUMS:
+                        // waveform
+                        drawWaveform(op.ws&7,ins->type==DIV_INS_OPZ,ImVec2(waveWidth,waveHeight));
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
+                        if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
+                          ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
                         }
-                      }
 
-                      ImGui::EndTable();
-                    }
-                    ImGui::PopStyleVar();
-
-                    if (settings.separateFMColors) {
-                      popAccentColors();
-                    }
-
-                    ImGui::PopID();
-                  }
-                  ImGui::EndTable();
-                }
-                ImGui::PopStyleVar();
-              } else { // classic
-                int columns=2;
-                switch (settings.fmLayout) {
-                  case 1: // 2x2
-                    columns=2;
-                    break;
-                  case 2: // 1x4
-                    columns=1;
-                    break;
-                  case 3: // 4x1
-                    columns=opCount;
-                    break;
-                }
-                if (ImGui::BeginTable("FMOperators",columns,ImGuiTableFlags_SizingStretchSame)) {
-                  for (int i=0; i<opCount; i++) {
-                    DivInstrumentFM::Operator& op=ins->fm.op[(opCount==4 && ins->type!=DIV_INS_OPL_DRUMS)?opOrder[i]:i];
-                    if ((settings.fmLayout!=3 && ((i+1)&1)) || i==0 || settings.fmLayout==2) ImGui::TableNextRow();
-                    ImGui::TableNextColumn();
-                    ImGui::Separator();
-                    ImGui::PushID(fmt::sprintf("op%d",i).c_str());
-
-                    // push colors
-                    if (settings.separateFMColors) {
-                      bool mod=true;
-                      if (ins->type==DIV_INS_OPL_DRUMS) {
-                        mod=false;
-                      } else if (opCount==4) {
-                        if (ins->type==DIV_INS_OPL) {
-                          if (opIsOutputOPL[ins->fm.alg&3][i]) mod=false;
-                        } else {
-                          if (opIsOutput[ins->fm.alg&7][i]) mod=false;
-                        }
-                      } else {
-                        if (i==1 || (ins->type==DIV_INS_OPL && (ins->fm.alg&1))) mod=false;
-                      }
-                      if (mod) {
-                        pushAccentColors(
-                          uiColors[GUI_COLOR_FM_PRIMARY_MOD],
-                          uiColors[GUI_COLOR_FM_SECONDARY_MOD],
-                          uiColors[GUI_COLOR_FM_BORDER_MOD],
-                          uiColors[GUI_COLOR_FM_BORDER_SHADOW_MOD]
-                        );
-                      } else {
-                        pushAccentColors(
-                          uiColors[GUI_COLOR_FM_PRIMARY_CAR],
-                          uiColors[GUI_COLOR_FM_SECONDARY_CAR],
-                          uiColors[GUI_COLOR_FM_BORDER_CAR],
-                          uiColors[GUI_COLOR_FM_BORDER_SHADOW_CAR]
-                        );
-                      }
-                    }
-
-                    ImGui::Dummy(ImVec2(dpiScale,dpiScale));
-                    String opNameLabel;
-                    OP_DRAG_POINT;
-                    ImGui::SameLine();
-                    if (ins->type==DIV_INS_OPL_DRUMS) {
-                      opNameLabel=fmt::sprintf("%s",oplDrumNames[i]);
-                    } else if (ins->type==DIV_INS_OPL && ins->fm.opllPreset==16) {
-                      if (i==1) {
-                        opNameLabel="Envelope 2 (kick only)";
-                      } else {
-                        opNameLabel="Envelope";
-                      }
-                    } else {
-                      opNameLabel=fmt::sprintf("OP%d",i+1);
-                    }
-                    if (opsAreMutable) {
-                      pushToggleColors(op.enable);
-                      if (ImGui::Button(opNameLabel.c_str())) {
-                        op.enable=!op.enable;
-                        PARAMETER;
-                      }
-                      popToggleColors();
-                    } else {
-                      ImGui::TextUnformatted(opNameLabel.c_str());
-                    }
-
-                    ImGui::SameLine();
-
-                    bool amOn=op.am;
-                    if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
-                      op.am=amOn;
-                    }
-
-                    int maxTl=127;
-                    if (ins->type==DIV_INS_OPLL) {
-                      if (i==1) {
-                        maxTl=15;
-                      } else {
-                        maxTl=63;
-                      }
-                    }
-                    if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
-                      maxTl=63;
-                    }
-                    int maxArDr=(ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM)?31:15;
-
-                    bool ssgOn=op.ssgEnv&8;
-                    bool ksrOn=op.ksr;
-                    bool vibOn=op.vib;
-                    bool susOn=op.sus; // don't you make fun of this one
-                    unsigned char ssgEnv=op.ssgEnv&7;
-                    if (ins->type!=DIV_INS_OPL && ins->type!=DIV_INS_OPL_DRUMS && ins->type!=DIV_INS_OPZ && ins->type!=DIV_INS_OPM) {
-                      ImGui::SameLine();
-                      if (ImGui::Checkbox((ins->type==DIV_INS_OPLL)?FM_NAME(FM_EGS):"SSG On",&ssgOn)) { PARAMETER
-                        op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
-                      }
-                    }
-
-                    if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
-                      ImGui::SameLine();
-                      if (ImGui::Checkbox(FM_NAME(FM_SUS),&susOn)) { PARAMETER
-                        op.sus=susOn;
-                      }
-                    }
-
-                    if (ins->type==DIV_INS_OPZ) {
-                      ImGui::SameLine();
-                      bool fixedOn=op.egt;
-                      if (ImGui::Checkbox("Fixed",&fixedOn)) { PARAMETER
-                        op.egt=fixedOn;
-                      }
-                    }
-
-                    //52.0 controls vert scaling; default 96
-                    drawFMEnv(op.tl&maxTl,op.ar&maxArDr,op.dr&maxArDr,(ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPLL)?((op.rr&15)*2):op.d2r&31,op.rr&15,op.sl&15,op.sus,op.ssgEnv&8,ins->fm.alg,maxTl,maxArDr,15,ImVec2(ImGui::GetContentRegionAvail().x,52.0*dpiScale),ins->type);
-                    //P(CWSliderScalar(FM_NAME(FM_AR),ImGuiDataType_U8,&op.ar,&_ZERO,&_THIRTY_ONE)); rightClickable
-                    if (ImGui::BeginTable("opParams",2,ImGuiTableFlags_SizingStretchProp)) {
-                      ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthStretch,0.0); \
-                      ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,0.0); \
-
-                      ImGui::TableNextRow();
-                      ImGui::TableNextColumn();
-                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                      op.ar&=maxArDr;
-                      P(CWSliderScalar("##AR",ImGuiDataType_U8,&op.ar,&maxArDr,&_ZERO)); rightClickable
-                      ImGui::TableNextColumn();
-                      ImGui::Text("%s",FM_NAME(FM_AR));
-
-                      ImGui::TableNextRow();
-                      ImGui::TableNextColumn();
-                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                      op.dr&=maxArDr;
-                      P(CWSliderScalar("##DR",ImGuiDataType_U8,&op.dr,&maxArDr,&_ZERO)); rightClickable
-                      ImGui::TableNextColumn();
-                      ImGui::Text("%s",FM_NAME(FM_DR));
-
-                      if (settings.susPosition==0) {
-                        ImGui::TableNextRow();
-                        ImGui::TableNextColumn();
-                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                        P(CWSliderScalar("##SL",ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO)); rightClickable
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_SL));
-                      }
-
-                      if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                        ImGui::TableNextRow();
-                        ImGui::TableNextColumn();
-                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                        P(CWSliderScalar("##D2R",ImGuiDataType_U8,&op.d2r,&_THIRTY_ONE,&_ZERO)); rightClickable
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_D2R));
-                      }
-
-                      ImGui::TableNextRow();
-                      ImGui::TableNextColumn();
-                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                      P(CWSliderScalar("##RR",ImGuiDataType_U8,&op.rr,&_FIFTEEN,&_ZERO)); rightClickable
-                      ImGui::TableNextColumn();
-                      ImGui::Text("%s",FM_NAME(FM_RR));
-
-                      if (settings.susPosition==1) {
-                        ImGui::TableNextRow();
-                        ImGui::TableNextColumn();
-                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                        P(CWSliderScalar("##SL",ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO)); rightClickable
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_SL));
-                      }
-
-                      ImGui::TableNextRow();
-                      ImGui::TableNextColumn();
-                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                      op.tl&=maxTl;
-                      P(CWSliderScalar("##TL",ImGuiDataType_U8,&op.tl,&maxTl,&_ZERO)); rightClickable
-                      ImGui::TableNextColumn();
-                      ImGui::Text("%s",FM_NAME(FM_TL));
-
-                      ImGui::TableNextRow();
-                      ImGui::TableNextColumn();
-                      ImGui::Separator();
-                      ImGui::TableNextColumn();
-                      ImGui::Separator();
-                      
-                      ImGui::TableNextRow();
-                      ImGui::TableNextColumn();
-                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                      if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                        P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE)); rightClickable
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_RS));
-                      } else {
-                        P(CWSliderScalar("##KSL",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE)); rightClickable
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_KSL));
-                      }
-
-                      if (ins->type==DIV_INS_OPZ) {
-                        ImGui::TableNextRow();
-                        ImGui::TableNextColumn();
-                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                        P(CWSliderScalar(FM_NAME(FM_EGSHIFT),ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE)); rightClickable
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_EGSHIFT));
-
-                        ImGui::TableNextRow();
-                        ImGui::TableNextColumn();
-                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                        P(CWSliderScalar(FM_NAME(FM_REV),ImGuiDataType_U8,&op.dam,&_ZERO,&_SEVEN)); rightClickable
-                        ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_REV));
-                      }
-
-                      if (ins->type==DIV_INS_OPZ) {
-                        if (op.egt) {
-                          int block=op.dt;
-                          int freqNum=(op.mult<<4)|(op.dvb&15);
+                        // params
+                        ImGui::Separator();
+                        if (ImGui::BeginTable("FMParamsInner",2)) {
+                          ImGui::TableNextRow();
+                          ImGui::TableNextColumn();
+                          bool amOn=op.am;
+                          if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
+                            op.am=amOn;
+                          }
+                          ImGui::TableNextColumn();
+                          if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
+                            op.ksr=ksrOn;
+                          }
 
                           ImGui::TableNextRow();
                           ImGui::TableNextColumn();
+                          if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
+                            op.vib=vibOn;
+                          }
+                          ImGui::TableNextColumn();
+                          if (ImGui::Checkbox(FM_NAME(FM_SUS),&susOn)) { PARAMETER
+                            op.sus=susOn;
+                          }
+                          
+                          ImGui::EndTable();
+                        }
+
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
+                        P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
+
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_KSL));
+                        P(CWSliderScalar("##KSL",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE,tempID)); rightClickable
+
+                        break;
+                      case DIV_INS_OPZ: {
+                        // waveform
+                        drawWaveform(op.ws&7,ins->type==DIV_INS_OPZ,ImVec2(waveWidth,waveHeight));
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
+                        if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
+                          ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
+                        }
+
+                        // params
+                        ImGui::Separator();
+                        if (egtOn) {
+                          int block=op.dt;
+                          int freqNum=(op.mult<<4)|(op.dvb&15);
+                          ImGui::Text("Block");
+                          ImGui::SameLine();
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          if (CWSliderInt(FM_NAME(FM_MULT),&block,0,7)) { PARAMETER
+                          ImVec2 cursorAlign=ImGui::GetCursorPos();
+                          if (ImGui::InputInt("##Block",&block,1,1)) {
                             if (block<0) block=0;
                             if (block>7) block=7;
                             op.dt=block;
-                          } rightClickable
-                          ImGui::TableNextColumn();
-                          ImGui::Text("Block");
-
-                          ImGui::TableNextRow();
-                          ImGui::TableNextColumn();
+                          }
+                          
+                          ImGui::Text("Freq");
+                          ImGui::SameLine();
+                          ImGui::SetCursorPos(ImVec2(cursorAlign.x,ImGui::GetCursorPosY()));
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          if (CWSliderInt(FM_NAME(FM_FINE),&freqNum,0,255)) { PARAMETER
+                          if (ImGui::InputInt("##FreqNum",&freqNum,1,16)) {
                             if (freqNum<0) freqNum=0;
                             if (freqNum>255) freqNum=255;
                             op.mult=freqNum>>4;
                             op.dvb=freqNum&15;
-                          } rightClickable
-                          ImGui::TableNextColumn();
-                          ImGui::Text("FreqNum");
+                          }
                         } else {
-                          ImGui::TableNextRow();
-                          ImGui::TableNextColumn();
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          P(CWSliderScalar(FM_NAME(FM_MULT),ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN)); rightClickable
-                          ImGui::TableNextColumn();
-                          ImGui::Text("%s",FM_NAME(FM_MULT));
+                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_MULT));
+                          P(CWSliderScalar("##MULT",ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN,tempID)); rightClickable
 
-                          ImGui::TableNextRow();
-                          ImGui::TableNextColumn();
+                          int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
                           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          P(CWSliderScalar(FM_NAME(FM_FINE),ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN)); rightClickable
-                          ImGui::TableNextColumn();
-                          ImGui::Text("%s",FM_NAME(FM_FINE));
+                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT));
+                          if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4,tempID)) { PARAMETER
+                            if (detune<-3) detune=-3;
+                            if (detune>7) detune=7;
+                            op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
+                          } rightClickable
                         }
+
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_DT2));
+                        P(CWSliderScalar("##DT2",ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE,tempID)); rightClickable
+                        if (ImGui::IsItemHovered()) {
+                          ImGui::SetTooltip("Only on YM2151 (OPM)");
+                        }
+
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_RS));
+                        P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE,tempID)); rightClickable
+                        break;
+                      }
+                      default:
+                        break;
+                    }
+
+                    ImGui::TableNextColumn();
+                    float envHeight=sliderHeight;//-ImGui::GetStyle().ItemSpacing.y*2.0f;
+                    if (ins->type==DIV_INS_OPZ) {
+                      envHeight-=ImGui::GetFrameHeightWithSpacing()*2.0f;
+                    }
+                    drawFMEnv(op.tl&maxTl,op.ar&maxArDr,op.dr&maxArDr,(ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPLL)?((op.rr&15)*2):op.d2r&31,op.rr&15,op.sl&15,op.sus,op.ssgEnv&8,fmOrigin.alg,maxTl,maxArDr,15,ImVec2(ImGui::GetContentRegionAvail().x,envHeight),ins->type);
+
+                    if (ins->type==DIV_INS_OPZ) {
+                      ImGui::Separator();
+                      if (ImGui::BeginTable("FMParamsInnerOPZ",2)) {
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+                        if (!egtOn) {
+                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                          snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_FINE));
+                          P(CWSliderScalar("##FINE",ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN,tempID)); rightClickable
+                        }
+
+                        ImGui::TableNextColumn();
+                        bool amOn=op.am;
+                        if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
+                          op.am=amOn;
+                        }
+                        ImGui::SameLine();
+                        if (ImGui::Checkbox("Fixed",&egtOn)) { PARAMETER
+                          op.egt=egtOn;
+                        }
+
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_EGSHIFT));
+                        P(CWSliderScalar("##EGShift",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE,tempID)); rightClickable
+
+                        ImGui::TableNextColumn();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        snprintf(tempID,1024,"%s: %%d",FM_NAME(FM_REV));
+                        P(CWSliderScalar("##REV",ImGuiDataType_U8,&op.dam,&_ZERO,&_SEVEN,tempID)); rightClickable
+
+                        ImGui::TableNextColumn();
+
+
+                        ImGui::EndTable();
+                      }
+                    }
+
+                    ImGui::TableNextColumn();
+                    op.tl&=maxTl;
+                    P(CWVSliderScalar("##TL",ImVec2(ImGui::GetFrameHeight(),sliderHeight-((ins->type==DIV_INS_FM || ins->type==DIV_INS_OPM)?(ImGui::GetFrameHeightWithSpacing()+ImGui::CalcTextSize(FM_SHORT_NAME(FM_AM)).y+ImGui::GetStyle().ItemSpacing.y):0.0f)),ImGuiDataType_U8,&op.tl,&maxTl,&_ZERO));
+
+                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPM) {
+                      CENTER_TEXT(FM_SHORT_NAME(FM_AM));
+                      ImGui::TextUnformatted(FM_SHORT_NAME(FM_AM));
+                      TOOLTIP_TEXT(FM_NAME(FM_AM));
+                      bool amOn=op.am;
+                      if (ImGui::Checkbox("##AM",&amOn)) { PARAMETER
+                        op.am=amOn;
+                      }
+                    }
+
+                    ImGui::EndTable();
+                  }
+                  ImGui::PopStyleVar();
+
+                  if (settings.separateFMColors) {
+                    popAccentColors();
+                  }
+
+                  ImGui::PopID();
+                }
+                ImGui::EndTable();
+              }
+              ImGui::PopStyleVar();
+            } else { // classic
+              int columns=2;
+              switch (settings.fmLayout) {
+                case 1: // 2x2
+                  columns=2;
+                  break;
+                case 2: // 1x4
+                  columns=1;
+                  break;
+                case 3: // 4x1
+                  columns=opCount;
+                  break;
+              }
+              if (ImGui::BeginTable("FMOperators",columns,ImGuiTableFlags_SizingStretchSame)) {
+                for (int i=0; i<opCount; i++) {
+                  DivInstrumentFM::Operator& op=fmOrigin.op[(opCount==4 && ins->type!=DIV_INS_OPL_DRUMS)?opOrder[i]:i];
+                  if ((settings.fmLayout!=3 && ((i+1)&1)) || i==0 || settings.fmLayout==2) ImGui::TableNextRow();
+                  ImGui::TableNextColumn();
+                  ImGui::Separator();
+                  ImGui::PushID(fmt::sprintf("op%d",i).c_str());
+
+                  // push colors
+                  if (settings.separateFMColors) {
+                    bool mod=true;
+                    if (ins->type==DIV_INS_OPL_DRUMS) {
+                      mod=false;
+                    } else if (opCount==4) {
+                      if (ins->type==DIV_INS_OPL) {
+                        if (opIsOutputOPL[fmOrigin.alg&3][i]) mod=false;
+                      } else {
+                        if (opIsOutput[fmOrigin.alg&7][i]) mod=false;
+                      }
+                    } else {
+                      if (i==1 || (ins->type==DIV_INS_OPL && (fmOrigin.alg&1))) mod=false;
+                    }
+                    if (mod) {
+                      pushAccentColors(
+                        uiColors[GUI_COLOR_FM_PRIMARY_MOD],
+                        uiColors[GUI_COLOR_FM_SECONDARY_MOD],
+                        uiColors[GUI_COLOR_FM_BORDER_MOD],
+                        uiColors[GUI_COLOR_FM_BORDER_SHADOW_MOD]
+                      );
+                    } else {
+                      pushAccentColors(
+                        uiColors[GUI_COLOR_FM_PRIMARY_CAR],
+                        uiColors[GUI_COLOR_FM_SECONDARY_CAR],
+                        uiColors[GUI_COLOR_FM_BORDER_CAR],
+                        uiColors[GUI_COLOR_FM_BORDER_SHADOW_CAR]
+                      );
+                    }
+                  }
+
+                  ImGui::Dummy(ImVec2(dpiScale,dpiScale));
+                  String opNameLabel;
+                  OP_DRAG_POINT;
+                  ImGui::SameLine();
+                  if (ins->type==DIV_INS_OPL_DRUMS) {
+                    opNameLabel=fmt::sprintf("%s",oplDrumNames[i]);
+                  } else if (ins->type==DIV_INS_OPL && fmOrigin.opllPreset==16) {
+                    if (i==1) {
+                      opNameLabel="Envelope 2 (kick only)";
+                    } else {
+                      opNameLabel="Envelope";
+                    }
+                  } else {
+                    opNameLabel=fmt::sprintf("OP%d",i+1);
+                  }
+                  if (opsAreMutable) {
+                    pushToggleColors(op.enable);
+                    if (ImGui::Button(opNameLabel.c_str())) {
+                      op.enable=!op.enable;
+                      PARAMETER;
+                    }
+                    popToggleColors();
+                  } else {
+                    ImGui::TextUnformatted(opNameLabel.c_str());
+                  }
+
+                  ImGui::SameLine();
+
+                  bool amOn=op.am;
+                  if (ImGui::Checkbox(FM_NAME(FM_AM),&amOn)) { PARAMETER
+                    op.am=amOn;
+                  }
+
+                  int maxTl=127;
+                  if (ins->type==DIV_INS_OPLL) {
+                    if (i==1) {
+                      maxTl=15;
+                    } else {
+                      maxTl=63;
+                    }
+                  }
+                  if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
+                    maxTl=63;
+                  }
+                  int maxArDr=(ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM)?31:15;
+
+                  bool ssgOn=op.ssgEnv&8;
+                  bool ksrOn=op.ksr;
+                  bool vibOn=op.vib;
+                  bool susOn=op.sus; // don't you make fun of this one
+                  unsigned char ssgEnv=op.ssgEnv&7;
+                  if (ins->type!=DIV_INS_OPL && ins->type!=DIV_INS_OPL_DRUMS && ins->type!=DIV_INS_OPZ && ins->type!=DIV_INS_OPM) {
+                    ImGui::SameLine();
+                    if (ImGui::Checkbox((ins->type==DIV_INS_OPLL)?FM_NAME(FM_EGS):"SSG On",&ssgOn)) { PARAMETER
+                      op.ssgEnv=(op.ssgEnv&7)|(ssgOn<<3);
+                    }
+                  }
+
+                  if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
+                    ImGui::SameLine();
+                    if (ImGui::Checkbox(FM_NAME(FM_SUS),&susOn)) { PARAMETER
+                      op.sus=susOn;
+                    }
+                  }
+
+                  if (ins->type==DIV_INS_OPZ) {
+                    ImGui::SameLine();
+                    bool fixedOn=op.egt;
+                    if (ImGui::Checkbox("Fixed",&fixedOn)) { PARAMETER
+                      op.egt=fixedOn;
+                    }
+                  }
+
+                  //52.0 controls vert scaling; default 96
+                  drawFMEnv(op.tl&maxTl,op.ar&maxArDr,op.dr&maxArDr,(ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPLL)?((op.rr&15)*2):op.d2r&31,op.rr&15,op.sl&15,op.sus,op.ssgEnv&8,fmOrigin.alg,maxTl,maxArDr,15,ImVec2(ImGui::GetContentRegionAvail().x,52.0*dpiScale),ins->type);
+                  //P(CWSliderScalar(FM_NAME(FM_AR),ImGuiDataType_U8,&op.ar,&_ZERO,&_THIRTY_ONE)); rightClickable
+                  if (ImGui::BeginTable("opParams",2,ImGuiTableFlags_SizingStretchProp)) {
+                    ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthStretch,0.0); \
+                    ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthFixed,0.0); \
+
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+                    ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                    op.ar&=maxArDr;
+                    P(CWSliderScalar("##AR",ImGuiDataType_U8,&op.ar,&maxArDr,&_ZERO)); rightClickable
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%s",FM_NAME(FM_AR));
+
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+                    ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                    op.dr&=maxArDr;
+                    P(CWSliderScalar("##DR",ImGuiDataType_U8,&op.dr,&maxArDr,&_ZERO)); rightClickable
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%s",FM_NAME(FM_DR));
+
+                    if (settings.susPosition==0) {
+                      ImGui::TableNextRow();
+                      ImGui::TableNextColumn();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      P(CWSliderScalar("##SL",ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_SL));
+                    }
+
+                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                      ImGui::TableNextRow();
+                      ImGui::TableNextColumn();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      P(CWSliderScalar("##D2R",ImGuiDataType_U8,&op.d2r,&_THIRTY_ONE,&_ZERO)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_D2R));
+                    }
+
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+                    ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                    P(CWSliderScalar("##RR",ImGuiDataType_U8,&op.rr,&_FIFTEEN,&_ZERO)); rightClickable
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%s",FM_NAME(FM_RR));
+
+                    if (settings.susPosition==1) {
+                      ImGui::TableNextRow();
+                      ImGui::TableNextColumn();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      P(CWSliderScalar("##SL",ImGuiDataType_U8,&op.sl,&_FIFTEEN,&_ZERO)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_SL));
+                    }
+
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+                    ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                    op.tl&=maxTl;
+                    P(CWSliderScalar("##TL",ImGuiDataType_U8,&op.tl,&maxTl,&_ZERO)); rightClickable
+                    ImGui::TableNextColumn();
+                    ImGui::Text("%s",FM_NAME(FM_TL));
+
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+                    ImGui::Separator();
+                    ImGui::TableNextColumn();
+                    ImGui::Separator();
+                    
+                    ImGui::TableNextRow();
+                    ImGui::TableNextColumn();
+                    ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                      P(CWSliderScalar("##RS",ImGuiDataType_U8,&op.rs,&_ZERO,&_THREE)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_RS));
+                    } else {
+                      P(CWSliderScalar("##KSL",ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_KSL));
+                    }
+
+                    if (ins->type==DIV_INS_OPZ) {
+                      ImGui::TableNextRow();
+                      ImGui::TableNextColumn();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      P(CWSliderScalar(FM_NAME(FM_EGSHIFT),ImGuiDataType_U8,&op.ksl,&_ZERO,&_THREE)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_EGSHIFT));
+
+                      ImGui::TableNextRow();
+                      ImGui::TableNextColumn();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      P(CWSliderScalar(FM_NAME(FM_REV),ImGuiDataType_U8,&op.dam,&_ZERO,&_SEVEN)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_REV));
+                    }
+
+                    if (ins->type==DIV_INS_OPZ) {
+                      if (op.egt) {
+                        int block=op.dt;
+                        int freqNum=(op.mult<<4)|(op.dvb&15);
+
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        if (CWSliderInt(FM_NAME(FM_MULT),&block,0,7)) { PARAMETER
+                          if (block<0) block=0;
+                          if (block>7) block=7;
+                          op.dt=block;
+                        } rightClickable
+                        ImGui::TableNextColumn();
+                        ImGui::Text("Block");
+
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        if (CWSliderInt(FM_NAME(FM_FINE),&freqNum,0,255)) { PARAMETER
+                          if (freqNum<0) freqNum=0;
+                          if (freqNum>255) freqNum=255;
+                          op.mult=freqNum>>4;
+                          op.dvb=freqNum&15;
+                        } rightClickable
+                        ImGui::TableNextColumn();
+                        ImGui::Text("FreqNum");
                       } else {
                         ImGui::TableNextRow();
                         ImGui::TableNextColumn();
@@ -3630,79 +3649,94 @@ void FurnaceGUI::drawInsEdit() {
                         P(CWSliderScalar(FM_NAME(FM_MULT),ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN)); rightClickable
                         ImGui::TableNextColumn();
                         ImGui::Text("%s",FM_NAME(FM_MULT));
-                      }
-                      
-                      if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
-                        if (!(ins->type==DIV_INS_OPZ && op.egt)) {
-                          int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
-                          ImGui::TableNextRow();
-                          ImGui::TableNextColumn();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4)) { PARAMETER
-                            if (detune<-3) detune=-3;
-                            if (detune>7) detune=7;
-                            op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
-                          } rightClickable
-                          ImGui::TableNextColumn();
-                          ImGui::Text("%s",FM_NAME(FM_DT));
-                        }
 
-                        if (ins->type!=DIV_INS_FM) {
-                          ImGui::TableNextRow();
-                          ImGui::TableNextColumn();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          P(CWSliderScalar("##DT2",ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE)); rightClickable
-                          ImGui::TableNextColumn();
-                          ImGui::Text("%s",FM_NAME(FM_DT2));
-                        }
-
-                        if (ins->type==DIV_INS_FM) { // OPN only
-                          ImGui::TableNextRow();
-                          ImGui::TableNextColumn();
-                          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                          if (CWSliderScalar("##SSG",ImGuiDataType_U8,&ssgEnv,&_ZERO,&_SEVEN,ssgEnvTypes[ssgEnv])) { PARAMETER
-                            op.ssgEnv=(op.ssgEnv&8)|(ssgEnv&7);
-                          } rightClickable
-                          ImGui::TableNextColumn();
-                          ImGui::Text("%s",FM_NAME(FM_SSG));
-                        }
-                      }
-
-                      if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPZ) {
                         ImGui::TableNextRow();
                         ImGui::TableNextColumn();
                         ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-                        P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
-                        if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
-                          ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
-                        }
+                        P(CWSliderScalar(FM_NAME(FM_FINE),ImGuiDataType_U8,&op.dvb,&_ZERO,&_FIFTEEN)); rightClickable
                         ImGui::TableNextColumn();
-                        ImGui::Text("%s",FM_NAME(FM_WS));
+                        ImGui::Text("%s",FM_NAME(FM_FINE));
                       }
-                      
-                      ImGui::EndTable();
+                    } else {
+                      ImGui::TableNextRow();
+                      ImGui::TableNextColumn();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      P(CWSliderScalar(FM_NAME(FM_MULT),ImGuiDataType_U8,&op.mult,&_ZERO,&_FIFTEEN)); rightClickable
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_MULT));
                     }
-
-                    if (ins->type==DIV_INS_OPLL || ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
-                      if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
-                        op.vib=vibOn;
+                    
+                    if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPZ || ins->type==DIV_INS_OPM) {
+                      if (!(ins->type==DIV_INS_OPZ && op.egt)) {
+                        int detune=detuneMap[settings.unsignedDetune?1:0][op.dt&7];
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        if (CWSliderInt("##DT",&detune,settings.unsignedDetune?0:-3,settings.unsignedDetune?7:4)) { PARAMETER
+                          if (detune<-3) detune=-3;
+                          if (detune>7) detune=7;
+                          op.dt=detuneUnmap[settings.unsignedDetune?1:0][detune+3];
+                        } rightClickable
+                        ImGui::TableNextColumn();
+                        ImGui::Text("%s",FM_NAME(FM_DT));
                       }
-                      ImGui::SameLine();
-                      if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
-                        op.ksr=ksrOn;
+
+                      if (ins->type!=DIV_INS_FM) {
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        P(CWSliderScalar("##DT2",ImGuiDataType_U8,&op.dt2,&_ZERO,&_THREE)); rightClickable
+                        ImGui::TableNextColumn();
+                        ImGui::Text("%s",FM_NAME(FM_DT2));
+                      }
+
+                      if (ins->type==DIV_INS_FM) { // OPN only
+                        ImGui::TableNextRow();
+                        ImGui::TableNextColumn();
+                        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                        if (CWSliderScalar("##SSG",ImGuiDataType_U8,&ssgEnv,&_ZERO,&_SEVEN,ssgEnvTypes[ssgEnv])) { PARAMETER
+                          op.ssgEnv=(op.ssgEnv&8)|(ssgEnv&7);
+                        } rightClickable
+                        ImGui::TableNextColumn();
+                        ImGui::Text("%s",FM_NAME(FM_SSG));
                       }
                     }
 
-                    if (settings.separateFMColors) {
-                      popAccentColors();
+                    if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS || ins->type==DIV_INS_OPZ) {
+                      ImGui::TableNextRow();
+                      ImGui::TableNextColumn();
+                      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+                      P(CWSliderScalar("##WS",ImGuiDataType_U8,&op.ws,&_ZERO,&_SEVEN,(ins->type==DIV_INS_OPZ)?opzWaveforms[op.ws&7]:(settings.oplStandardWaveNames?oplWaveformsStandard[op.ws&7]:oplWaveforms[op.ws&7]))); rightClickable
+                      if ((ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) && ImGui::IsItemHovered()) {
+                        ImGui::SetTooltip("OPL2/3 only (last 4 waveforms are OPL3 only)");
+                      }
+                      ImGui::TableNextColumn();
+                      ImGui::Text("%s",FM_NAME(FM_WS));
                     }
-
-                    ImGui::PopID();
+                    
+                    ImGui::EndTable();
                   }
-                  ImGui::EndTable();
+
+                  if (ins->type==DIV_INS_OPLL || ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPL_DRUMS) {
+                    if (ImGui::Checkbox(FM_NAME(FM_VIB),&vibOn)) { PARAMETER
+                      op.vib=vibOn;
+                    }
+                    ImGui::SameLine();
+                    if (ImGui::Checkbox(FM_NAME(FM_KSR),&ksrOn)) { PARAMETER
+                      op.ksr=ksrOn;
+                    }
+                  }
+
+                  if (settings.separateFMColors) {
+                    popAccentColors();
+                  }
+
+                  ImGui::PopID();
                 }
+                ImGui::EndTable();
               }
             }
+            ImGui::EndDisabled();
             ImGui::EndTabItem();
           }
           if (ImGui::BeginTabItem("FM Macros")) {

From 4e2dd5ec631ab73b0ad177f70237ec4a53ab026d Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 21:29:49 -0500
Subject: [PATCH 15/86] no WinMain experiment - TEST!

---
 CMakeLists.txt | 3 ++-
 src/main.cpp   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d79cfffbc..e0506dcb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -698,6 +698,7 @@ if (WIN32)
   list(APPEND DEPENDENCIES_LIBRARIES shlwapi)
   if (NOT MSVC)
     list(APPEND DEPENDENCIES_LIBRARIES -static)
+    list(APPEND DEPENDENCIES_LINK_OPTIONS "-mconsole")
   endif()
 endif()
 
@@ -742,7 +743,7 @@ if (WARNINGS_ARE_ERRORS)
 endif()
 
 if (MSVC)
-  add_executable(furnace WIN32 ${USED_SOURCES})
+  add_executable(furnace ${USED_SOURCES})
 elseif(ANDROID AND NOT TERMUX)
   add_library(furnace SHARED ${USED_SOURCES})
 else()
diff --git a/src/main.cpp b/src/main.cpp
index 5c668a9eb..984494f78 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -591,6 +591,6 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#ifdef _WIN32
-#include "winMain.cpp"
-#endif
+//#ifdef _WIN32
+//#include "winMain.cpp"
+//#endif

From f6f61017621be1d6380d2682e1f53561799875b7 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 22:24:23 -0500
Subject: [PATCH 16/86] Revert "no WinMain experiment - TEST!"

This reverts commit 4e2dd5ec631ab73b0ad177f70237ec4a53ab026d.
---
 CMakeLists.txt | 3 +--
 src/main.cpp   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0506dcb2..d79cfffbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -698,7 +698,6 @@ if (WIN32)
   list(APPEND DEPENDENCIES_LIBRARIES shlwapi)
   if (NOT MSVC)
     list(APPEND DEPENDENCIES_LIBRARIES -static)
-    list(APPEND DEPENDENCIES_LINK_OPTIONS "-mconsole")
   endif()
 endif()
 
@@ -743,7 +742,7 @@ if (WARNINGS_ARE_ERRORS)
 endif()
 
 if (MSVC)
-  add_executable(furnace ${USED_SOURCES})
+  add_executable(furnace WIN32 ${USED_SOURCES})
 elseif(ANDROID AND NOT TERMUX)
   add_library(furnace SHARED ${USED_SOURCES})
 else()
diff --git a/src/main.cpp b/src/main.cpp
index 984494f78..5c668a9eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -591,6 +591,6 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-//#ifdef _WIN32
-//#include "winMain.cpp"
-//#endif
+#ifdef _WIN32
+#include "winMain.cpp"
+#endif

From 22938d240dffdbe6f5e810287b3bd98a9e837e5c Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 22:25:05 -0500
Subject: [PATCH 17/86] SAA1099: try fixing big endian

---
 src/engine/platform/saa.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/engine/platform/saa.cpp b/src/engine/platform/saa.cpp
index acbecf68c..7f48bca43 100644
--- a/src/engine/platform/saa.cpp
+++ b/src/engine/platform/saa.cpp
@@ -71,10 +71,17 @@ void DivPlatformSAA1099::acquire_saaSound(short* bufL, short* bufR, size_t start
     writes.pop();
   }
   saa_saaSound->GenerateMany((unsigned char*)saaBuf[0],len,oscBuf);
+#ifdef TA_BIG_ENDIAN
+  for (size_t i=0; i<len; i++) {
+    bufL[i+start]=(short)((((unsigned short)saaBuf[0][1+(i<<1)])<<8)|(((unsigned short)saaBuf[0][1+(i<<1)])>>8));
+    bufR[i+start]=(short)((((unsigned short)saaBuf[0][i<<1])<<8)|(((unsigned short)saaBuf[0][i<<1])>>8));
+  }
+#else
   for (size_t i=0; i<len; i++) {
     bufL[i+start]=saaBuf[0][i<<1];
     bufR[i+start]=saaBuf[0][1+(i<<1)];
   }
+#endif
 }
 
 void DivPlatformSAA1099::acquire(short* bufL, short* bufR, size_t start, size_t len) {

From c14e24688f63f3f6e8e1118778c6c7b68516a1bc Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 15 Nov 2022 22:36:19 -0500
Subject: [PATCH 18/86] SoundUnit: big-endian fix (I think)

---
 src/engine/platform/sound/su.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/engine/platform/sound/su.cpp b/src/engine/platform/sound/su.cpp
index a87205457..67ee153e6 100644
--- a/src/engine/platform/sound/su.cpp
+++ b/src/engine/platform/sound/su.cpp
@@ -391,7 +391,18 @@ void SoundUnit::Reset() {
   memset(chan,0,sizeof(SUChannel)*8);
 }
 
+#ifdef TA_BIG_ENDIAN
+const unsigned char suBERemap[16]={
+  0x01, 0x00, 0x02, 0x03, 0x05, 0x04, 0x07, 0x06, 0x08, 0x09, 0x0b, 0x0a, 0x0d, 0x0c, 0x0f, 0x0e
+  0x11, 0x10, 0x12, 0x13, 0x15, 0x14, 0x16, 0x17, 0x19, 0x18, 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e
+};
+#endif
+
 void SoundUnit::Write(unsigned char addr, unsigned char data) {
+#ifdef TA_BIG_ENDIAN
+  // remap
+  addr=(addr&0xe0)|(suBERemap[addr&0x1f]);
+#endif
   ((unsigned char*)chan)[addr]=data;
 }
 

From c3b7350346f4ec5809702ce612abe00fa4b212c0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Wed, 16 Nov 2022 11:07:13 +0100
Subject: [PATCH 19/86] Link against libdl for dlopen

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d79cfffbc..1b6b92df9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -699,11 +699,11 @@ if (WIN32)
   if (NOT MSVC)
     list(APPEND DEPENDENCIES_LIBRARIES -static)
   endif()
-endif()
-
-if (APPLE)
+elseif (APPLE)
   find_library(COCOA Cocoa REQUIRED)
   list(APPEND DEPENDENCIES_LIBRARIES ${COCOA})
+else()
+  list(APPEND DEPENDENCIES_LIBRARIES dl)
 endif()
 
 if (NOT MSVC)

From 6a997fd21f0cb2021c58d50093f74a3e0eacbb25 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Wed, 16 Nov 2022 05:07:41 -0500
Subject: [PATCH 20/86] SoundUnit: fix fix

---
 src/engine/platform/sound/su.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/engine/platform/sound/su.cpp b/src/engine/platform/sound/su.cpp
index 67ee153e6..4d98892cc 100644
--- a/src/engine/platform/sound/su.cpp
+++ b/src/engine/platform/sound/su.cpp
@@ -392,8 +392,8 @@ void SoundUnit::Reset() {
 }
 
 #ifdef TA_BIG_ENDIAN
-const unsigned char suBERemap[16]={
-  0x01, 0x00, 0x02, 0x03, 0x05, 0x04, 0x07, 0x06, 0x08, 0x09, 0x0b, 0x0a, 0x0d, 0x0c, 0x0f, 0x0e
+const unsigned char suBERemap[32]={
+  0x01, 0x00, 0x02, 0x03, 0x05, 0x04, 0x07, 0x06, 0x08, 0x09, 0x0b, 0x0a, 0x0d, 0x0c, 0x0f, 0x0e,
   0x11, 0x10, 0x12, 0x13, 0x15, 0x14, 0x16, 0x17, 0x19, 0x18, 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e
 };
 #endif

From e5bc0c06d8abf278dad1ea4006b81e4f499f48c5 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 17 Nov 2022 16:53:25 -0500
Subject: [PATCH 21/86] improve the new ins format idea

---
 papers/newIns.md | 99 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 35 deletions(-)

diff --git a/papers/newIns.md b/papers/newIns.md
index fcc5f966f..3b7c1991c 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -4,46 +4,75 @@ the main issue with Furnace instrument files is that they are too big, even if t
 
 the aim of this new format is to greatly reduce the size of a resulting instrument.
 
+# header
+
 ```
 size | description
 -----|------------------------------------
-  6  | "FURINS" format magic
+  4  | "FINS" format magic
   2  | format version
-  1  | instrument type
- ??? | feature bits
-  4  | instrument length (if wave/sample bits are on)
+  2  | instrument type
+ ??? | features...
 ```
 
-the "feature bits" field is a variable length bitfield. bit 7 in a byte indicates "read one more byte".
+a feature uses the following format:
 
-the feature bits are:
+```
+size | description
+-----|------------------------------------
+  2  | feature code
+  2  | length of block
+ ??? | data...
+```
 
-- 0: has wavetables
-- 1: has samples
-- 2: has name
-- 3: FM data
-- 4: FM data size (1: 2-op, 0: 4-op)
-- 5: FM data includes OPL/OPZ data
-  - if off, only read an op until ssgEnv.
-  - if on, read everything else.
-- 6: Game Boy data
-- 7: (continue in next byte)
-- 8: C64 data
-- 9: Amiga data
-- 10: standard data (macros)
-- 11: operator macros
-- 12: release points
-- 13: op release points
-- 14: extended op macros
-- 15: (continue in next byte)
-- 16: OPL drums mode data
-- 17: Amiga sample map data
-- 18: Namco 163 data
-- 19: extra macros
-- 20: FDS data
-- 21: OPZ data
-- 22: wavetable synth data
-- 23: (continue in next byte)
-- 24: additional macro modes
-- 25: extra C64 data
-- 26: MultiPCM data
+the following feature codes are recognized:
+
+- `FM`: FM ins data
+- `MA`: macro data
+- `64`: C64 ins data
+- `GB`: Game Boy ins data
+- `SM`: sample ins data
+- `O1`: operator 1 macros
+- `O2`: operator 2 macros
+- `O3`: operator 3 macros
+- `O4`: operator 4 macros
+- `LD`: OPL drums mode data
+- `SN`: SNES ins data
+- `N1`: Namco 163 ins data
+- `FD`: FDS ins data
+- `WS`: wavetable synth data
+- `SL`: list of samples
+- `WL`: list of wavetables
+- `MP`: MultiPCM ins data
+- `SU`: Sound Unit ins data
+- `ES`: ES5506 ins data
+
+# FM data (FM)
+
+```
+size | description
+-----|------------------------------------
+  1  | operator count
+-----|------------------------------------
+     | **base data**
+     | /7 6 5 4 3 2 1 0|
+  1  | |x| ALG |x| FB  |
+  1  | |FMS2 |AMS| FMS |
+  1  | |AM2|4| LLPatch |
+  1  | |KV4|KV3|KV2|KV1|
+-----|------------------------------------
+     | **operator data × opCount**
+     | /7 6 5 4 3 2 1 0|
+  1  | |r| D T |  MULT |
+     |  \- KSR
+  1  | |s|     T L     |
+     |  \- SUS
+  1  | |R S|v|   A R   |
+     |      \- VIB
+  1  | |A|KSL|   D R   |
+     |  \- AM
+  1  | |e|x|     D2R   |
+     |  \- EGT
+  1  | |  S L  |  R R  |
+  1  | |  DVB  |  SSG  |
+  1  | | DAM |   W S   |

From afcc292c0cb770c9c900c79050f7989f51ce5769 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 17 Nov 2022 18:40:58 -0500
Subject: [PATCH 22/86] remove mode from DivInstrument already

---
 src/engine/instrument.cpp | 1 -
 src/engine/instrument.h   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index fe420bd58..2b7112383 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -677,7 +677,6 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
 
   reader.readS(); // format version. ignored.
   type=(DivInstrumentType)reader.readC();
-  mode=(type==DIV_INS_FM);
   reader.readC();
   name=reader.readString();
 
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 7a03e569b..7afa9f93a 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -550,7 +550,6 @@ struct DivInstrumentSNES {
 
 struct DivInstrument {
   String name;
-  bool mode;
   DivInstrumentType type;
   DivInstrumentFM fm;
   DivInstrumentSTD std;

From dbcd7f31a879334471e4e02e473921a0ddd6120a Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 17 Nov 2022 19:07:40 -0500
Subject: [PATCH 23/86] prepare for implementing new ins format

---
 papers/newIns.md          | 60 +++++++++++++++++++++++++++++++++++++++
 src/engine/instrument.cpp | 12 ++++++++
 src/engine/instrument.h   |  6 ++++
 3 files changed, 78 insertions(+)

diff --git a/papers/newIns.md b/papers/newIns.md
index 3b7c1991c..d0967205b 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -27,6 +27,7 @@ size | description
 
 the following feature codes are recognized:
 
+- `NA`: instrument name
 - `FM`: FM ins data
 - `MA`: macro data
 - `64`: C64 ins data
@@ -76,3 +77,62 @@ size | description
   1  | |  S L  |  R R  |
   1  | |  DVB  |  SSG  |
   1  | | DAM |   W S   |
+```
+
+# macro data (MA)
+
+```
+size | description
+-----|------------------------------------
+  2  | length of macro header
+ ??? | data...
+```
+
+each macro is represented like this:
+
+```
+size | description
+-----|------------------------------------
+  1  | macro code
+     | - 0: vol
+     | - 1: arp
+     | - 2: duty
+     | - 3: wave
+     | - 4: pitch
+     | - 5: ex1
+     | - 6: ex2
+     | - 7: ex3
+     | - 8: alg
+     | - 9: fb
+     | - 10: fms
+     | - 11: ams
+     | - 12: panL
+     | - 13: panR
+     | - 14: phaseReset
+     | - 15: ex4
+     | - 16: ex5
+     | - 17: ex6
+     | - 17: ex7
+     | - 18: ex8
+     | - 255: stop reading and move on
+  1  | macro length
+  1  | macro loop
+  1  | macro release
+  1  | macro mode
+  1  | macro open/type/word size
+     | - bit 6-7: word size
+     |   - 0: 8-bit unsigned
+     |   - 1: 8-bit signed
+     |   - 2: 16-bit signed
+     |   - 3: 32-bit signed
+     | - bit 1-2: type
+     |   - 0: normal
+     |   - 1: ADSR
+     |   - 2: LFO
+     | - bit 0: open
+  1  | macro delay
+  1  | macro speed
+ ??? | macro data
+     | - length: macro length × word sizs
+```
+
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 2b7112383..6a687627b 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -23,6 +23,18 @@
 #include "../ta-log.h"
 #include "../fileutils.h"
 
+void DivInstrument::putInsData2(SafeWriter* w, bool fui) {
+  size_t blockStartSeek, blockEndSeek;
+
+  if (fui) {
+    w->write("FINS",4);
+  } else {
+    w->write("INST",4);
+    blockStartSeek=w->tell();
+    w->writeI(0);
+  }
+}
+
 void DivInstrument::putInsData(SafeWriter* w) {
   size_t blockStartSeek, blockEndSeek;
 
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 7afa9f93a..0f434181c 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -571,6 +571,12 @@ struct DivInstrument {
    */
   void putInsData(SafeWriter* w);
 
+  /**
+   * save the instrument to a SafeWriter using new format.
+   * @param w the SafeWriter in question.
+   */
+  void putInsData2(SafeWriter* w, bool fui=false);
+
   /**
    * read instrument data in .fui format.
    * @param reader the reader.

From c34ddea60507669e37ee153c147d556d0b99cb3e Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Thu, 17 Nov 2022 23:12:32 -0500
Subject: [PATCH 24/86] unused garbage

---
 src/engine/instrument.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 6a687627b..1689a589b 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -33,6 +33,13 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui) {
     blockStartSeek=w->tell();
     w->writeI(0);
   }
+
+  blockEndSeek=w->tell();
+  if (!fui) {
+    w->seek(blockStartSeek,SEEK_SET);
+    w->writeI(blockEndSeek-blockStartSeek-4);
+  }
+  w->seek(0,SEEK_END);
 }
 
 void DivInstrument::putInsData(SafeWriter* w) {

From a9acba3cb721be8bda39fd3902a2598b738c5391 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Fri, 18 Nov 2022 04:43:22 -0500
Subject: [PATCH 25/86] aaaaaa

---
 src/engine/instrument.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 1689a589b..8cda59171 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -29,11 +29,37 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui) {
   if (fui) {
     w->write("FINS",4);
   } else {
-    w->write("INST",4);
+    w->write("INS2",4);
     blockStartSeek=w->tell();
     w->writeI(0);
   }
 
+  w->writeS(DIV_ENGINE_VERSION);
+  w->writeC(type);
+  w->writeC(0);
+
+  // write features
+  bool featureNA=false;
+  bool featureFM=false;
+  bool featureMA=false;
+  bool feature64=false;
+  bool featureGB=false;
+  bool featureSM=false;
+  bool featureO1=false;
+  bool featureO2=false;
+  bool featureO3=false;
+  bool featureO4=false;
+  bool featureLD=false;
+  bool featureSN=false;
+  bool featureN1=false;
+  bool featureFD=false;
+  bool featureWS=false;
+  bool featureSL=false;
+  bool featureWL=false;
+  bool featureMP=false;
+  bool featureSU=false;
+  bool featureES=false;
+
   blockEndSeek=w->tell();
   if (!fui) {
     w->seek(blockStartSeek,SEEK_SET);

From 78a2218ee11f795dab35ea96399fc9a1788b7c38 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Fri, 18 Nov 2022 22:04:38 -0500
Subject: [PATCH 26/86] this still won't pass CI

---
 CONTRIBUTING.md           | 1 +
 src/engine/instrument.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index afc43c49e..8e4599d9c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,6 +76,7 @@ additional guidelines:
     - I will run a test suite to make sure this is the case.
     - if something breaks, you might want to add a compatibility flag (this requires changing the format though).
 - do not use `#pragma once`.
+- do not memcmp() structs.
 - on a switch block, **always** put `default` last and not in any other position.
   - I have fear of some C/C++ compilers ignoring the rest of cases upon hitting default.
 
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 8cda59171..2c792df04 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -60,6 +60,10 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui) {
   bool featureSU=false;
   bool featureES=false;
 
+  // almost 40 years of C++, and there still isn't a way to easily compare two structs.
+  // even Java, which many regard as having a slow runtime, has .equals().
+  
+
   blockEndSeek=w->tell();
   if (!fui) {
     w->seek(blockStartSeek,SEEK_SET);

From 76c0136a12896bf218195b11054e26695a624f08 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 04:05:52 -0500
Subject: [PATCH 27/86] TODO: The rest

---
 papers/newIns.md          |   3 +-
 src/engine/instrument.cpp | 515 +++++++++++++++++++++++++++++++++++++-
 src/engine/instrument.h   |  97 ++++++-
 3 files changed, 605 insertions(+), 10 deletions(-)

diff --git a/papers/newIns.md b/papers/newIns.md
index d0967205b..425d39ea9 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -40,13 +40,14 @@ the following feature codes are recognized:
 - `LD`: OPL drums mode data
 - `SN`: SNES ins data
 - `N1`: Namco 163 ins data
-- `FD`: FDS ins data
+- `FD`: FDS/Virtual Boy ins data
 - `WS`: wavetable synth data
 - `SL`: list of samples
 - `WL`: list of wavetables
 - `MP`: MultiPCM ins data
 - `SU`: Sound Unit ins data
 - `ES`: ES5506 ins data
+- `X1`: X1-010 ins data
 
 # FM data (FM)
 
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 2c792df04..b3e386b79 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -23,7 +23,158 @@
 #include "../ta-log.h"
 #include "../fileutils.h"
 
-void DivInstrument::putInsData2(SafeWriter* w, bool fui) {
+const DivInstrument defaultIns;
+
+void DivInstrument::writeFeatureNA(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureFM(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureMA(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeature64(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureGB(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureSM(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureOx(SafeWriter* w, int op) {
+
+}
+
+void DivInstrument::writeFeatureLD(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureSN(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureN1(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureFD(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureWS(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureSL(SafeWriter* w, const DivSong* song) {
+
+}
+
+void DivInstrument::writeFeatureWL(SafeWriter* w, const DivSong* song) {
+
+}
+
+void DivInstrument::writeFeatureMP(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureSU(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureES(SafeWriter* w) {
+
+}
+
+void DivInstrument::writeFeatureX1(SafeWriter* w) {
+
+}
+
+#define _C(x) x==a.x
+
+bool DivInstrumentFM::operator==(const DivInstrumentFM& a) {
+  return true;
+}
+
+bool DivInstrumentFM::Operator::operator==(const DivInstrumentFM::Operator& a) {
+  return (
+    _C(enable) &&
+    _C(am) &&
+    _C(ar) &&
+    _C(dr) &&
+    _C(mult) &&
+    _C(rr) &&
+    _C(sl) &&
+    _C(tl) &&
+    _C(dt2) &&
+    _C(rs) &&
+    _C(dt) &&
+    _C(d2r) &&
+    _C(ssgEnv) &&
+    _C(dam) &&
+    _C(dvb) &&
+    _C(egt) &&
+    _C(ksl) &&
+    _C(sus) &&
+    _C(vib) &&
+    _C(ws) &&
+    _C(ksr) &&
+    _C(kvs)
+  );
+}
+
+bool DivInstrumentGB::operator==(const DivInstrumentGB& a) {
+  return true;
+}
+
+bool DivInstrumentC64::operator==(const DivInstrumentC64& a) {
+  return true;
+}
+
+bool DivInstrumentAmiga::operator==(const DivInstrumentAmiga& a) {
+  return true;
+}
+
+bool DivInstrumentX1_010::operator==(const DivInstrumentX1_010& a) {
+  return true;
+}
+
+bool DivInstrumentN163::operator==(const DivInstrumentN163& a) {
+  return true;
+}
+
+bool DivInstrumentFDS::operator==(const DivInstrumentFDS& a) {
+  return true;
+}
+
+bool DivInstrumentMultiPCM::operator==(const DivInstrumentMultiPCM& a) {
+  return true;
+}
+
+bool DivInstrumentWaveSynth::operator==(const DivInstrumentWaveSynth& a) {
+  return true;
+}
+
+bool DivInstrumentSoundUnit::operator==(const DivInstrumentSoundUnit& a) {
+  return true;
+}
+
+bool DivInstrumentES5506::operator==(const DivInstrumentES5506& a) {
+  return true;
+}
+
+bool DivInstrumentSNES::operator==(const DivInstrumentSNES& a) {
+  return true;
+}
+
+void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
   size_t blockStartSeek, blockEndSeek;
 
   if (fui) {
@@ -45,10 +196,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui) {
   bool feature64=false;
   bool featureGB=false;
   bool featureSM=false;
-  bool featureO1=false;
-  bool featureO2=false;
-  bool featureO3=false;
-  bool featureO4=false;
+  bool featureOx[4];
   bool featureLD=false;
   bool featureSN=false;
   bool featureN1=false;
@@ -59,10 +207,361 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui) {
   bool featureMP=false;
   bool featureSU=false;
   bool featureES=false;
+  bool featureX1=false;
 
-  // almost 40 years of C++, and there still isn't a way to easily compare two structs.
-  // even Java, which many regard as having a slow runtime, has .equals().
-  
+  bool checkForWL=false;
+
+  featureOx[0]=false;
+  featureOx[1]=false;
+  featureOx[2]=false;
+  featureOx[3]=false;
+
+  // turn on base features if .fui
+  if (fui) {
+    switch (type) {
+      case DIV_INS_STD:
+        break;
+      case DIV_INS_FM:
+        featureFM=true;
+        break;
+      case DIV_INS_GB:
+        featureGB=true;
+        checkForWL=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_C64:
+        feature64=true;
+        break;
+      case DIV_INS_AMIGA:
+        featureSM=true;
+        break;
+      case DIV_INS_PCE:
+        checkForWL=true;
+        featureSM=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_AY:
+        featureSM=true;
+        break;
+      case DIV_INS_AY8930:
+        featureSM=true;
+        break;
+      case DIV_INS_TIA:
+        break;
+      case DIV_INS_SAA1099:
+        break;
+      case DIV_INS_VIC:
+        break;
+      case DIV_INS_PET:
+        break;
+      case DIV_INS_VRC6:
+        featureSM=true;
+        break;
+      case DIV_INS_OPLL:
+        featureFM=true;
+        if (fm.fixedDrums) featureLD=true;
+        break;
+      case DIV_INS_OPL:
+        featureFM=true;
+        if (fm.fixedDrums) featureLD=true;
+        break;
+      case DIV_INS_FDS:
+        checkForWL=true;
+        featureFD=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_VBOY:
+        checkForWL=true;
+        featureFD=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_N163:
+        checkForWL=true;
+        featureN1=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_SCC:
+        checkForWL=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_OPZ:
+        featureFM=true;
+        break;
+      case DIV_INS_POKEY:
+        break;
+      case DIV_INS_BEEPER:
+        break;
+      case DIV_INS_SWAN:
+        checkForWL=true;
+        featureSM=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_MIKEY:
+        featureSM=true;
+        break;
+      case DIV_INS_VERA:
+        break;
+      case DIV_INS_X1_010:
+        checkForWL=true;
+        featureX1=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_VRC6_SAW:
+        break;
+      case DIV_INS_ES5506:
+        featureSM=true;
+        featureES=true;
+        break;
+      case DIV_INS_MULTIPCM:
+        featureSM=true;
+        featureMP=true;
+        break;
+      case DIV_INS_SNES:
+        featureSM=true;
+        featureSN=true;
+        checkForWL=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_SU:
+        featureSM=true;
+        featureSU=true;
+        break;
+      case DIV_INS_NAMCO:
+        checkForWL=true;
+        if (ws.enabled) featureWS=true;
+        break;
+      case DIV_INS_OPL_DRUMS:
+        featureFM=true;
+        if (fm.fixedDrums) featureLD=true;
+        break;
+      case DIV_INS_OPM:
+        featureFM=true;
+        break;
+      case DIV_INS_NES:
+        break;
+      case DIV_INS_MSM6258:
+        featureSM=true;
+        break;
+      case DIV_INS_MSM6295:
+        featureSM=true;
+        break;
+      case DIV_INS_ADPCMA:
+        featureSM=true;
+        break;
+      case DIV_INS_ADPCMB:
+        featureSM=true;
+        break;
+      case DIV_INS_SEGAPCM:
+        featureSM=true;
+        break;
+      case DIV_INS_QSOUND:
+        featureSM=true;
+        break;
+      case DIV_INS_YMZ280B:
+        featureSM=true;
+        break;
+      case DIV_INS_RF5C68:
+        featureSM=true;
+        break;
+      case DIV_INS_MSM5232:
+        break;
+      case DIV_INS_T6W28:
+        break;
+
+      case DIV_INS_MAX:
+        break;
+      case DIV_INS_NULL:
+        break;
+    }
+  } else {
+    // turn on features depending on what is set
+    // almost 40 years of C++, and there still isn't an official way to easily compare two structs.
+    // even Java, which many regard as having a slow runtime, has .equals().
+    if (fm!=defaultIns.fm) {
+      featureFM=true;
+      featureLD=true;
+    }
+    if (c64!=defaultIns.c64) {
+      feature64=true;
+    }
+    if (gb!=defaultIns.gb) {
+      featureGB=true;
+    }
+    if (amiga!=defaultIns.amiga) {
+      featureSM=true;
+    }
+    if (snes!=defaultIns.snes) {
+      featureSN=true;
+    }
+    if (n163!=defaultIns.n163) {
+      featureN1=true;
+    }
+    if (fds!=defaultIns.fds) {
+      featureFD=true;
+    }
+    if (ws!=defaultIns.ws) {
+      featureWS=true;
+    }
+    if (multipcm!=defaultIns.multipcm) {
+      featureMP=true;
+    }
+    if (su!=defaultIns.su) {
+      featureSU=true;
+    }
+    if (es5506!=defaultIns.es5506) {
+      featureES=true;
+    }
+    if (x1_010!=defaultIns.x1_010) {
+      featureX1=true;
+    }
+  }
+
+  // check ins name
+  if (!name.empty()) {
+    featureNA=true;
+  }
+
+  // check macros
+  if (std.volMacro.len ||
+      std.arpMacro.len ||
+      std.dutyMacro.len ||
+      std.waveMacro.len ||
+      std.pitchMacro.len ||
+      std.ex1Macro.len ||
+      std.ex2Macro.len ||
+      std.ex3Macro.len ||
+      std.algMacro.len ||
+      std.fbMacro.len ||
+      std.fmsMacro.len ||
+      std.amsMacro.len ||
+      std.panLMacro.len ||
+      std.panRMacro.len ||
+      std.phaseResetMacro.len ||
+      std.ex4Macro.len ||
+      std.ex5Macro.len ||
+      std.ex6Macro.len ||
+      std.ex7Macro.len ||
+      std.ex8Macro.len) {
+    featureMA=true;
+  }
+
+  // check whether to write wavetable list
+  if (checkForWL && fui) {
+    if (std.waveMacro.len || ws.enabled) {
+      featureWL=true;
+    }
+  }
+
+  if (featureFM) {
+    // check FM macros
+    int opCount=4;
+    bool storeExtendedAsWell=true;
+    if (fui) {
+      if (type==DIV_INS_OPLL) {
+        opCount=2;
+      } else if (type==DIV_INS_OPL) {
+        opCount=(fm.ops==4)?4:2;
+      } else if (type==DIV_INS_FM || type==DIV_INS_OPM) {
+        storeExtendedAsWell=false;
+      }
+    }
+    for (int i=0; i<opCount; i++) {
+      const DivInstrumentSTD::OpMacro& m=std.opMacros[i];
+      if (m.amMacro.len ||
+          m.arMacro.len ||
+          m.drMacro.len ||
+          m.multMacro.len ||
+          m.rrMacro.len ||
+          m.slMacro.len ||
+          m.tlMacro.len ||
+          m.dt2Macro.len ||
+          m.rsMacro.len ||
+          m.dtMacro.len ||
+          m.d2rMacro.len ||
+          m.ssgMacro.len) {
+        featureOx[i]=true;
+      }
+      if (storeExtendedAsWell) {
+        if (m.damMacro.len ||
+            m.dvbMacro.len ||
+            m.egtMacro.len ||
+            m.kslMacro.len ||
+            m.susMacro.len ||
+            m.vibMacro.len ||
+            m.wsMacro.len ||
+            m.ksrMacro.len) {
+          featureOx[i]=true;
+        }
+      }
+    }
+  }
+
+  // write features
+  if (featureNA) {
+    writeFeatureNA(w);
+  }
+  if (featureFM) {
+    writeFeatureFM(w);
+  }
+  if (featureMA) {
+    writeFeatureMA(w);
+  }
+  if (feature64) {
+    writeFeature64(w);
+  }
+  if (featureGB) {
+    writeFeatureGB(w);
+  }
+  if (featureSM) {
+    writeFeatureSM(w);
+  }
+  for (int i=0; i<4; i++) {
+    if (featureOx[i]) {
+      writeFeatureOx(w,i);
+    }
+  }
+  if (featureLD) {
+    writeFeatureLD(w);
+  }
+  if (featureSN) {
+    writeFeatureSN(w);
+  }
+  if (featureN1) {
+    writeFeatureN1(w);
+  }
+  if (featureFD) {
+    writeFeatureFD(w);
+  }
+  if (featureWS) {
+    writeFeatureWS(w);
+  }
+  if (featureSL) {
+    writeFeatureSL(w,song);
+  }
+  if (featureWL) {
+    writeFeatureWL(w,song);
+  }
+  if (featureMP) {
+    writeFeatureMP(w);
+  }
+  if (featureSU) {
+    writeFeatureSU(w);
+  }
+  if (featureES) {
+    writeFeatureES(w);
+  }
+  if (featureX1) {
+    writeFeatureX1(w);
+  }
+  if (featureNA) {
+    writeFeatureNA(w);
+  }
+  if (featureNA) {
+    writeFeatureNA(w);
+  }
+  if (featureNA) {
+    writeFeatureNA(w);
+  }
 
   blockEndSeek=w->tell();
   if (!fui) {
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 0f434181c..145da66a3 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -23,6 +23,8 @@
 #include "dataErrors.h"
 #include "../ta-utils.h"
 
+class DivSong;
+
 // NOTICE!
 // before adding new instrument types to this struct, please ask me first.
 // absolutely zero support granted to conflicting formats.
@@ -95,11 +97,21 @@ struct DivInstrumentFM {
   unsigned char alg, fb, fms, ams, fms2, ams2, ops, opllPreset;
   bool fixedDrums;
   unsigned short kickFreq, snareHatFreq, tomTopFreq;
+
+  bool operator==(const DivInstrumentFM& a);
+  bool operator!=(const DivInstrumentFM& a) {
+    return !(*this==a);
+  }
   struct Operator {
     bool enable;
     unsigned char am, ar, dr, mult, rr, sl, tl, dt2, rs, dt, d2r, ssgEnv;
     unsigned char dam, dvb, egt, ksl, sus, vib, ws, ksr; // YMU759/OPL/OPZ
     unsigned char kvs;
+
+    bool operator==(const Operator& a);
+    bool operator!=(const Operator& a) {
+      return !(*this==a);
+    }
     Operator():
       enable(true),
       am(0),
@@ -294,6 +306,12 @@ struct DivInstrumentGB {
     unsigned char cmd;
     unsigned short data;
   } hwSeq[256];
+
+  bool operator==(const DivInstrumentGB& a);
+  bool operator!=(const DivInstrumentGB& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentGB():
     envVol(15),
     envDir(0),
@@ -316,6 +334,11 @@ struct DivInstrumentC64 {
   unsigned short cut;
   bool hp, lp, bp, ch3off;
 
+  bool operator==(const DivInstrumentC64& a);
+  bool operator!=(const DivInstrumentC64& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentC64():
     triOn(false),
     sawOn(true),
@@ -357,6 +380,11 @@ struct DivInstrumentAmiga {
   unsigned char waveLen;
   SampleMap noteMap[120];
 
+  bool operator==(const DivInstrumentAmiga& a);
+  bool operator!=(const DivInstrumentAmiga& a) {
+    return !(*this==a);
+  }
+
   /**
    * get the sample at specified note.
    * @return the sample.
@@ -398,6 +426,11 @@ struct DivInstrumentAmiga {
 struct DivInstrumentX1_010 {
   int bankSlot;
 
+  bool operator==(const DivInstrumentX1_010& a);
+  bool operator!=(const DivInstrumentX1_010& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentX1_010():
     bankSlot(0) {}
 };
@@ -406,6 +439,11 @@ struct DivInstrumentN163 {
   int wave, wavePos, waveLen;
   unsigned char waveMode;
 
+  bool operator==(const DivInstrumentN163& a);
+  bool operator!=(const DivInstrumentN163& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentN163():
     wave(-1),
     wavePos(0),
@@ -418,6 +456,12 @@ struct DivInstrumentFDS {
   int modSpeed, modDepth;
   // this is here for compatibility.
   bool initModTableWithFirstWave;
+
+  bool operator==(const DivInstrumentFDS& a);
+  bool operator!=(const DivInstrumentFDS& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentFDS():
     modSpeed(0),
     modDepth(0),
@@ -430,6 +474,11 @@ struct DivInstrumentMultiPCM {
   unsigned char ar, d1r, dl, d2r, rr, rc;
   unsigned char lfo, vib, am;
 
+  bool operator==(const DivInstrumentMultiPCM& a);
+  bool operator!=(const DivInstrumentMultiPCM& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentMultiPCM():
     ar(15), d1r(15), dl(0), d2r(0), rr(15), rc(15),
     lfo(0), vib(0), am(0) {
@@ -468,6 +517,12 @@ struct DivInstrumentWaveSynth {
   unsigned char effect;
   bool oneShot, enabled, global;
   unsigned char speed, param1, param2, param3, param4;
+
+  bool operator==(const DivInstrumentWaveSynth& a);
+  bool operator!=(const DivInstrumentWaveSynth& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentWaveSynth():
     wave1(0),
     wave2(0),
@@ -485,6 +540,12 @@ struct DivInstrumentWaveSynth {
 
 struct DivInstrumentSoundUnit {
   bool switchRoles;
+
+  bool operator==(const DivInstrumentSoundUnit& a);
+  bool operator!=(const DivInstrumentSoundUnit& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentSoundUnit():
     switchRoles(false) {}
 };
@@ -520,6 +581,12 @@ struct DivInstrumentES5506 {
   };
   Filter filter;
   Envelope envelope;
+
+  bool operator==(const DivInstrumentES5506& a);
+  bool operator!=(const DivInstrumentES5506& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentES5506():
     filter(Filter()),
     envelope(Envelope()) {}
@@ -537,6 +604,12 @@ struct DivInstrumentSNES {
   GainMode gainMode;
   unsigned char gain;
   unsigned char a, d, s, r;
+
+  bool operator==(const DivInstrumentSNES& a);
+  bool operator!=(const DivInstrumentSNES& a) {
+    return !(*this==a);
+  }
+
   DivInstrumentSNES():
     useEnv(true),
     sus(false),
@@ -564,6 +637,28 @@ struct DivInstrument {
   DivInstrumentSoundUnit su;
   DivInstrumentES5506 es5506;
   DivInstrumentSNES snes;
+
+  /**
+   * these are internal functions.
+   */
+  void writeFeatureNA(SafeWriter* w);
+  void writeFeatureFM(SafeWriter* w);
+  void writeFeatureMA(SafeWriter* w);
+  void writeFeature64(SafeWriter* w);
+  void writeFeatureGB(SafeWriter* w);
+  void writeFeatureSM(SafeWriter* w);
+  void writeFeatureOx(SafeWriter* w, int op);
+  void writeFeatureLD(SafeWriter* w);
+  void writeFeatureSN(SafeWriter* w);
+  void writeFeatureN1(SafeWriter* w);
+  void writeFeatureFD(SafeWriter* w);
+  void writeFeatureWS(SafeWriter* w);
+  void writeFeatureSL(SafeWriter* w, const DivSong* song);
+  void writeFeatureWL(SafeWriter* w, const DivSong* song);
+  void writeFeatureMP(SafeWriter* w);
+  void writeFeatureSU(SafeWriter* w);
+  void writeFeatureES(SafeWriter* w);
+  void writeFeatureX1(SafeWriter* w);
   
   /**
    * save the instrument to a SafeWriter.
@@ -575,7 +670,7 @@ struct DivInstrument {
    * save the instrument to a SafeWriter using new format.
    * @param w the SafeWriter in question.
    */
-  void putInsData2(SafeWriter* w, bool fui=false);
+  void putInsData2(SafeWriter* w, bool fui=false, const DivSong* song=NULL);
 
   /**
    * read instrument data in .fui format.

From c356e38fa2dc01053514558662ea141b3ca964fa Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 04:21:43 -0500
Subject: [PATCH 28/86] MSVC is better than GCC

---
 src/engine/instrument.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 145da66a3..db9221fcc 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -23,7 +23,7 @@
 #include "dataErrors.h"
 #include "../ta-utils.h"
 
-class DivSong;
+struct DivSong;
 
 // NOTICE!
 // before adding new instrument types to this struct, please ask me first.

From 6bc6a1f2da96411d1fd631829744633fbd5f66d3 Mon Sep 17 00:00:00 2001
From: TheDuccinator <66538032+TheDuccinator@users.noreply.github.com>
Date: Sat, 19 Nov 2022 11:15:40 -0800
Subject: [PATCH 29/86] Add Namco WSG Track

---
 demos/Mars_Bar_On_Mars.fur | Bin 0 -> 2377 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 demos/Mars_Bar_On_Mars.fur

diff --git a/demos/Mars_Bar_On_Mars.fur b/demos/Mars_Bar_On_Mars.fur
new file mode 100644
index 0000000000000000000000000000000000000000..4f0f02e39e602ffcaf9521e856f6cc99e6644b39
GIT binary patch
literal 2377
zcmV-P3AXllob6p(iyTE1{`$6a+1boqaxpRPPDBkx0#VQi3fbI^mrYC-147hgv#7z{
z4V!F0*pL_y1ThlPAPC|O|A4;elMf0$`k?**AN0*v#g|y8yK1_or)#=vrsvYTRqJui
zR9ByK>QsOAb#+g7_8wbZS(=+)s4Xs^Uwva??^OUbgyqD{v6G+KOmSTcxOixqZFNVB
zDD!sTp>>%~C<(jwy*xL!a;bJ`Zl!i|sYW_xUt2h`IzRvV(%j|c71rR7!?10Onp&3F
z$+CWCDSL_K=+`me_I8%4UBK1{fe-fq<;Q`w1Hjlc@HLYs4g$Y0SvUmz$K?IPz<ozp
zYMIO&1zvuNCH@)Utr_5h=YcP0fp5<OKfMV2eh&ES72w}_p!6!R;{x!|BJkuz7WyR?
z!xdopP2l<(aO)cI#SP$_w}Btu0e*WI`12<4&n=+%5wQJZV9zHko=<^iKL^fz74)UC
z*rGV}jT+dF>kV0jLa|gHu8fR~Y^siqjZaK$W@U?S!M5z+|Mcg${Lk~hTii;$Tt5Jj
zO#06id9~>)ZnM9j%*-v$FW1hVIUamHF>_}2W&ya0DV$ikba`cUabf9lZ6AVtS(%zb
z6)Xi#=*zMt$6elDg+1+ep~$7NOvzuWB4+7RE_V_{*cf3_VKU65#NDzSVTcJ!tRE`b
zZy10SCF+ljkgkc;eTnOve#FL?%9q#1{&|+HbE#|J_(}3p^G<m`Sh&LqY7UZ0uR0iC
zS^~CO4Wwmp{EpVmU8@!fO{5zo$$IkvZ%3@W)Xd5c`y2Dd$^~S@$|Rf6$j)>+{WLpU
zrZz({w&Uy@*3GZ4PA9FrN!Gd4wQu|+`7x|J@NBBXy5Bdm?j!!jys>VX3#3oE&>%X}
zr;X+VO|UL8u2>7p>tL}4-pv?z7n6IKkUq)eUMBbR`UiNO!}l+6pF{l9mA<=*SY;sw
zZ<oT`1Kj#%)n5AQbOOwqWSvW0`^Ha_pWHHd6L<}SGX}r0p4QDC*VC|K+<{h&NOavy
zjC~hhKU1NwEvR`R>cgz1^XseAi7aoDbuM-78$U^Ya?8X`#V|2r;=k7m6ElXy7}w*j
zVDCZlfhM!CSWgoR%WG<4`*!aw@0Qqng2^T(%*QnIF<s<R;4-8T74t{?V^}}GzB-*W
z^Cns6QrEumljO&+{=l=j4(nfOX8lL~jd^4JikyI$&W<DbK$GuTM}Ji&*7t((fpquB
zt#)Z6Azn3D);A;e(wF(wSZBG^wQu|+`ROtHwmozC#jtM@`^Nlg>@k01-q^Q@kPXwU
zN#l-i)i1{6b+_=9WZ$fL^XseANh@!XbuM-78$U^Y%$j%L*;I#hFEq36et%=$Shpl6
zAf~fv4m9~bbMzNu;{I|8%_VBftaJ10%V}f(JWJNO)U|K?B>6FnJMc`Jw%yr-FC2Z3
zlp3#?Vlv8PJJ)wI*^FS_M}$XL-CQoD6B`jL(K?Wrijq0b_u0nn>|k;?x3!b&JNWhq
z1nWw&A?}&R21Q1<@|`DnT`QU7ZMX7$MF(7@o5U^Nw#fHYW@;Pn4fS*jucIuC@oo1=
z!EE8ZrECrJwwrnV7_S!r+T8gj$z~bh-R+_(C`h^`)kQz!>ZTI5PonWs!emUl*r4Kq
zNeV=67i~Kk*{%w<Wl(X>TN#WVW6_e7&1hY0P*&tqWw@1NRS>GW#No@LBq6qyD1#D6
z5zjuza}pth&W;7zXnrCn6QT%BgepQEO%F5=2_({#LCB@wszm26f#$Acs*?-}IdyRM
zbSXm0cX%<n(KnnP0wSb+9Rro%c`jDB9}6k!b?vCym+S41_tfv8=}xc$ZpwqIUe}Ip
z-c;kF+pnzbXpe6Qi15mmjzhbi$VP{%dR;ro9X;Mtzk{ZGiUV0yuWLs)Z>n)=|3L1{
zj`sM5fC$f<vT$es(Hq?WB4b?uLcUJYGv`J(`k?6{Alh3)7~SZ-)QLH4RH4^CeZ2&T
zU=2}bROqqI7F<-g?(j#gTRC@eI<ZYJbc&T?77vHVwMlnM5ZGzeCf(xSNwhP_`P9`t
z-rr91@1)3E+EYPsJQva&&mkZh*AV&xqE5g@9uP+w5Km)*>9*c2z&R=MpC*U4=0u{h
zLrkDGjv*j|E*ORgN>&UZ;t2rZww+H^zbc9YCyAN5HC|awNZJRoGXL>;Q0^N7B6t&x
zHpSF+bprA@Aci5@({0WC>*iS(C~25R!4SdghRfU`ok9uc-C&5ac$6V!`;DN}PbALQ
z^Qk_djNU~(1cZ2+O3y%ey?9M=J$g;^zCyb8<v#fxG(Eh-+!(*AUe}Ip-c;kF+pnzb
zXpe6Qh~QZZIwu{1zVks@LzH>^ou9)d=OOJ?4zfdxTi|-0)?~W6mm>dZbX9I0#ki>2
zYv(@%MEKMXZOH3@=<2EizpSWNwO0*@%FcS#J<a~=&i*PuWMy9hMDSvE!w^BqiXke}
z3`H~3`ez6?ll+TZwQ7@&p<Rg~Qsh4b#4sRrBCi9Yt5;$NkS;F74@f1&K*_qw&Uyue
zlL8Q(^w;jPeF+f3OUQ&no8N~>JEL`5-zZn5f~!o``ah)7?|3$x9s*(nqVzo|qZ_?n
zdI$)5FcAK|hXR6gF55rv%GWus$7AmFrvomxlh&`wPKoEUpE>E}c-a}{Evx){nsy{W
zgs(=(A~F5a3wa-qoa<TTO{G^fCzuYdGL8CR&_%e=4MSuLh+gM2DG$+nX4PMnovbD{
zVTaCmO7$}yN1fXc5aQqR=*=K>YrrcR0iv|Q0Fjlh0+4Rr)Z^PTh8XudkoPr&(DQm#
z%3NjYvmOFs0;2RiD5D#_UwQ}#dd*Z&`W}?gjovRk1O&ZvEhv2t%IHS#gFZ}40|5x}
zRwlY%?Vx!l^&@%&rsg&k|Fs42^=@pvt{qkTe8=zj5A&vv-%;476`-m<E`EJG@$Ji+
z`7bN-P*&QH&%eH%`1TSYtR4X(eA_`j0ny#~vjl{r5r19)p^Co?fUpf91|WU|2vMI6
zAk^a(UoQb7xLILq4v4J?+*Tyg_Alqg)$7_(wa<6_o@V@>(oQ@eRPnd6ql&X16Ot<a
vtR^H05Uv5l0K{(qA?mXOM11@BdI=Do0mJ~rZvY|clTVq@g?juCHrFgE0XDj4

literal 0
HcmV?d00001


From 98de4c6ca8cc021764d505cf2d39cf793e261447 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 14:40:41 -0500
Subject: [PATCH 30/86] here are the comparisons

---
 src/engine/instrument.cpp | 160 +++++++++++++++++++++++++++++++-------
 src/engine/instrument.h   |  78 +++++++++----------
 2 files changed, 173 insertions(+), 65 deletions(-)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index b3e386b79..af6721711 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -97,13 +97,30 @@ void DivInstrument::writeFeatureX1(SafeWriter* w) {
 
 }
 
-#define _C(x) x==a.x
+#define _C(x) x==other.x
 
-bool DivInstrumentFM::operator==(const DivInstrumentFM& a) {
-  return true;
+bool DivInstrumentFM::operator==(const DivInstrumentFM& other) {
+  return (
+    _C(alg) &&
+    _C(fb) &&
+    _C(fms) &&
+    _C(ams) &&
+    _C(fms2) &&
+    _C(ams2) &&
+    _C(ops) &&
+    _C(opllPreset) &&
+    _C(fixedDrums) &&
+    _C(kickFreq) &&
+    _C(snareHatFreq) &&
+    _C(tomTopFreq) &&
+    _C(op[0]) &&
+    _C(op[1]) &&
+    _C(op[2]) &&
+    _C(op[3])
+  );
 }
 
-bool DivInstrumentFM::Operator::operator==(const DivInstrumentFM::Operator& a) {
+bool DivInstrumentFM::Operator::operator==(const DivInstrumentFM::Operator& other) {
   return (
     _C(enable) &&
     _C(am) &&
@@ -130,48 +147,139 @@ bool DivInstrumentFM::Operator::operator==(const DivInstrumentFM::Operator& a) {
   );
 }
 
-bool DivInstrumentGB::operator==(const DivInstrumentGB& a) {
-  return true;
+bool DivInstrumentGB::operator==(const DivInstrumentGB& other) {
+  return (
+    _C(envVol) &&
+    _C(envDir) &&
+    _C(envLen) &&
+    _C(soundLen) &&
+    _C(hwSeqLen) &&
+    _C(softEnv) &&
+    _C(alwaysInit)
+  );
 }
 
-bool DivInstrumentC64::operator==(const DivInstrumentC64& a) {
-  return true;
+bool DivInstrumentC64::operator==(const DivInstrumentC64& other) {
+  return (
+    _C(triOn) &&
+    _C(sawOn) &&
+    _C(pulseOn) &&
+    _C(noiseOn) &&
+    _C(a) &&
+    _C(d) &&
+    _C(s) &&
+    _C(r) &&
+    _C(duty) &&
+    _C(ringMod) &&
+    _C(oscSync) &&
+    _C(toFilter) &&
+    _C(volIsCutoff) &&
+    _C(initFilter) &&
+    _C(dutyIsAbs) &&
+    _C(filterIsAbs) &&
+    _C(noTest) &&
+    _C(res) &&
+    _C(cut) &&
+    _C(hp) &&
+    _C(lp) &&
+    _C(bp) &&
+    _C(ch3off)
+  );
 }
 
-bool DivInstrumentAmiga::operator==(const DivInstrumentAmiga& a) {
-  return true;
+bool DivInstrumentAmiga::operator==(const DivInstrumentAmiga& other) {
+  return (
+    _C(initSample) &&
+    _C(useNoteMap) &&
+    _C(useSample) &&
+    _C(useWave) &&
+    _C(waveLen)
+  );
 }
 
-bool DivInstrumentX1_010::operator==(const DivInstrumentX1_010& a) {
-  return true;
+bool DivInstrumentX1_010::operator==(const DivInstrumentX1_010& other) {
+  return _C(bankSlot);
 }
 
-bool DivInstrumentN163::operator==(const DivInstrumentN163& a) {
-  return true;
+bool DivInstrumentN163::operator==(const DivInstrumentN163& other) {
+  return (
+    _C(wave) &&
+    _C(wavePos) &&
+    _C(waveLen) &&
+    _C(waveMode)
+  );
 }
 
-bool DivInstrumentFDS::operator==(const DivInstrumentFDS& a) {
-  return true;
+bool DivInstrumentFDS::operator==(const DivInstrumentFDS& other) {
+  return (
+    (memcmp(modTable,other.modTable,32)==0) &&
+    _C(modSpeed) &&
+    _C(modDepth) &&
+    _C(initModTableWithFirstWave)
+  );
 }
 
-bool DivInstrumentMultiPCM::operator==(const DivInstrumentMultiPCM& a) {
-  return true;
+bool DivInstrumentMultiPCM::operator==(const DivInstrumentMultiPCM& other) {
+  return (
+    _C(ar) &&
+    _C(d1r) &&
+    _C(dl) &&
+    _C(d2r) &&
+    _C(rr) &&
+    _C(rc) &&
+    _C(lfo) &&
+    _C(vib) &&
+    _C(am)
+  );
 }
 
-bool DivInstrumentWaveSynth::operator==(const DivInstrumentWaveSynth& a) {
-  return true;
+bool DivInstrumentWaveSynth::operator==(const DivInstrumentWaveSynth& other) {
+  return (
+    _C(wave1) &&
+    _C(wave2) &&
+    _C(rateDivider) &&
+    _C(effect) &&
+    _C(oneShot) &&
+    _C(enabled) &&
+    _C(global) &&
+    _C(speed) &&
+    _C(param1) &&
+    _C(param2) &&
+    _C(param3) &&
+    _C(param4)
+  );
 }
 
-bool DivInstrumentSoundUnit::operator==(const DivInstrumentSoundUnit& a) {
-  return true;
+bool DivInstrumentSoundUnit::operator==(const DivInstrumentSoundUnit& other) {
+  return _C(switchRoles);
 }
 
-bool DivInstrumentES5506::operator==(const DivInstrumentES5506& a) {
-  return true;
+bool DivInstrumentES5506::operator==(const DivInstrumentES5506& other) {
+  return (
+    _C(filter.mode) &&
+    _C(filter.k1) &&
+    _C(filter.k2) &&
+    _C(envelope.ecount) &&
+    _C(envelope.lVRamp) &&
+    _C(envelope.rVRamp) &&
+    _C(envelope.k1Ramp) &&
+    _C(envelope.k2Ramp) &&
+    _C(envelope.k1Slow) &&
+    _C(envelope.k2Slow)
+  );
 }
 
-bool DivInstrumentSNES::operator==(const DivInstrumentSNES& a) {
-  return true;
+bool DivInstrumentSNES::operator==(const DivInstrumentSNES& other) {
+  return (
+    _C(useEnv) &&
+    _C(sus) &&
+    _C(gainMode) &&
+    _C(gain) &&
+    _C(a) &&
+    _C(d) &&
+    _C(s) &&
+    _C(r)
+  );
 }
 
 void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index db9221fcc..feab69c10 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -98,9 +98,9 @@ struct DivInstrumentFM {
   bool fixedDrums;
   unsigned short kickFreq, snareHatFreq, tomTopFreq;
 
-  bool operator==(const DivInstrumentFM& a);
-  bool operator!=(const DivInstrumentFM& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentFM& other);
+  bool operator!=(const DivInstrumentFM& other) {
+    return !(*this==other);
   }
   struct Operator {
     bool enable;
@@ -108,9 +108,9 @@ struct DivInstrumentFM {
     unsigned char dam, dvb, egt, ksl, sus, vib, ws, ksr; // YMU759/OPL/OPZ
     unsigned char kvs;
 
-    bool operator==(const Operator& a);
-    bool operator!=(const Operator& a) {
-      return !(*this==a);
+    bool operator==(const Operator& other);
+    bool operator!=(const Operator& other) {
+      return !(*this==other);
     }
     Operator():
       enable(true),
@@ -307,9 +307,9 @@ struct DivInstrumentGB {
     unsigned short data;
   } hwSeq[256];
 
-  bool operator==(const DivInstrumentGB& a);
-  bool operator!=(const DivInstrumentGB& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentGB& other);
+  bool operator!=(const DivInstrumentGB& other) {
+    return !(*this==other);
   }
 
   DivInstrumentGB():
@@ -334,9 +334,9 @@ struct DivInstrumentC64 {
   unsigned short cut;
   bool hp, lp, bp, ch3off;
 
-  bool operator==(const DivInstrumentC64& a);
-  bool operator!=(const DivInstrumentC64& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentC64& other);
+  bool operator!=(const DivInstrumentC64& other) {
+    return !(*this==other);
   }
 
   DivInstrumentC64():
@@ -380,9 +380,9 @@ struct DivInstrumentAmiga {
   unsigned char waveLen;
   SampleMap noteMap[120];
 
-  bool operator==(const DivInstrumentAmiga& a);
-  bool operator!=(const DivInstrumentAmiga& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentAmiga& other);
+  bool operator!=(const DivInstrumentAmiga& other) {
+    return !(*this==other);
   }
 
   /**
@@ -426,9 +426,9 @@ struct DivInstrumentAmiga {
 struct DivInstrumentX1_010 {
   int bankSlot;
 
-  bool operator==(const DivInstrumentX1_010& a);
-  bool operator!=(const DivInstrumentX1_010& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentX1_010& other);
+  bool operator!=(const DivInstrumentX1_010& other) {
+    return !(*this==other);
   }
 
   DivInstrumentX1_010():
@@ -439,9 +439,9 @@ struct DivInstrumentN163 {
   int wave, wavePos, waveLen;
   unsigned char waveMode;
 
-  bool operator==(const DivInstrumentN163& a);
-  bool operator!=(const DivInstrumentN163& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentN163& other);
+  bool operator!=(const DivInstrumentN163& other) {
+    return !(*this==other);
   }
 
   DivInstrumentN163():
@@ -457,9 +457,9 @@ struct DivInstrumentFDS {
   // this is here for compatibility.
   bool initModTableWithFirstWave;
 
-  bool operator==(const DivInstrumentFDS& a);
-  bool operator!=(const DivInstrumentFDS& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentFDS& other);
+  bool operator!=(const DivInstrumentFDS& other) {
+    return !(*this==other);
   }
 
   DivInstrumentFDS():
@@ -474,9 +474,9 @@ struct DivInstrumentMultiPCM {
   unsigned char ar, d1r, dl, d2r, rr, rc;
   unsigned char lfo, vib, am;
 
-  bool operator==(const DivInstrumentMultiPCM& a);
-  bool operator!=(const DivInstrumentMultiPCM& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentMultiPCM& other);
+  bool operator!=(const DivInstrumentMultiPCM& other) {
+    return !(*this==other);
   }
 
   DivInstrumentMultiPCM():
@@ -518,9 +518,9 @@ struct DivInstrumentWaveSynth {
   bool oneShot, enabled, global;
   unsigned char speed, param1, param2, param3, param4;
 
-  bool operator==(const DivInstrumentWaveSynth& a);
-  bool operator!=(const DivInstrumentWaveSynth& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentWaveSynth& other);
+  bool operator!=(const DivInstrumentWaveSynth& other) {
+    return !(*this==other);
   }
 
   DivInstrumentWaveSynth():
@@ -541,9 +541,9 @@ struct DivInstrumentWaveSynth {
 struct DivInstrumentSoundUnit {
   bool switchRoles;
 
-  bool operator==(const DivInstrumentSoundUnit& a);
-  bool operator!=(const DivInstrumentSoundUnit& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentSoundUnit& other);
+  bool operator!=(const DivInstrumentSoundUnit& other) {
+    return !(*this==other);
   }
 
   DivInstrumentSoundUnit():
@@ -582,9 +582,9 @@ struct DivInstrumentES5506 {
   Filter filter;
   Envelope envelope;
 
-  bool operator==(const DivInstrumentES5506& a);
-  bool operator!=(const DivInstrumentES5506& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentES5506& other);
+  bool operator!=(const DivInstrumentES5506& other) {
+    return !(*this==other);
   }
 
   DivInstrumentES5506():
@@ -605,9 +605,9 @@ struct DivInstrumentSNES {
   unsigned char gain;
   unsigned char a, d, s, r;
 
-  bool operator==(const DivInstrumentSNES& a);
-  bool operator!=(const DivInstrumentSNES& a) {
-    return !(*this==a);
+  bool operator==(const DivInstrumentSNES& other);
+  bool operator!=(const DivInstrumentSNES& other) {
+    return !(*this==other);
   }
 
   DivInstrumentSNES():

From ae7382f7a96077576a0f75e8d391fc84cbd7b024 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 18:13:17 -0500
Subject: [PATCH 31/86] new ins format, part 1

---
 papers/newIns.md          | 310 +++++++++++++++++++++++++++++++++++++-
 src/engine/instrument.cpp | 294 ++++++++++++++++++++++++++----------
 src/engine/instrument.h   |   7 +-
 3 files changed, 519 insertions(+), 92 deletions(-)

diff --git a/papers/newIns.md b/papers/newIns.md
index 425d39ea9..8152bd841 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -48,20 +48,34 @@ the following feature codes are recognized:
 - `SU`: Sound Unit ins data
 - `ES`: ES5506 ins data
 - `X1`: X1-010 ins data
+- `EN`: end of features
+  - if you find this feature code, stop reading the instrument.
+  - it will usually appear only when there sample/wave lists.
+
+# instrument name (NA)
+
+```
+size | description
+-----|------------------------------------
+ STR | instrument name
+```
 
 # FM data (FM)
 
 ```
 size | description
 -----|------------------------------------
-  1  | operator count
+  1  | flags
+     | - bit 4-7: op enabled
+     |   - op order from 4 to 7: 0, 2, 1, 3
+     |   - 2-op instruments: 0, 1, x, x
+     | - bit 0-3: op count
 -----|------------------------------------
      | **base data**
      | /7 6 5 4 3 2 1 0|
   1  | |x| ALG |x| FB  |
   1  | |FMS2 |AMS| FMS |
   1  | |AM2|4| LLPatch |
-  1  | |KV4|KV3|KV2|KV1|
 -----|------------------------------------
      | **operator data × opCount**
      | /7 6 5 4 3 2 1 0|
@@ -73,11 +87,11 @@ size | description
      |      \- VIB
   1  | |A|KSL|   D R   |
      |  \- AM
-  1  | |e|x|     D2R   |
+  1  | |e|KVS|   D2R   |
      |  \- EGT
   1  | |  S L  |  R R  |
   1  | |  DVB  |  SSG  |
-  1  | | DAM |   W S   |
+  1  | | DAM |DT2| W S |
 ```
 
 # macro data (MA)
@@ -113,8 +127,8 @@ size | description
      | - 15: ex4
      | - 16: ex5
      | - 17: ex6
-     | - 17: ex7
-     | - 18: ex8
+     | - 18: ex7
+     | - 19: ex8
      | - 255: stop reading and move on
   1  | macro length
   1  | macro loop
@@ -137,3 +151,287 @@ size | description
      | - length: macro length × word sizs
 ```
 
+# C64 data (64)
+
+```
+size | description
+-----|------------------------------------
+  1  | flags 1
+     | - bit 7: dutyIsAbs
+     | - bit 6: initFter
+     | - bit 5: volIsCutoff
+     | - bit 4: toFilter
+     | - bit 3: noise on
+     | - bit 2: pulse on
+     | - bit 1: saw on
+     | - bit 0: triangle on
+  1  | flags 2
+     | - bit 7: oscSync
+     | - bit 6: ringMod
+     | - bit 5: noTest
+     | - bit 4: filterIsAbs
+     | - bit 3: ch3off
+     | - bit 2: band pass
+     | - bit 1: high pass
+     | - bit 0: low pass
+  1  | attack/decay
+     | - bit 4-7: attack
+     | - bit 0-3: decay
+  1  | sustain release
+     | - bit 4-7: sustain
+     | - bit 0-3: release
+  2  | duty
+  2  | cutoff/resonance
+     | - bit 12-15: resonance
+     | - bit 0-10: cutoff
+```
+
+# Game Boy data (GB)
+
+```
+size | description
+-----|------------------------------------
+  1  | envelope params
+     | - bit 5-7: length
+     | - bit 4: direction
+     | - bit 0-3: volume
+  1  | sound length
+     | - 64 is infinity
+  1  | flags
+     | - bit 1: always init envelope
+     | - bit 0: software envelope (zombie mode)
+  1  | hardware sequence length
+ ??? | hardware sequence...
+     | - length: 3*hwSeqLen
+```
+
+a value in the hardware sequence has the following format:
+
+```
+size | description
+-----|------------------------------------
+  1  | command
+     | - 0: set envelope
+     | - 1: set sweep
+     | - 2: wait
+     | - 3: wait for release
+     | - 4: loop
+     | - 5: loop until release
+  2  | data
+     | - for set envelope:
+     |   - 1 byte: parameter
+     |     - bit 4-7: volume
+     |     - bit 3: direction
+     |     - bit 0-2: length
+     |   - 1 byte: sound length
+     | - for set sweep:
+     |   - 1 byte: parameter
+     |     - bit 4-6: length
+     |     - bit 3: direction
+     |     - bit 0-2: shift
+     |   - 1 byte: nothing
+     | - for wait:
+     |   - 1 byte: length (in ticks)
+     |   - 1 byte: nothing
+     | - for wait for release:
+     |   - 2 bytes: nothing
+     | - for loop/loop until release:
+     |   - 2 bytes: position
+```
+
+# sample ins data (SM)
+
+```
+size | description
+-----|------------------------------------
+  2  | initial sample
+  1  | flags
+     | - bit 2: use wave
+     | - bit 1: use sample
+     | - bit 0: use sample map
+  1  | waveform length
+ 4?? | sample map... (120 entries)
+     | - only read if sample map is enabled
+```
+
+the sample map format:
+
+```
+size | description
+-----|------------------------------------
+  2  | note to play
+  2  | sample to play
+```
+
+# operator macro data (O1, O2, O3 and O4)
+
+similar to macro data, but using these macro codes:
+
+- 0: AM
+- 1: AR
+- 2: DR
+- 3: MULT
+- 4: RR
+- 5: SL
+- 6: TL
+- 7: DT2
+- 8: RS
+- 9: DT
+- 10: D2R
+- 11: SSG-EG
+- 12: DAM
+- 13: DVB
+- 14: EGT
+- 15: KSL
+- 16: SUS
+- 17: VIB
+- 18: WS
+- 19: KSR
+
+# OPL drums mode data (LD)
+
+```
+size | description
+-----|------------------------------------
+  1  | fixed frequency mode
+  2  | kick freq
+  2  | snare/hat freq
+  2  | tom/top freq
+```
+
+# SNES data (SN)
+
+```
+size | description
+-----|------------------------------------
+  1  | attack/decay
+     | - bit 4-6: decay
+     | - bit 0-3: attack
+  1  | sustain/release
+     | - bit 5-6: sustain
+     | - bit 0-4: release
+  1  | flags
+     | - bit 4: envelope on
+     | - bit 3: make sustain effective
+     | - bit 0-2: gain mode
+     |   - 0: direct
+     |   - 4: dec
+     |   - 5: exp
+     |   - 6: inc
+     |   - 7: bent
+  1  | gain
+```
+
+# Namco 163 data (N1)
+
+```
+size | description
+-----|------------------------------------
+  4  | waveform
+  1  | wave pos
+  1  | wave len
+  1  | wave mode
+```
+
+# FDS/Virtual Boy data (FD)
+
+```
+size | description
+-----|------------------------------------
+  4  | mod speed
+  4  | mod depth
+  1  | init mod table with first wave
+ 1?? | modulation table (32 entries)
+```
+
+# wavetable synth data (WS)
+
+```
+size | description
+-----|------------------------------------
+  4  | first wave
+  4  | second wave
+  1  | rate divider
+  1  | effect
+     | - bit 7: single or dual effect
+  1  | enabled
+  1  | global
+  1  | speed (+1)
+  1  | parameter 1
+  1  | parameter 2
+  1  | parameter 3
+  1  | parameter 4
+```
+
+# list of samples (SL)
+
+```
+size | description
+-----|------------------------------------
+  1  | number of samples
+ 4?? | pointers to samples...
+     | - these use the Furnace sample format.
+```
+
+# list of wavetables (WL)
+
+```
+size | description
+-----|------------------------------------
+  1  | number of wavetables
+ 4?? | pointers to wavetables...
+     | - these use the Furnace wavetable format.
+```
+
+# MultiPCM data (MP)
+
+```
+size | description
+-----|------------------------------------
+  1  | attack rate
+  1  | decay 1 rate
+  1  | decay level
+  1  | decay 2 rate
+  1  | release rate
+  1  | rate correction
+  1  | LFO rate
+  1  | vibrato depth
+  1  | AM depth
+```
+
+# Sound Unit data (SU)
+
+```
+size | description
+-----|------------------------------------
+  1  | switch roles of phase reset timer and frequency
+```
+
+# ES5506 data (ES)
+
+```
+size | description
+-----|------------------------------------
+  1  | filter mode
+     | - 0: HPK2_HPK2
+     | - 1: HPK2_LPK1
+     | - 2: LPK2_LPK2
+     | - 3: LPK2_LPK1
+  2  | K1
+  2  | K2
+  2  | envelope count
+  1  | left volume ramp
+  1  | right volume ramp
+  1  | K1 ramp
+  1  | K2 ramp
+  1  | K1 slow
+  1  | K2 slow
+```
+
+# X1-010 data (X1)
+
+```
+size | description
+-----|------------------------------------
+  4  | bank slot
+```
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index af6721711..9815370a1 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -25,78 +25,6 @@
 
 const DivInstrument defaultIns;
 
-void DivInstrument::writeFeatureNA(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureFM(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureMA(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeature64(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureGB(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureSM(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureOx(SafeWriter* w, int op) {
-
-}
-
-void DivInstrument::writeFeatureLD(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureSN(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureN1(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureFD(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureWS(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureSL(SafeWriter* w, const DivSong* song) {
-
-}
-
-void DivInstrument::writeFeatureWL(SafeWriter* w, const DivSong* song) {
-
-}
-
-void DivInstrument::writeFeatureMP(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureSU(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureES(SafeWriter* w) {
-
-}
-
-void DivInstrument::writeFeatureX1(SafeWriter* w) {
-
-}
-
 #define _C(x) x==other.x
 
 bool DivInstrumentFM::operator==(const DivInstrumentFM& other) {
@@ -282,8 +210,212 @@ bool DivInstrumentSNES::operator==(const DivInstrumentSNES& other) {
   );
 }
 
+#undef _C
+
+#define FEATURE_BEGIN(x) \
+  w->write(x,2); \
+  size_t featStartSeek=w->tell(); \
+  w->writeS(0);
+
+#define FEATURE_END \
+  size_t featEndSeek=w->tell(); \
+  w->seek(featStartSeek,SEEK_SET); \
+  w->writeS(featEndSeek-featStartSeek-2); \
+  w->seek(featEndSeek,SEEK_SET);
+
+void DivInstrument::writeFeatureNA(SafeWriter* w) {
+  FEATURE_BEGIN("NA");
+
+  w->writeString(name,false);
+
+  FEATURE_END;
+}
+
+void DivInstrument::writeFeatureFM(SafeWriter* w, bool fui) {
+  FEATURE_BEGIN("FM");
+
+  int opCount=4;
+  if (fui) {
+    if (type==DIV_INS_OPLL) {
+      opCount=2;
+    } else if (type==DIV_INS_OPL) {
+      opCount=(fm.ops==4)?4:2;
+    }
+  }
+  
+  w->writeC(
+    (fm.op[3].enable?128:0)|
+    (fm.op[2].enable?64:0)|
+    (fm.op[1].enable?32:0)|
+    (fm.op[0].enable?16:0)|
+    opCount
+  );
+
+  // base data
+  w->writeC(((fm.alg&7)<<4)|(fm.fb&7));
+  w->writeC(((fm.fms2&7)<<5)|((fm.ams&3)<<3)|(fm.fms&7));
+  w->writeC(((fm.ams2&3)<<6)|((fm.ops==4)?32:0)|(fm.opllPreset&31));
+
+  // operator data
+  for (int i=0; i<opCount; i++) {
+    DivInstrumentFM::Operator& op=fm.op[i];
+
+    w->writeC((op.ksr?128:0)|((op.dt&7)<<4)|(op.mult&15));
+    w->writeC((op.sus?128:0)|(op.tl&127));
+    w->writeC(((op.rs&3)<<6)|(op.vib?32:0)|(op.ar&31));
+    w->writeC((op.am?128:0)|((op.ksl&3)<<5)|(op.dr&31));
+    w->writeC((op.egt?128:0)|((op.kvs&3)<<5)|(op.d2r&31));
+    w->writeC(((op.sl&15)<<4)|(op.rr&15));
+    w->writeC(((op.dvb&15)<<4)|(op.ssgEnv&15));
+    w->writeC(((op.dam&7)<<5)|((op.dt2&3)<<3)|(op.ws&7));
+  }
+
+  FEATURE_END;
+}
+
+void DivInstrument::writeMacro(SafeWriter* w, const DivInstrumentMacro& m, unsigned char macroCode) {
+  if (!m.len) return;
+
+  // determine word size
+  int macroMin=0x7fffffff;
+  int macroMax=0x80000000;
+  for (int i=0; i<m.len; i++) {
+    if (m.val[i]<macroMin) macroMin=m.val[i];
+    if (m.val[i]>macroMax) macroMax=m.val[i];
+  }
+
+  unsigned char wordSize=192; // 32-bit
+
+  if (macroMin>=0 && macroMax<=255) {
+    wordSize=0; // 8-bit unsigned
+  } else if (macroMin>=-128 && macroMax<=127) {
+    wordSize=64; // 8-bit signed
+  } else if (macroMin>=-32768 && macroMax<=32767) {
+    wordSize=128; // 16-bit signed
+  } else {
+    wordSize=192; // 32-bit signed
+  }
+
+  w->writeC(macroCode);
+  w->writeC(m.len);
+  w->writeC(m.loop);
+  w->writeC(m.rel);
+  w->writeC(m.mode);
+  w->writeC(m.open|wordSize);
+  w->writeC(m.delay);
+  w->writeC(m.speed);
+
+  switch (wordSize) {
+    case 0:
+      for (int i=0; i<m.len; i++) {
+        w->writeC((unsigned char)m.val[i]);
+      }
+      break;
+    case 64:
+      for (int i=0; i<m.len; i++) {
+        w->writeC((signed char)m.val[i]);
+      }
+      break;
+    case 128:
+      for (int i=0; i<m.len; i++) {
+        w->writeS((short)m.val[i]);
+      }
+      break;
+    default: // 192
+      for (int i=0; i<m.len; i++) {
+        w->writeI(m.val[i]);
+      }
+      break;
+  }
+}
+
+void DivInstrument::writeFeatureMA(SafeWriter* w) {
+  FEATURE_BEGIN("MA");
+
+  // if you update the macro header, please update this value as well.
+  // it's the length.
+  w->writeS(8);
+  
+  // write macros
+  writeMacro(w,std.volMacro,0);
+  writeMacro(w,std.arpMacro,1);
+  writeMacro(w,std.dutyMacro,2);
+  writeMacro(w,std.waveMacro,3);
+  writeMacro(w,std.pitchMacro,4);
+  writeMacro(w,std.ex1Macro,5);
+  writeMacro(w,std.ex2Macro,6);
+  writeMacro(w,std.ex3Macro,7);
+  writeMacro(w,std.algMacro,8);
+  writeMacro(w,std.fbMacro,9);
+  writeMacro(w,std.fmsMacro,10);
+  writeMacro(w,std.amsMacro,11);
+  writeMacro(w,std.panLMacro,12);
+  writeMacro(w,std.panRMacro,13);
+  writeMacro(w,std.phaseResetMacro,14);
+  writeMacro(w,std.ex4Macro,15);
+  writeMacro(w,std.ex5Macro,16);
+  writeMacro(w,std.ex6Macro,17);
+  writeMacro(w,std.ex7Macro,18);
+  writeMacro(w,std.ex8Macro,19);
+
+  // "stop reading" code
+  w->writeC(255);
+
+  FEATURE_END;
+}
+
+void DivInstrument::writeFeature64(SafeWriter* w) {
+  FEATURE_BEGIN("64");
+
+  FEATURE_END;
+}
+
+void DivInstrument::writeFeatureGB(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureSM(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureOx(SafeWriter* w, int op) {
+}
+
+void DivInstrument::writeFeatureLD(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureSN(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureN1(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureFD(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureWS(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureSL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
+}
+
+void DivInstrument::writeFeatureWL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
+}
+
+void DivInstrument::writeFeatureMP(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureSU(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureES(SafeWriter* w) {
+}
+
+void DivInstrument::writeFeatureX1(SafeWriter* w) {
+}
+
 void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
   size_t blockStartSeek, blockEndSeek;
+  std::vector<int> waveList;
+  std::vector<int> sampleList;
 
   if (fui) {
     w->write("FINS",4);
@@ -609,7 +741,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
     writeFeatureNA(w);
   }
   if (featureFM) {
-    writeFeatureFM(w);
+    writeFeatureFM(w,fui);
   }
   if (featureMA) {
     writeFeatureMA(w);
@@ -644,10 +776,10 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
     writeFeatureWS(w);
   }
   if (featureSL) {
-    writeFeatureSL(w,song);
+    writeFeatureSL(w,sampleList,song);
   }
   if (featureWL) {
-    writeFeatureWL(w,song);
+    writeFeatureWL(w,waveList,song);
   }
   if (featureMP) {
     writeFeatureMP(w);
@@ -661,14 +793,10 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
   if (featureX1) {
     writeFeatureX1(w);
   }
-  if (featureNA) {
-    writeFeatureNA(w);
-  }
-  if (featureNA) {
-    writeFeatureNA(w);
-  }
-  if (featureNA) {
-    writeFeatureNA(w);
+
+  if (fui && (featureSL || featureWL)) {
+    w->write("EN",2);
+    // TODO: write wave/sample data here
   }
 
   blockEndSeek=w->tell();
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index feab69c10..3cf65b63c 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -641,8 +641,9 @@ struct DivInstrument {
   /**
    * these are internal functions.
    */
+  void writeMacro(SafeWriter* w, const DivInstrumentMacro& m, unsigned char macroCode);
   void writeFeatureNA(SafeWriter* w);
-  void writeFeatureFM(SafeWriter* w);
+  void writeFeatureFM(SafeWriter* w, bool fui);
   void writeFeatureMA(SafeWriter* w);
   void writeFeature64(SafeWriter* w);
   void writeFeatureGB(SafeWriter* w);
@@ -653,8 +654,8 @@ struct DivInstrument {
   void writeFeatureN1(SafeWriter* w);
   void writeFeatureFD(SafeWriter* w);
   void writeFeatureWS(SafeWriter* w);
-  void writeFeatureSL(SafeWriter* w, const DivSong* song);
-  void writeFeatureWL(SafeWriter* w, const DivSong* song);
+  void writeFeatureSL(SafeWriter* w, std::vector<int>& list, const DivSong* song);
+  void writeFeatureWL(SafeWriter* w, std::vector<int>& list, const DivSong* song);
   void writeFeatureMP(SafeWriter* w);
   void writeFeatureSU(SafeWriter* w);
   void writeFeatureES(SafeWriter* w);

From 3ba90e6896aeaee2f5fbbe12fdf798d6e60c6ff2 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 18:16:19 -0500
Subject: [PATCH 32/86] new ins format, part 2

---
 src/engine/instrument.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 9815370a1..566e918b4 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -359,7 +359,7 @@ void DivInstrument::writeFeatureMA(SafeWriter* w) {
   writeMacro(w,std.ex8Macro,19);
 
   // "stop reading" code
-  w->writeC(255);
+  w->writeC(-1);
 
   FEATURE_END;
 }

From da1560b1c23e4f345fcabfed7d0e45eb50b61a0c Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 18:51:32 -0500
Subject: [PATCH 33/86] new ins format, part 3

---
 papers/newIns.md          |   2 +-
 src/engine/instrument.cpp | 113 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/papers/newIns.md b/papers/newIns.md
index 8152bd841..2250f0623 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -158,7 +158,7 @@ size | description
 -----|------------------------------------
   1  | flags 1
      | - bit 7: dutyIsAbs
-     | - bit 6: initFter
+     | - bit 6: initFilter
      | - bit 5: volIsCutoff
      | - bit 4: toFilter
      | - bit 3: noise on
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 566e918b4..3a64a58d1 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -367,19 +367,128 @@ void DivInstrument::writeFeatureMA(SafeWriter* w) {
 void DivInstrument::writeFeature64(SafeWriter* w) {
   FEATURE_BEGIN("64");
 
+  w->writeC(
+    (c64.dutyIsAbs?0x80:0)|
+    (c64.initFilter?0x40:0)|
+    (c64.volIsCutoff?0x20:0)|
+    (c64.toFilter?0x10:0)|
+    (c64.noiseOn?8:0)|
+    (c64.pulseOn?4:0)|
+    (c64.sawOn?2:0)|
+    (c64.triOn?1:0)
+  );
+
+  w->writeC(
+    (c64.oscSync?0x80:0)|
+    (c64.ringMod?0x40:0)|
+    (c64.noTest?0x20:0)|
+    (c64.filterIsAbs?0x10:0)|
+    (c64.ch3off?8:0)|
+    (c64.bp?4:0)|
+    (c64.hp?2:0)|
+    (c64.lp?1:0)
+  );
+
+  w->writeC(((c64.a&15)<<4)|(c64.d&15));
+  w->writeC(((c64.s&15)<<4)|(c64.r&15));
+  w->writeS(c64.duty);
+  w->writeS((unsigned short)((c64.cut&2047)|(c64.res<<12)));
+
   FEATURE_END;
 }
 
 void DivInstrument::writeFeatureGB(SafeWriter* w) {
+  FEATURE_BEGIN("GB");
+
+  w->writeC(((gb.envLen&7)<<5)|(gb.envDir?16:0)|(gb.envVol&15));
+  w->writeC(gb.soundLen);
+
+  w->writeC(
+    (gb.alwaysInit?2:0)|
+    (gb.softEnv?1:0)
+  );
+
+  w->writeC(gb.hwSeqLen);
+  for (int i=0; i<gb.hwSeqLen; i++) {
+    w->writeC(gb.hwSeq[i].cmd);
+    w->writeS(gb.hwSeq[i].data);
+  }
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureSM(SafeWriter* w) {
+  FEATURE_BEGIN("SM");
+
+  w->writeS(amiga.initSample);
+  w->writeC(
+    (amiga.useWave?4:0)|
+    (amiga.useSample?2:0)|
+    (amiga.useNoteMap?1:0)
+  );
+  w->writeC(amiga.waveLen);
+
+  if (amiga.useNoteMap) {
+    for (int note=0; note<120; note++) {
+      w->writeS(amiga.noteMap[note].freq);
+      w->writeS(amiga.noteMap[note].map);
+    }
+  }
+
+  FEATURE_END;
 }
 
-void DivInstrument::writeFeatureOx(SafeWriter* w, int op) {
+void DivInstrument::writeFeatureOx(SafeWriter* w, int ope) {
+  char opCode[3];
+  opCode[0]='O';
+  opCode[1]='1'+ope;
+  opCode[2]=0;
+
+  FEATURE_BEGIN(opCode);
+
+  // if you update the macro header, please update this value as well.
+  // it's the length.
+  w->writeS(8);
+  
+  // write macros
+  const DivInstrumentSTD::OpMacro& o=std.opMacros[ope];
+
+  writeMacro(w,o.amMacro,0);
+  writeMacro(w,o.arMacro,0);
+  writeMacro(w,o.drMacro,0);
+  writeMacro(w,o.multMacro,0);
+  writeMacro(w,o.rrMacro,0);
+  writeMacro(w,o.slMacro,0);
+  writeMacro(w,o.tlMacro,0);
+  writeMacro(w,o.dt2Macro,0);
+  writeMacro(w,o.rsMacro,0);
+  writeMacro(w,o.dtMacro,0);
+  writeMacro(w,o.d2rMacro,0);
+  writeMacro(w,o.ssgMacro,0);
+  writeMacro(w,o.damMacro,0);
+  writeMacro(w,o.dvbMacro,0);
+  writeMacro(w,o.egtMacro,0);
+  writeMacro(w,o.kslMacro,0);
+  writeMacro(w,o.susMacro,0);
+  writeMacro(w,o.vibMacro,0);
+  writeMacro(w,o.wsMacro,0);
+  writeMacro(w,o.ksrMacro,0);
+
+  // "stop reading" code
+  w->writeC(-1);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureLD(SafeWriter* w) {
+  FEATURE_BEGIN("LD");
+
+  w->writeC(fm.fixedDrums);
+  w->writeS(fm.kickFreq);
+  w->writeS(fm.snareHatFreq);
+  w->writeS(fm.tomTopFreq);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureSN(SafeWriter* w) {
@@ -2169,6 +2278,8 @@ bool DivInstrument::save(const char* path) {
   SafeWriter* w=new SafeWriter();
   w->init();
 
+  //putInsData2(w,true);
+
   // write magic
   w->write("-Furnace instr.-",16);
 

From 57a4c52551cca4130c66cbfdb431a8e2890fe456 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 19:05:18 -0500
Subject: [PATCH 34/86] why why why...

---
 src/engine/instrument.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 3cf65b63c..8fac58e0f 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -22,6 +22,7 @@
 #include "safeWriter.h"
 #include "dataErrors.h"
 #include "../ta-utils.h"
+#include <vector>
 
 struct DivSong;
 

From 0008420b6b28a1b4ade8dacb51fa7e89a75cdca5 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 21:15:10 -0500
Subject: [PATCH 35/86] .................................................

---
 src/engine/instrument.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 3a64a58d1..df4390226 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -522,7 +522,8 @@ void DivInstrument::writeFeatureX1(SafeWriter* w) {
 }
 
 void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
-  size_t blockStartSeek, blockEndSeek;
+  size_t blockStartSeek=0;
+  size_t blockEndSeek=0;
   std::vector<int> waveList;
   std::vector<int> sampleList;
 

From 38bb36363d07a40f2d0e2b20b974337143917caf Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 19 Nov 2022 22:12:05 -0500
Subject: [PATCH 36/86] new ins format, part 4

---
 papers/newIns.md          |   4 +-
 src/engine/instrument.cpp | 167 +++++++++++++++++++++++++++++++++++++-
 src/engine/instrument.h   |   4 +-
 3 files changed, 170 insertions(+), 5 deletions(-)

diff --git a/papers/newIns.md b/papers/newIns.md
index 2250f0623..8ae5f6d82 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -308,7 +308,7 @@ size | description
      | - bit 4-6: decay
      | - bit 0-3: attack
   1  | sustain/release
-     | - bit 5-6: sustain
+     | - bit 5-7: sustain
      | - bit 0-4: release
   1  | flags
      | - bit 4: envelope on
@@ -369,6 +369,7 @@ size | description
 size | description
 -----|------------------------------------
   1  | number of samples
+ 1?? | sample indexes...
  4?? | pointers to samples...
      | - these use the Furnace sample format.
 ```
@@ -379,6 +380,7 @@ size | description
 size | description
 -----|------------------------------------
   1  | number of wavetables
+ 1?? | wavetable indexes...
  4?? | pointers to wavetables...
      | - these use the Furnace wavetable format.
 ```
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index df4390226..a11a9dabc 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -492,33 +492,196 @@ void DivInstrument::writeFeatureLD(SafeWriter* w) {
 }
 
 void DivInstrument::writeFeatureSN(SafeWriter* w) {
+  FEATURE_BEGIN("SN");
+
+  w->writeC(((snes.d&7)<<4)|(snes.a&15));
+  w->writeC(((snes.s&7)<<5)|(snes.r&31));
+
+  w->writeC(
+    (snes.useEnv?16:0)|
+    (snes.sus?8:0)|
+    (snes.gainMode)
+  );
+  
+  w->writeC(snes.gain);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureN1(SafeWriter* w) {
+  FEATURE_BEGIN("N1");
+
+  w->writeI(n163.wave);
+  w->writeC(n163.wavePos);
+  w->writeC(n163.waveLen);
+  w->writeC(n163.waveMode);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureFD(SafeWriter* w) {
+  FEATURE_BEGIN("FD");
+
+  w->writeI(fds.modSpeed);
+  w->writeI(fds.modDepth);
+  w->writeC(fds.initModTableWithFirstWave);
+  w->write(fds.modTable,32);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureWS(SafeWriter* w) {
+  FEATURE_BEGIN("WS");
+
+  w->writeI(ws.wave1);
+  w->writeI(ws.wave2);
+  w->writeC(ws.rateDivider);
+  w->writeC(ws.effect);
+  w->writeC(ws.enabled);
+  w->writeC(ws.global);
+  w->writeC(ws.speed);
+  w->writeC(ws.param1);
+  w->writeC(ws.param2);
+  w->writeC(ws.param3);
+  w->writeC(ws.param4);
+
+  FEATURE_END;
 }
 
-void DivInstrument::writeFeatureSL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
+size_t DivInstrument::writeFeatureSL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
+  FEATURE_BEGIN("SL");
+
+  bool sampleUsed[256];
+  memset(sampleUsed,0,256*sizeof(bool));
+
+  if (amiga.initSample>=0 && amiga.initSample<(int)song->sample.size()) {
+    sampleUsed[amiga.initSample]=true;
+  }
+
+  if (amiga.useNoteMap) {
+    for (int i=0; i<120; i++) {
+      if (amiga.noteMap[i].map>=0 && amiga.noteMap[i].map<(int)song->sample.size()) {
+        sampleUsed[amiga.noteMap[i].map]=true;
+      }
+    }
+  }
+
+  for (size_t i=0; i<song->sample.size(); i++) {
+    if (sampleUsed[i]) {
+      list.push_back(i);
+    }
+  }
+
+  w->writeC(list.size());
+
+  for (int i: list) {
+    w->writeC(i);
+  }
+
+  size_t ret=w->tell();
+
+  // pointers (these will be filled later)
+  for (size_t i=0; i<list.size(); i++) {
+    w->writeI(0);
+  }
+
+  FEATURE_END;
+
+  return ret;
 }
 
-void DivInstrument::writeFeatureWL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
+size_t DivInstrument::writeFeatureWL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
+  FEATURE_BEGIN("WL");
+
+  bool waveUsed[256];
+  memset(waveUsed,0,256*sizeof(bool));
+
+  for (int i=0; i<std.waveMacro.len; i++) {
+    if (std.waveMacro.val[i]>=0 && std.waveMacro.val[i]<(int)song->wave.size()) {
+      waveUsed[std.waveMacro.val[i]]=true;
+    }
+  }
+
+  if (ws.enabled) {
+    if (ws.wave1>=0 && ws.wave1<(int)song->wave.size()) {
+      waveUsed[ws.wave1]=true;
+    }
+    if ((ws.effect&0x80) && ws.wave2>=0 && ws.wave2<(int)song->wave.size()) {
+      waveUsed[ws.wave2]=true;
+    }
+  }
+
+  for (size_t i=0; i<song->wave.size(); i++) {
+    if (waveUsed[i]) {
+      list.push_back(i);
+    }
+  }
+
+  w->writeC(list.size());
+
+  for (int i: list) {
+    w->writeC(i);
+  }
+
+  size_t ret=w->tell();
+
+  // pointers (these will be filled later)
+  for (size_t i=0; i<list.size(); i++) {
+    w->writeI(0);
+  }
+
+  FEATURE_END;
+
+  return ret;
 }
 
 void DivInstrument::writeFeatureMP(SafeWriter* w) {
+  FEATURE_BEGIN("MP");
+
+  w->writeC(multipcm.ar);
+  w->writeC(multipcm.d1r);
+  w->writeC(multipcm.dl);
+  w->writeC(multipcm.d2r);
+  w->writeC(multipcm.rr);
+  w->writeC(multipcm.rc);
+  w->writeC(multipcm.lfo);
+  w->writeC(multipcm.vib);
+  w->writeC(multipcm.am);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureSU(SafeWriter* w) {
+  FEATURE_BEGIN("SU");
+
+  w->writeC(su.switchRoles);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureES(SafeWriter* w) {
+  FEATURE_BEGIN("ES");
+
+  w->writeC(es5506.filter.mode);
+  w->writeS(es5506.filter.k1);
+  w->writeS(es5506.filter.k2);
+  w->writeS(es5506.envelope.ecount);
+  w->writeC(es5506.envelope.lVRamp);
+  w->writeC(es5506.envelope.rVRamp);
+  w->writeC(es5506.envelope.k1Ramp);
+  w->writeC(es5506.envelope.k2Ramp);
+  w->writeC(es5506.envelope.k1Slow);
+  w->writeC(es5506.envelope.k2Slow);
+
+  FEATURE_END;
 }
 
 void DivInstrument::writeFeatureX1(SafeWriter* w) {
+  FEATURE_BEGIN("X1");
+
+  w->writeI(x1_010.bankSlot);
+
+  FEATURE_END;
 }
 
 void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 8fac58e0f..030a59043 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -655,8 +655,8 @@ struct DivInstrument {
   void writeFeatureN1(SafeWriter* w);
   void writeFeatureFD(SafeWriter* w);
   void writeFeatureWS(SafeWriter* w);
-  void writeFeatureSL(SafeWriter* w, std::vector<int>& list, const DivSong* song);
-  void writeFeatureWL(SafeWriter* w, std::vector<int>& list, const DivSong* song);
+  size_t writeFeatureSL(SafeWriter* w, std::vector<int>& list, const DivSong* song);
+  size_t writeFeatureWL(SafeWriter* w, std::vector<int>& list, const DivSong* song);
   void writeFeatureMP(SafeWriter* w);
   void writeFeatureSU(SafeWriter* w);
   void writeFeatureES(SafeWriter* w);

From a7b139cd00ad5bd857a0f5b93d219d9ed97490d0 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 20 Nov 2022 03:24:23 -0500
Subject: [PATCH 37/86] new ins format, part 5

---
 papers/newIns.md          | 15 +++++++++++++++
 src/engine/instrument.cpp | 40 +++++++++++++++++++++++++++++++--------
 src/engine/instrument.h   |  3 +++
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/papers/newIns.md b/papers/newIns.md
index 8ae5f6d82..6f420de0b 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -6,6 +6,8 @@ the aim of this new format is to greatly reduce the size of a resulting instrume
 
 # header
 
+.fui files use the following header:
+
 ```
 size | description
 -----|------------------------------------
@@ -15,6 +17,18 @@ size | description
  ??? | features...
 ```
 
+instruments in a .fur file use the following header instead:
+
+```
+size | description
+-----|------------------------------------
+  4  | "INS2" block ID
+  4  | size of this block
+  2  | format version
+  2  | instrument type
+ ??? | features...
+```
+
 a feature uses the following format:
 
 ```
@@ -51,6 +65,7 @@ the following feature codes are recognized:
 - `EN`: end of features
   - if you find this feature code, stop reading the instrument.
   - it will usually appear only when there sample/wave lists.
+  - instruments in a .fur shall end with this feature code.
 
 # instrument name (NA)
 
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index a11a9dabc..e509612d1 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -1720,17 +1720,16 @@ void DivInstrument::putInsData(SafeWriter* w) {
   w->seek(0,SEEK_END);
 }
 
+DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui) {
+  logE("new ins reading not implemented yet!");
+  return DIV_DATA_INVALID_DATA;
+}
+
 #define READ_MACRO_VALS(x,y) \
   for (int macroValPos=0; macroValPos<y; macroValPos++) x[macroValPos]=reader.readI();
 
-DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
-  char magic[4];
-  reader.read(magic,4);
-  if (memcmp(magic,"INST",4)!=0) {
-    logE("invalid instrument header!");
-    return DIV_DATA_INVALID_HEADER;
-  }
-  reader.readI();
+DivDataErrors DivInstrument::readInsDataOld(SafeReader &reader, short version) {
+  reader.readI(); // length. ignored.
 
   reader.readS(); // format version. ignored.
   type=(DivInstrumentType)reader.readC();
@@ -2438,6 +2437,31 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
   return DIV_DATA_SUCCESS;
 }
 
+DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
+  // 0: old (INST)
+  // 1: new (INS2, length)
+  // 2: new (FINS, no length)
+  int type=-1;
+
+  char magic[4];
+  reader.read(magic,4);
+  if (memcmp(magic,"INST",4)==0) {
+    type=0;
+  } else if (memcmp(magic,"INS2",4)==0) {
+    type=1;
+  } else if (memcmp(magic,"FINS",4)==0) {
+    type=2;
+  } else {
+    logE("invalid instrument header!");
+    return DIV_DATA_INVALID_HEADER;
+  }
+
+  if (type==1 || type==2) {
+    return readInsDataNew(reader,version,type==2);
+  }
+  return readInsDataOld(reader,version);
+}
+
 bool DivInstrument::save(const char* path) {
   SafeWriter* w=new SafeWriter();
   w->init();
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 030a59043..bbea1f4dc 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -661,6 +661,9 @@ struct DivInstrument {
   void writeFeatureSU(SafeWriter* w);
   void writeFeatureES(SafeWriter* w);
   void writeFeatureX1(SafeWriter* w);
+
+  DivDataErrors readInsDataOld(SafeReader& reader, short version);
+  DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui);
   
   /**
    * save the instrument to a SafeWriter.

From 8a33aecbe015231037830cb5fdf6fa7822919a97 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 20 Nov 2022 03:26:54 -0500
Subject: [PATCH 38/86] GUI: fix piano being clickable - again

---
 src/gui/piano.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/piano.cpp b/src/gui/piano.cpp
index a100e3ba1..b135114f8 100644
--- a/src/gui/piano.cpp
+++ b/src/gui/piano.cpp
@@ -266,7 +266,7 @@ void FurnaceGUI::drawPiano() {
           } else {
             int bottomNotes=7*oct;
             // evaluate input
-            for (TouchPoint& i: activePoints) {
+            if (canInput) for (TouchPoint& i: activePoints) {
               if (rect.Contains(ImVec2(i.x,i.y))) {
                 // top
                 int o=((i.x-rect.Min.x)/(rect.Max.x-rect.Min.x))*oct;

From badf91d44748fe52bba6fc521f4d989644cd44d2 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 20 Nov 2022 04:01:14 -0500
Subject: [PATCH 39/86] new ins format, part 6

---
 src/engine/instrument.cpp | 197 +++++++++++++++++++++++++++++++++++++-
 src/engine/instrument.h   |  23 ++++-
 2 files changed, 213 insertions(+), 7 deletions(-)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index e509612d1..622c9b60f 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -1720,9 +1720,196 @@ void DivInstrument::putInsData(SafeWriter* w) {
   w->seek(0,SEEK_END);
 }
 
-DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui) {
-  logE("new ins reading not implemented yet!");
-  return DIV_DATA_INVALID_DATA;
+#define READ_FEAT_BEGIN \
+  unsigned short featLen=reader.readS(); \
+  size_t endOfFeat=reader.tell()+featLen;
+
+#define READ_FEAT_END \
+  if (reader.tell()<endOfFeat) reader.seek(endOfFeat,SEEK_SET);
+
+void DivInstrument::readFeatureNA(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  name=reader.readString();
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureFM(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureMA(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeature64(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureGB(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureSM(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureOx(SafeReader& reader, int op) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureLD(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureSN(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureN1(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureFD(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureWS(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureSL(SafeReader& reader, const DivSong* song) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureWL(SafeReader& reader, const DivSong* song) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureMP(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureSU(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureES(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+void DivInstrument::readFeatureX1(SafeReader& reader) {
+  READ_FEAT_BEGIN;
+
+  READ_FEAT_END;
+}
+
+DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song) {
+  unsigned char featCode[2];
+
+  int dataLen=reader.size()-4;
+  if (!fui) {
+    dataLen=reader.readI();
+  }
+  dataLen+=reader.tell();
+
+  logV("data length: %d",dataLen);
+
+  reader.readS(); // format version. ignored.
+
+  type=(DivInstrumentType)reader.readS();
+
+  // feature reading loop
+  while ((int)reader.tell()<dataLen) {
+    // read feature code
+    reader.read(featCode,2);
+
+    if (memcmp(featCode,"EN",2)==0) { // end of instrument
+      break;
+    } else if (memcmp(featCode,"NA",2)==0) { // name
+      readFeatureNA(reader);
+    } else if (memcmp(featCode,"FM",2)==0) { // FM
+      readFeatureFM(reader);
+    } else if (memcmp(featCode,"MA",2)==0) { // macros
+      readFeatureMA(reader);
+    } else if (memcmp(featCode,"64",2)==0) { // C64
+      readFeature64(reader);
+    } else if (memcmp(featCode,"GB",2)==0) { // Game Boy
+      readFeatureGB(reader);
+    } else if (memcmp(featCode,"SM",2)==0) { // sample
+      readFeatureSM(reader);
+    } else if (memcmp(featCode,"O1",2)==0) { // op1 macros
+      readFeatureOx(reader,0);
+    } else if (memcmp(featCode,"O2",2)==0) { // op2 macros
+      readFeatureOx(reader,1);
+    } else if (memcmp(featCode,"O3",2)==0) { // op3 macros
+      readFeatureOx(reader,2);
+    } else if (memcmp(featCode,"O4",2)==0) { // op4 macros
+      readFeatureOx(reader,3);
+    } else if (memcmp(featCode,"LD",2)==0) { // OPL drums
+      readFeatureLD(reader);
+    } else if (memcmp(featCode,"SN",2)==0) { // SNES
+      readFeatureSN(reader);
+    } else if (memcmp(featCode,"N1",2)==0) { // Namco 163
+      readFeatureN1(reader);
+    } else if (memcmp(featCode,"FD",2)==0) { // FDS/VB
+      readFeatureFD(reader);
+    } else if (memcmp(featCode,"WS",2)==0) { // WaveSynth
+      readFeatureWS(reader);
+    } else if (memcmp(featCode,"SL",2)==0 && fui && song!=NULL) { // sample list
+      readFeatureSL(reader,NULL);
+    } else if (memcmp(featCode,"WL",2)==0 && fui && song!=NULL) { // wave list
+      readFeatureWL(reader,NULL);
+    } else if (memcmp(featCode,"MP",2)==0) { // MultiPCM
+      readFeatureMP(reader);
+    } else if (memcmp(featCode,"SU",2)==0) { // Sound Unit
+      readFeatureSU(reader);
+    } else if (memcmp(featCode,"ES",2)==0) { // ES5506
+      readFeatureES(reader);
+    } else if (memcmp(featCode,"X1",2)==0) { // X1-010
+      readFeatureX1(reader);
+    } else {
+      logW("unknown feature code %c%c!",featCode[0],featCode[1]);
+      // skip feature
+      unsigned short skip=reader.readS();
+      reader.seek(skip,SEEK_CUR);
+    }
+  }
+
+  return DIV_DATA_SUCCESS;
 }
 
 #define READ_MACRO_VALS(x,y) \
@@ -2437,7 +2624,7 @@ DivDataErrors DivInstrument::readInsDataOld(SafeReader &reader, short version) {
   return DIV_DATA_SUCCESS;
 }
 
-DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
+DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version, DivSong* song) {
   // 0: old (INST)
   // 1: new (INS2, length)
   // 2: new (FINS, no length)
@@ -2457,7 +2644,7 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version) {
   }
 
   if (type==1 || type==2) {
-    return readInsDataNew(reader,version,type==2);
+    return readInsDataNew(reader,version,type==2,song);
   }
   return readInsDataOld(reader,version);
 }
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index bbea1f4dc..21ede72b1 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -662,8 +662,27 @@ struct DivInstrument {
   void writeFeatureES(SafeWriter* w);
   void writeFeatureX1(SafeWriter* w);
 
+  void readFeatureNA(SafeReader& reader);
+  void readFeatureFM(SafeReader& reader);
+  void readFeatureMA(SafeReader& reader);
+  void readFeature64(SafeReader& reader);
+  void readFeatureGB(SafeReader& reader);
+  void readFeatureSM(SafeReader& reader);
+  void readFeatureOx(SafeReader& reader, int op);
+  void readFeatureLD(SafeReader& reader);
+  void readFeatureSN(SafeReader& reader);
+  void readFeatureN1(SafeReader& reader);
+  void readFeatureFD(SafeReader& reader);
+  void readFeatureWS(SafeReader& reader);
+  void readFeatureSL(SafeReader& reader, const DivSong* song);
+  void readFeatureWL(SafeReader& reader, const DivSong* song);
+  void readFeatureMP(SafeReader& reader);
+  void readFeatureSU(SafeReader& reader);
+  void readFeatureES(SafeReader& reader);
+  void readFeatureX1(SafeReader& reader);
+
   DivDataErrors readInsDataOld(SafeReader& reader, short version);
-  DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui);
+  DivDataErrors readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song);
   
   /**
    * save the instrument to a SafeWriter.
@@ -683,7 +702,7 @@ struct DivInstrument {
    * @param version the format version.
    * @return a DivDataErrors.
    */
-  DivDataErrors readInsData(SafeReader& reader, short version);
+  DivDataErrors readInsData(SafeReader& reader, short version, DivSong* song=NULL);
 
   /**
    * save this instrument to a file.

From 5ec4f2d1f0fd068d0c35a9971f1ae0fa17ad2d64 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 20 Nov 2022 14:28:43 -0500
Subject: [PATCH 40/86] new ins format, part 7

FM instruments now loadable
---
 papers/newIns.md          |  2 +-
 src/engine/engine.h       |  4 +--
 src/engine/fileOpsIns.cpp | 31 +++++++++++++-----
 src/engine/instrument.cpp | 66 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 10 deletions(-)

diff --git a/papers/newIns.md b/papers/newIns.md
index 6f420de0b..4baab71e1 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -1,4 +1,4 @@
-# possible new Furnace instrument format
+# new Furnace instrument format
 
 the main issue with Furnace instrument files is that they are too big, even if the instrument is nothing more than the FM setup...
 
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 4a36b27d7..0c2782050 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -47,8 +47,8 @@
 #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
 #define BUSY_END isBusy.unlock(); softLocked=false;
 
-#define DIV_VERSION "dev125"
-#define DIV_ENGINE_VERSION 125
+#define DIV_VERSION "dev126"
+#define DIV_ENGINE_VERSION 126
 // for imports
 #define DIV_VERSION_MOD 0xff01
 #define DIV_VERSION_FC 0xff02
diff --git a/src/engine/fileOpsIns.cpp b/src/engine/fileOpsIns.cpp
index 83361130b..c002efea2 100644
--- a/src/engine/fileOpsIns.cpp
+++ b/src/engine/fileOpsIns.cpp
@@ -1880,10 +1880,19 @@ std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path) {
 
   unsigned char magic[16];
   bool isFurnaceInstr=false;
+  bool isOldFurnaceIns=false;
   try {
-    reader.read(magic,16);
-    if (memcmp("-Furnace instr.-",magic,16)==0) {
+    reader.read(magic,4);
+    if (memcmp("FINS",magic,4)==0) {
       isFurnaceInstr=true;
+      logV("found a new Furnace ins");
+    } else {
+      reader.read(&magic[4],12);
+      if (memcmp("-Furnace instr.-",magic,16)==0) {
+        logV("found an old Furnace ins");
+        isFurnaceInstr=true;
+        isOldFurnaceIns=true;
+      }
     }
   } catch (EndOfFileException& e) {
     reader.seek(0,SEEK_SET);
@@ -1892,17 +1901,25 @@ std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path) {
   if (isFurnaceInstr) {
     DivInstrument* ins=new DivInstrument;
     try {
-      short version=reader.readS();
-      reader.readS(); // reserved
+      short version=0;
+      if (isOldFurnaceIns) {
+        version=reader.readS();
+        reader.readS(); // reserved
+      } else {
+        version=reader.readS();
+        reader.seek(0,SEEK_SET);
+      }
 
       if (version>DIV_ENGINE_VERSION) {
         warnings="this instrument is made with a more recent version of Furnace!";
       }
 
-      unsigned int dataPtr=reader.readI();
-      reader.seek(dataPtr,SEEK_SET);
+      if (isOldFurnaceIns) {
+        unsigned int dataPtr=reader.readI();
+        reader.seek(dataPtr,SEEK_SET);
+      }
 
-      if (ins->readInsData(reader,version)!=DIV_DATA_SUCCESS) {
+      if (ins->readInsData(reader,version,&song)!=DIV_DATA_SUCCESS) {
         lastError="invalid instrument header/data!";
         delete ins;
         delete[] buf;
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 622c9b60f..9f9482d9d 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -1738,6 +1738,71 @@ void DivInstrument::readFeatureNA(SafeReader& reader) {
 void DivInstrument::readFeatureFM(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  unsigned char opCount=reader.readC();
+
+  fm.op[0].enable=(opCount&16);
+  fm.op[1].enable=(opCount&32);
+  fm.op[2].enable=(opCount&64);
+  fm.op[3].enable=(opCount&128);
+
+  opCount&=15;
+
+  unsigned char next=reader.readC();
+  fm.alg=(next>>4)&7;
+  fm.fb=next&7;
+
+  next=reader.readC();
+  fm.fms2=(next>>5)&7;
+  fm.ams=(next>>3)&3;
+  fm.fms=next&7;
+
+  next=reader.readC();
+  fm.ams2=(next>>6)&3;
+  fm.ops=(next&32)?4:2;
+  fm.opllPreset=next&31;
+
+  // read operators
+  for (int i=0; i<opCount; i++) {
+    DivInstrumentFM::Operator& op=fm.op[i];
+
+    next=reader.readC();
+    op.ksr=(next&128)?1:0;
+    op.dt=(next>>4)&7;
+    op.mult=next&15;
+
+    next=reader.readC();
+    op.sus=(next&128)?1:0;
+    op.tl=next&127;
+
+    next=reader.readC();
+    op.rs=(next>>6)&3;
+    op.vib=(next&32)?1:0;
+    op.ar=next&31;
+
+    next=reader.readC();
+    op.am=(next&128)?1:0;
+    op.ksl=(next>>5)&3;
+    op.dr=next&31;
+
+    next=reader.readC();
+    op.egt=(next&128)?1:0;
+    op.kvs=(next>>5)&3;
+    op.d2r=next&31;
+
+    next=reader.readC();
+    op.sl=(next>>4)&15;
+    op.rr=next&15;
+
+    next=reader.readC();
+    op.dvb=(next>>4)&15;
+    op.ssgEnv=next&15;
+
+    next=reader.readC();
+    op.dam=(next>>5)&7;
+    op.dt2=(next>>3)&3;
+    op.ws=next&7;
+  }
+
   READ_FEAT_END;
 }
 
@@ -2644,6 +2709,7 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version, DivS
   }
 
   if (type==1 || type==2) {
+    logV("reading new instrument data...");
     return readInsDataNew(reader,version,type==2,song);
   }
   return readInsDataOld(reader,version);

From 1b79f9d7f3def4b800150fde9cdbd1790801cda7 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 20 Nov 2022 17:20:19 -0500
Subject: [PATCH 41/86] new ins format, part 8

all currently supported features loadable
---
 src/engine/instrument.cpp | 403 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 403 insertions(+)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 9f9482d9d..06fce17de 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -1809,96 +1809,499 @@ void DivInstrument::readFeatureFM(SafeReader& reader) {
 void DivInstrument::readFeatureMA(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  unsigned short macroHeaderLen=reader.readS();
+
+  DivInstrumentMacro& target=std.volMacro;
+
+  while (reader.tell()<endOfFeat) {
+    size_t endOfMacroHeader=reader.tell()+macroHeaderLen;
+    unsigned char macroCode=reader.readC();
+
+    // end of macro list
+    if (macroCode==255) break;
+
+    switch (macroCode) {
+      case 0:
+        target=std.volMacro;
+        break;
+      case 1:
+        target=std.arpMacro;
+        break;
+      case 2:
+        target=std.dutyMacro;
+        break;
+      case 3:
+        target=std.waveMacro;
+        break;
+      case 4:
+        target=std.pitchMacro;
+        break;
+      case 5:
+        target=std.ex1Macro;
+        break;
+      case 6:
+        target=std.ex2Macro;
+        break;
+      case 7:
+        target=std.ex3Macro;
+        break;
+      case 8:
+        target=std.algMacro;
+        break;
+      case 9:
+        target=std.fbMacro;
+        break;
+      case 10:
+        target=std.fmsMacro;
+        break;
+      case 11:
+        target=std.amsMacro;
+        break;
+      case 12:
+        target=std.panLMacro;
+        break;
+      case 13:
+        target=std.panRMacro;
+        break;
+      case 14:
+        target=std.phaseResetMacro;
+        break;
+      case 15:
+        target=std.ex4Macro;
+        break;
+      case 16:
+        target=std.ex5Macro;
+        break;
+      case 17:
+        target=std.ex6Macro;
+        break;
+      case 18:
+        target=std.ex7Macro;
+        break;
+      case 19:
+        target=std.ex8Macro;
+        break;
+    }
+
+    target.len=reader.readC();
+    target.loop=reader.readC();
+    target.rel=reader.readC();
+    target.mode=reader.readC();
+
+    unsigned char wordSize=reader.readC();
+    target.open=wordSize&7;
+    wordSize>>=6;
+
+    target.delay=reader.readC();
+    target.speed=reader.readC();
+
+    reader.seek(endOfMacroHeader,SEEK_SET);
+
+    // read macro
+    switch (wordSize) {
+      case 0:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=(unsigned char)reader.readC();
+        }
+        break;
+      case 1:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=(signed char)reader.readC();
+        }
+        break;
+      case 2:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=reader.readS();
+        }
+        break;
+      default:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=reader.readI();
+        }
+        break;
+    }
+  }
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeature64(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  unsigned char next=reader.readC();
+  c64.dutyIsAbs=next&128;
+  c64.initFilter=next&64;
+  c64.volIsCutoff=next&32;
+  c64.toFilter=next&16;
+  c64.noiseOn=next&8;
+  c64.pulseOn=next&4;
+  c64.sawOn=next&2;
+  c64.triOn=next&1;
+
+  next=reader.readC();
+  c64.oscSync=(next&128)?1:0;
+  c64.ringMod=(next&64)?1:0;
+  c64.noTest=next&32;
+  c64.filterIsAbs=next&16;
+  c64.ch3off=next&8;
+  c64.bp=next&4;
+  c64.hp=next&2;
+  c64.lp=next&1;
+
+  next=reader.readC();
+  c64.a=(next>>4)&15;
+  c64.d=next&15;
+
+  next=reader.readC();
+  c64.s=(next>>4)&15;
+  c64.r=next&15;
+
+  c64.duty=reader.readS()&4095;
+
+  unsigned short cr=reader.readS();
+  c64.cut=cr&2047;
+  c64.res=cr>>12;
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureGB(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  unsigned char next=reader.readC();
+  gb.envLen=(next>>5)&7;
+  gb.envDir=(next&16)?1:0;
+  gb.envVol=next&15;
+
+  gb.soundLen=reader.readC();
+
+  next=reader.readC();
+  gb.alwaysInit=next&2;
+  gb.softEnv=next&1;
+
+  gb.hwSeqLen=reader.readC();
+  for (int i=0; i<gb.hwSeqLen; i++) {
+    gb.hwSeq[i].cmd=reader.readC();
+    gb.hwSeq[i].data=reader.readS();
+  }
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureSM(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  amiga.initSample=reader.readS();
+
+  unsigned char next=reader.readC();
+  amiga.useWave=next&4;
+  amiga.useSample=next&2;
+  amiga.useNoteMap=next&1;
+
+  amiga.waveLen=(unsigned char)reader.readC();
+
+  if (amiga.useNoteMap) {
+    for (int note=0; note<120; note++) {
+      amiga.noteMap[note].freq=reader.readS();
+      amiga.noteMap[note].map=reader.readS();
+    }
+  }
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureOx(SafeReader& reader, int op) {
   READ_FEAT_BEGIN;
 
+  unsigned short macroHeaderLen=reader.readS();
+
+  DivInstrumentMacro& target=std.opMacros[op].amMacro;
+
+  while (reader.tell()<endOfFeat) {
+    size_t endOfMacroHeader=reader.tell()+macroHeaderLen;
+    unsigned char macroCode=reader.readC();
+
+    // end of macro list
+    if (macroCode==255) break;
+
+    switch (macroCode) {
+      case 0:
+        target=std.opMacros[op].amMacro;
+        break;
+      case 1:
+        target=std.opMacros[op].arMacro;
+        break;
+      case 2:
+        target=std.opMacros[op].drMacro;
+        break;
+      case 3:
+        target=std.opMacros[op].multMacro;
+        break;
+      case 4:
+        target=std.opMacros[op].rrMacro;
+        break;
+      case 5:
+        target=std.opMacros[op].slMacro;
+        break;
+      case 6:
+        target=std.opMacros[op].tlMacro;
+        break;
+      case 7:
+        target=std.opMacros[op].dt2Macro;
+        break;
+      case 8:
+        target=std.opMacros[op].rsMacro;
+        break;
+      case 9:
+        target=std.opMacros[op].dtMacro;
+        break;
+      case 10:
+        target=std.opMacros[op].d2rMacro;
+        break;
+      case 11:
+        target=std.opMacros[op].ssgMacro;
+        break;
+      case 12:
+        target=std.opMacros[op].damMacro;
+        break;
+      case 13:
+        target=std.opMacros[op].dvbMacro;
+        break;
+      case 14:
+        target=std.opMacros[op].egtMacro;
+        break;
+      case 15:
+        target=std.opMacros[op].kslMacro;
+        break;
+      case 16:
+        target=std.opMacros[op].susMacro;
+        break;
+      case 17:
+        target=std.opMacros[op].vibMacro;
+        break;
+      case 18:
+        target=std.opMacros[op].wsMacro;
+        break;
+      case 19:
+        target=std.opMacros[op].ksrMacro;
+        break;
+    }
+
+    target.len=reader.readC();
+    target.loop=reader.readC();
+    target.rel=reader.readC();
+    target.mode=reader.readC();
+
+    unsigned char wordSize=reader.readC();
+    target.open=wordSize&7;
+    wordSize>>=6;
+
+    target.delay=reader.readC();
+    target.speed=reader.readC();
+
+    reader.seek(endOfMacroHeader,SEEK_SET);
+
+    // read macro
+    switch (wordSize) {
+      case 0:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=(unsigned char)reader.readC();
+        }
+        break;
+      case 1:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=(signed char)reader.readC();
+        }
+        break;
+      case 2:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=reader.readS();
+        }
+        break;
+      default:
+        for (int i=0; i<target.len; i++) {
+          target.val[i]=reader.readI();
+        }
+        break;
+    }
+  }
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureLD(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  fm.fixedDrums=reader.readC();
+  fm.kickFreq=reader.readS();
+  fm.snareHatFreq=reader.readS();
+  fm.tomTopFreq=reader.readS();
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureSN(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  unsigned char next=reader.readC();
+  snes.d=(next>>4)&7;
+  snes.a=next&15;
+
+  next=reader.readC();
+  snes.s=(next>>5)&7;
+  snes.r=next&31;
+
+  next=reader.readC();
+  snes.useEnv=next&16;
+  snes.sus=next&8;
+  snes.gainMode=(DivInstrumentSNES::GainMode)(next&7);
+
+  if (snes.gainMode==1 || snes.gainMode==2 || snes.gainMode==3) snes.gainMode=DivInstrumentSNES::GAIN_MODE_DIRECT;
+
+  snes.gain=reader.readC();
+  
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureN1(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  n163.wave=reader.readI();
+  n163.wavePos=(unsigned char)reader.readC();
+  n163.waveLen=(unsigned char)reader.readC();
+  n163.waveMode=(unsigned char)reader.readC();
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureFD(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  fds.modSpeed=reader.readI();
+  fds.modDepth=reader.readI();
+  fds.initModTableWithFirstWave=reader.readC();
+  reader.read(fds.modTable,32);
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureWS(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  ws.wave1=reader.readI();
+  ws.wave2=reader.readI();
+  ws.rateDivider=reader.readC();
+  ws.effect=reader.readC();
+  ws.enabled=reader.readC();
+  ws.global=reader.readC();
+  ws.speed=reader.readC();
+  ws.param1=reader.readC();
+  ws.param2=reader.readC();
+  ws.param3=reader.readC();
+  ws.param4=reader.readC();
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureSL(SafeReader& reader, const DivSong* song) {
   READ_FEAT_BEGIN;
 
+  unsigned int samplePtr[256];
+  unsigned char sampleIndex[256];
+  memset(samplePtr,0,256*sizeof(unsigned int));
+  memset(sampleIndex,0,256);
+
+  unsigned char sampleCount=reader.readC();
+
+  for (int i=0; i<sampleCount; i++) {
+    sampleIndex[i]=reader.readC();
+  }
+  for (int i=0; i<sampleCount; i++) {
+    samplePtr[i]=reader.readI();
+  }
+
+  size_t lastSeek=reader.tell();
+
+  // TODO: load samples here
+
+  reader.seek(lastSeek,SEEK_CUR);
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureWL(SafeReader& reader, const DivSong* song) {
   READ_FEAT_BEGIN;
 
+  unsigned int wavePtr[256];
+  unsigned char waveIndex[256];
+  memset(wavePtr,0,256*sizeof(unsigned int));
+  memset(waveIndex,0,256);
+
+  unsigned char waveCount=reader.readC();
+
+  for (int i=0; i<waveCount; i++) {
+    waveIndex[i]=reader.readC();
+  }
+  for (int i=0; i<waveCount; i++) {
+    wavePtr[i]=reader.readI();
+  }
+
+  size_t lastSeek=reader.tell();
+
+  // TODO: load samples here
+
+  reader.seek(lastSeek,SEEK_CUR);
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureMP(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  multipcm.ar=reader.readC();
+  multipcm.d1r=reader.readC();
+  multipcm.dl=reader.readC();
+  multipcm.d2r=reader.readC();
+  multipcm.rr=reader.readC();
+  multipcm.rc=reader.readC();
+  multipcm.lfo=reader.readC();
+  multipcm.vib=reader.readC();
+  multipcm.am=reader.readC();
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureSU(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  su.switchRoles=reader.readC();
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureES(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  es5506.filter.mode=(DivInstrumentES5506::Filter::FilterMode)reader.readC();
+  es5506.filter.k1=reader.readS();
+  es5506.filter.k2=reader.readS();
+  es5506.envelope.ecount=reader.readS();
+  es5506.envelope.lVRamp=reader.readC();
+  es5506.envelope.rVRamp=reader.readC();
+  es5506.envelope.k1Ramp=reader.readC();
+  es5506.envelope.k2Ramp=reader.readC();
+  es5506.envelope.k1Slow=reader.readC();
+  es5506.envelope.k2Slow=reader.readC();
+
   READ_FEAT_END;
 }
 
 void DivInstrument::readFeatureX1(SafeReader& reader) {
   READ_FEAT_BEGIN;
 
+  x1_010.bankSlot=reader.readI();
+
   READ_FEAT_END;
 }
 

From d6ae735ffe5a4064ebb9ad9b4845dfd1424ee3b1 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 20 Nov 2022 19:19:24 -0500
Subject: [PATCH 42/86] dev126 - new ins format

---
 src/engine/fileOps.cpp    | 168 ++-------------------------------
 src/engine/instrument.cpp | 192 ++++++++++++++++++++++++++++++++------
 src/engine/instrument.h   |   8 +-
 src/engine/sample.cpp     | 179 +++++++++++++++++++++++++++++++++++
 src/engine/sample.h       |  16 ++++
 src/gui/dataList.cpp      |   9 ++
 src/gui/doAction.cpp      |   3 +
 src/gui/gui.cpp           |  21 ++++-
 src/gui/gui.h             |   2 +
 src/gui/guiConst.cpp      |   3 +-
 src/gui/insEdit.cpp       |   3 +
 11 files changed, 408 insertions(+), 196 deletions(-)

diff --git a/src/engine/fileOps.cpp b/src/engine/fileOps.cpp
index a5502040b..15bb77113 100644
--- a/src/engine/fileOps.cpp
+++ b/src/engine/fileOps.cpp
@@ -2348,142 +2348,24 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
 
     // read samples
     for (int i=0; i<ds.sampleLen; i++) {
-      int vol=0;
-      int pitch=0;
+      DivSample* sample=new DivSample;
 
       if (!reader.seek(samplePtr[i],SEEK_SET)) {
         logE("couldn't seek to sample %d!",i);
         lastError=fmt::sprintf("couldn't seek to sample %d!",i);
         ds.unload();
+        delete sample;
         delete[] file;
         return false;
       }
 
-      reader.read(magic,4);
-      if (strcmp(magic,"SMPL")!=0 && strcmp(magic,"SMP2")!=0) {
-        logE("%d: invalid sample header!",i);
-        lastError="invalid sample header!";
+      if (sample->readSampleData(reader,ds.version)!=DIV_DATA_SUCCESS) {
+        lastError="invalid sample header/data!";
         ds.unload();
+        delete sample;
         delete[] file;
         return false;
       }
-      bool isNewSample=(strcmp(magic,"SMP2")==0);
-      reader.readI();
-      DivSample* sample=new DivSample;
-      logD("reading sample %d at %x...",i,samplePtr[i]);
-      if (!isNewSample) logV("(old sample)");
-
-      sample->name=reader.readString();
-      sample->samples=reader.readI();
-      if (!isNewSample) {
-        sample->loopEnd=sample->samples;
-      }
-      sample->rate=reader.readI();
-
-      if (isNewSample) {
-        sample->centerRate=reader.readI();
-        sample->depth=(DivSampleDepth)reader.readC();
-        if (ds.version>=123) {
-          sample->loopMode=(DivSampleLoopMode)reader.readC();
-        } else {
-          sample->loopMode=DIV_SAMPLE_LOOP_FORWARD;
-          reader.readC();
-        }
-
-        // reserved
-        reader.readC();
-        reader.readC();
-
-        sample->loopStart=reader.readI();
-        sample->loopEnd=reader.readI();
-        sample->loop=(sample->loopStart>=0)&&(sample->loopEnd>=0);
-
-        for (int i=0; i<4; i++) {
-          reader.readI();
-        }
-      } else {
-        if (ds.version<58) {
-          vol=reader.readS();
-          pitch=reader.readS();
-        } else {
-          reader.readI();
-        }
-        sample->depth=(DivSampleDepth)reader.readC();
-
-        // reserved
-        reader.readC();
-
-        // while version 32 stored this value, it was unused.
-        if (ds.version>=38) {
-          sample->centerRate=(unsigned short)reader.readS();
-        } else {
-          reader.readS();
-        }
-
-        if (ds.version>=19) {
-          sample->loopStart=reader.readI();
-          sample->loop=(sample->loopStart>=0)&&(sample->loopEnd>=0);
-        } else {
-          reader.readI();
-        }
-      }
-
-      if (ds.version>=58) { // modern sample
-        sample->init(sample->samples);
-        reader.read(sample->getCurBuf(),sample->getCurBufLen());
-#ifdef TA_BIG_ENDIAN
-        // convert 16-bit samples to big-endian
-        if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
-          unsigned char* sampleBuf=(unsigned char*)sample->getCurBuf();
-          size_t sampleBufLen=sample->getCurBufLen();
-          for (size_t pos=0; pos<sampleBufLen; pos+=2) {
-            sampleBuf[pos]^=sampleBuf[pos+1];
-            sampleBuf[pos+1]^=sampleBuf[pos];
-            sampleBuf[pos]^=sampleBuf[pos+1];
-          }
-        }
-#endif
-      } else { // legacy sample
-        int length=sample->samples;
-        short* data=new short[length];
-        reader.read(data,2*length);
-
-#ifdef TA_BIG_ENDIAN
-        // convert 16-bit samples to big-endian
-        for (int pos=0; pos<length; pos++) {
-          data[pos]=((unsigned short)data[pos]>>8)|((unsigned short)data[pos]<<8);
-        }
-#endif
-
-        if (pitch!=5) {
-          logD("%d: scaling from %d...",i,pitch);
-        }
-
-        // render data
-        if (sample->depth!=DIV_SAMPLE_DEPTH_8BIT && sample->depth!=DIV_SAMPLE_DEPTH_16BIT) {
-          logW("%d: sample depth is wrong! (%d)",i,sample->depth);
-          sample->depth=DIV_SAMPLE_DEPTH_16BIT;
-        }
-        sample->samples=(double)sample->samples/samplePitches[pitch];
-        sample->init(sample->samples);
-
-        unsigned int k=0;
-        float mult=(float)(vol)/50.0f;
-        for (double j=0; j<length; j+=samplePitches[pitch]) {
-          if (k>=sample->samples) {
-            break;
-          }
-          if (sample->depth==DIV_SAMPLE_DEPTH_8BIT) {
-            float next=(float)(data[(unsigned int)j]-0x80)*mult;
-            sample->data8[k++]=fmin(fmax(next,-128),127);
-          } else {
-            float next=(float)data[(unsigned int)j]*mult;
-            sample->data16[k++]=fmin(fmax(next,-32768),32767);
-          }
-        }
-
-        delete[] data;
-      }
 
       ds.sample.push_back(sample);
     }
@@ -4635,45 +4517,7 @@ SafeWriter* DivEngine::saveFur(bool notPrimary) {
   for (int i=0; i<song.sampleLen; i++) {
     DivSample* sample=song.sample[i];
     samplePtr.push_back(w->tell());
-    w->write("SMP2",4);
-    blockStartSeek=w->tell();
-    w->writeI(0);
-
-    w->writeString(sample->name,false);
-    w->writeI(sample->samples);
-    w->writeI(sample->rate);
-    w->writeI(sample->centerRate);
-    w->writeC(sample->depth);
-    w->writeC(sample->loopMode);
-    w->writeC(0); // reserved
-    w->writeC(0);
-    w->writeI(sample->loop?sample->loopStart:-1);
-    w->writeI(sample->loop?sample->loopEnd:-1);
-
-    for (int i=0; i<4; i++) {
-      w->writeI(0xffffffff);
-    }
-
-#ifdef TA_BIG_ENDIAN
-    // store 16-bit samples as little-endian
-    if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
-      unsigned char* sampleBuf=(unsigned char*)sample->getCurBuf();
-      size_t bufLen=sample->getCurBufLen();
-      for (size_t i=0; i<bufLen; i+=2) {
-        w->writeC(sampleBuf[i+1]);
-        w->writeC(sampleBuf[i]);
-      }
-    } else {
-      w->write(sample->getCurBuf(),sample->getCurBufLen());
-    }
-#else
-    w->write(sample->getCurBuf(),sample->getCurBufLen());
-#endif
-
-    blockEndSeek=w->tell();
-    w->seek(blockStartSeek,SEEK_SET);
-    w->writeI(blockEndSeek-blockStartSeek-4);
-    w->seek(0,SEEK_END);
+    sample->putSampleData(w);
   }
 
   /// PATTERN
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 06fce17de..3bba85340 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -549,8 +549,6 @@ void DivInstrument::writeFeatureWS(SafeWriter* w) {
 }
 
 size_t DivInstrument::writeFeatureSL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
-  FEATURE_BEGIN("SL");
-
   bool sampleUsed[256];
   memset(sampleUsed,0,256*sizeof(bool));
 
@@ -572,6 +570,10 @@ size_t DivInstrument::writeFeatureSL(SafeWriter* w, std::vector<int>& list, cons
     }
   }
 
+  if (list.empty()) return 0;
+
+  FEATURE_BEGIN("SL");
+
   w->writeC(list.size());
 
   for (int i: list) {
@@ -591,8 +593,6 @@ size_t DivInstrument::writeFeatureSL(SafeWriter* w, std::vector<int>& list, cons
 }
 
 size_t DivInstrument::writeFeatureWL(SafeWriter* w, std::vector<int>& list, const DivSong* song) {
-  FEATURE_BEGIN("WL");
-
   bool waveUsed[256];
   memset(waveUsed,0,256*sizeof(bool));
 
@@ -617,6 +617,10 @@ size_t DivInstrument::writeFeatureWL(SafeWriter* w, std::vector<int>& list, cons
     }
   }
 
+  if (list.empty()) return 0;
+
+  FEATURE_BEGIN("WL");
+
   w->writeC(list.size());
 
   for (int i: list) {
@@ -687,9 +691,14 @@ void DivInstrument::writeFeatureX1(SafeWriter* w) {
 void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
   size_t blockStartSeek=0;
   size_t blockEndSeek=0;
+  size_t slSeek=0;
+  size_t wlSeek=0;
   std::vector<int> waveList;
   std::vector<int> sampleList;
 
+  std::vector<unsigned int> wavePtr;
+  std::vector<unsigned int> samplePtr;
+
   if (fui) {
     w->write("FINS",4);
   } else {
@@ -747,17 +756,21 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
         break;
       case DIV_INS_AMIGA:
         featureSM=true;
+        if (!amiga.useWave) featureSL=true;
         break;
       case DIV_INS_PCE:
         checkForWL=true;
         featureSM=true;
+        if (amiga.useSample) featureSL=true;
         if (ws.enabled) featureWS=true;
         break;
       case DIV_INS_AY:
         featureSM=true;
+        if (amiga.useSample) featureSL=true;
         break;
       case DIV_INS_AY8930:
         featureSM=true;
+        if (amiga.useSample) featureSL=true;
         break;
       case DIV_INS_TIA:
         break;
@@ -769,6 +782,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
         break;
       case DIV_INS_VRC6:
         featureSM=true;
+        if (amiga.useSample) featureSL=true;
         break;
       case DIV_INS_OPLL:
         featureFM=true;
@@ -807,36 +821,44 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
       case DIV_INS_SWAN:
         checkForWL=true;
         featureSM=true;
+        if (amiga.useSample) featureSL=true;
         if (ws.enabled) featureWS=true;
         break;
       case DIV_INS_MIKEY:
         featureSM=true;
+        if (amiga.useSample) featureSL=true;
         break;
       case DIV_INS_VERA:
         break;
       case DIV_INS_X1_010:
         checkForWL=true;
         featureX1=true;
+        featureSM=true;
+        if (amiga.useSample) featureSL=true;
         if (ws.enabled) featureWS=true;
         break;
       case DIV_INS_VRC6_SAW:
         break;
       case DIV_INS_ES5506:
         featureSM=true;
+        featureSL=true;
         featureES=true;
         break;
       case DIV_INS_MULTIPCM:
         featureSM=true;
+        featureSL=true;
         featureMP=true;
         break;
       case DIV_INS_SNES:
         featureSM=true;
+        if (!amiga.useWave) featureSL=true;
         featureSN=true;
         checkForWL=true;
         if (ws.enabled) featureWS=true;
         break;
       case DIV_INS_SU:
         featureSM=true;
+        if (amiga.useSample) featureSL=true;
         featureSU=true;
         break;
       case DIV_INS_NAMCO:
@@ -854,27 +876,35 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
         break;
       case DIV_INS_MSM6258:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_MSM6295:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_ADPCMA:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_ADPCMB:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_SEGAPCM:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_QSOUND:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_YMZ280B:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_RF5C68:
         featureSM=true;
+        featureSL=true;
         break;
       case DIV_INS_MSM5232:
         break;
@@ -1049,10 +1079,10 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
     writeFeatureWS(w);
   }
   if (featureSL) {
-    writeFeatureSL(w,sampleList,song);
+    slSeek=writeFeatureSL(w,sampleList,song);
   }
   if (featureWL) {
-    writeFeatureWL(w,waveList,song);
+    wlSeek=writeFeatureWL(w,waveList,song);
   }
   if (featureMP) {
     writeFeatureMP(w);
@@ -1069,7 +1099,44 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
 
   if (fui && (featureSL || featureWL)) {
     w->write("EN",2);
-    // TODO: write wave/sample data here
+
+    if (wlSeek!=0 && !waveList.empty()) {
+      for (int i: waveList) {
+        if (i<0 || i>=(int)song->wave.size()) {
+          wavePtr.push_back(0);
+          continue;
+        }
+        DivWavetable* wave=song->wave[i];
+
+        wavePtr.push_back(w->tell());
+        wave->putWaveData(w);
+      }
+
+      w->seek(wlSeek,SEEK_SET);
+      for (unsigned int i: wavePtr) {
+        w->writeI(i);
+      }
+      w->seek(0,SEEK_END);
+    }
+
+    if (slSeek!=0 && !sampleList.empty()) {
+      for (int i: sampleList) {
+        if (i<0 || i>=(int)song->sample.size()) {
+          samplePtr.push_back(0);
+          continue;
+        }
+        DivSample* sample=song->sample[i];
+
+        samplePtr.push_back(w->tell());
+        sample->putSampleData(w);
+      }
+
+      w->seek(slSeek,SEEK_SET);
+      for (unsigned int i: samplePtr) {
+        w->writeI(i);
+      }
+      w->seek(0,SEEK_END);
+    }
   }
 
   blockEndSeek=w->tell();
@@ -2204,13 +2271,15 @@ void DivInstrument::readFeatureWS(SafeReader& reader) {
   READ_FEAT_END;
 }
 
-void DivInstrument::readFeatureSL(SafeReader& reader, const DivSong* song) {
+void DivInstrument::readFeatureSL(SafeReader& reader, DivSong* song, short version) {
   READ_FEAT_BEGIN;
 
   unsigned int samplePtr[256];
   unsigned char sampleIndex[256];
+  unsigned char sampleRemap[256];
   memset(samplePtr,0,256*sizeof(unsigned int));
   memset(sampleIndex,0,256);
+  memset(sampleRemap,0,256);
 
   unsigned char sampleCount=reader.readC();
 
@@ -2223,20 +2292,53 @@ void DivInstrument::readFeatureSL(SafeReader& reader, const DivSong* song) {
 
   size_t lastSeek=reader.tell();
 
-  // TODO: load samples here
+  // load samples
+  for (int i=0; i<sampleCount; i++) {
+    reader.seek(samplePtr[i],SEEK_SET);
+    if (song->sample.size()>=256) {
+      break;
+    }
+    DivSample* sample=new DivSample;
+    int sampleCount=(int)song->sample.size();
+
+    DivDataErrors result=sample->readSampleData(reader,version);
+    if (result==DIV_DATA_SUCCESS) {
+      song->sample.push_back(sample);
+      song->sampleLen=sampleCount+1;
+      sampleRemap[sampleIndex[i]]=sampleCount;
+    } else {
+      delete sample;
+      sampleRemap[sampleIndex[i]]=0;
+    }
+  }
 
   reader.seek(lastSeek,SEEK_CUR);
 
+  // re-map samples
+  if (amiga.initSample>=0 && amiga.initSample<256) {
+    amiga.initSample=sampleRemap[amiga.initSample];
+  }
+
+  if (amiga.useNoteMap) {
+    for (int i=0; i<120; i++) {
+      if (amiga.noteMap[i].map>=0 && amiga.noteMap[i].map<256) {
+        amiga.noteMap[i].map=sampleRemap[amiga.noteMap[i].map];
+      }
+    }
+  }
+
   READ_FEAT_END;
 }
 
-void DivInstrument::readFeatureWL(SafeReader& reader, const DivSong* song) {
+void DivInstrument::readFeatureWL(SafeReader& reader, DivSong* song, short version) {
   READ_FEAT_BEGIN;
 
   unsigned int wavePtr[256];
   unsigned char waveIndex[256];
+  unsigned char waveRemap[256];
   memset(wavePtr,0,256*sizeof(unsigned int));
   memset(waveIndex,0,256);
+  memset(waveRemap,0,256);
 
   unsigned char waveCount=reader.readC();
 
@@ -2249,10 +2351,40 @@ void DivInstrument::readFeatureWL(SafeReader& reader, const DivSong* song) {
 
   size_t lastSeek=reader.tell();
 
-  // TODO: load samples here
+  // load wavetables
+  for (int i=0; i<waveCount; i++) {
+    reader.seek(wavePtr[i],SEEK_SET);
+    if (song->wave.size()>=256) {
+      break;
+    }
+    DivWavetable* wave=new DivWavetable;
+    int waveCount=(int)song->wave.size();
+
+    DivDataErrors result=wave->readWaveData(reader,version);
+    if (result==DIV_DATA_SUCCESS) {
+      song->wave.push_back(wave);
+      song->waveLen=waveCount+1;
+      waveRemap[waveIndex[i]]=waveCount;
+    } else {
+      delete wave;
+      waveRemap[waveIndex[i]]=0;
+    }
+  }
 
   reader.seek(lastSeek,SEEK_CUR);
 
+  // re-map wavetables
+  if (ws.enabled) {
+    if (ws.wave1>=0 && ws.wave1<256) ws.wave1=waveRemap[ws.wave1];
+    if (ws.effect&0x80) {
+      if (ws.wave2>=0 && ws.wave2<256) ws.wave2=waveRemap[ws.wave2];
+    }
+  }
+  if (n163.wave>=0 && n163.wave<256) n163.wave=waveRemap[n163.wave];
+  for (int i=0; i<std.waveMacro.len; i++) {
+    if (std.waveMacro.val[i]>=0 && std.waveMacro.val[i]<256) std.waveMacro.val[i]=waveRemap[std.waveMacro.val[i]];
+  }
+
   READ_FEAT_END;
 }
 
@@ -2358,9 +2490,9 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
     } else if (memcmp(featCode,"WS",2)==0) { // WaveSynth
       readFeatureWS(reader);
     } else if (memcmp(featCode,"SL",2)==0 && fui && song!=NULL) { // sample list
-      readFeatureSL(reader,NULL);
+      readFeatureSL(reader,song,version);
     } else if (memcmp(featCode,"WL",2)==0 && fui && song!=NULL) { // wave list
-      readFeatureWL(reader,NULL);
+      readFeatureWL(reader,song,version);
     } else if (memcmp(featCode,"MP",2)==0) { // MultiPCM
       readFeatureMP(reader);
     } else if (memcmp(featCode,"SU",2)==0) { // Sound Unit
@@ -3118,30 +3250,32 @@ DivDataErrors DivInstrument::readInsData(SafeReader& reader, short version, DivS
   return readInsDataOld(reader,version);
 }
 
-bool DivInstrument::save(const char* path) {
+bool DivInstrument::save(const char* path, bool oldFormat, DivSong* song) {
   SafeWriter* w=new SafeWriter();
   w->init();
 
-  //putInsData2(w,true);
+  if (oldFormat) {
+    // write magic
+    w->write("-Furnace instr.-",16);
 
-  // write magic
-  w->write("-Furnace instr.-",16);
+    // write version
+    w->writeS(DIV_ENGINE_VERSION);
 
-  // write version
-  w->writeS(DIV_ENGINE_VERSION);
+    // reserved
+    w->writeS(0);
 
-  // reserved
-  w->writeS(0);
+    // pointer to data
+    w->writeI(32);
 
-  // pointer to data
-  w->writeI(32);
+    // currently reserved (TODO; wavetable and sample here)
+    w->writeS(0);
+    w->writeS(0);
+    w->writeI(0);
 
-  // currently reserved (TODO; wavetable and sample here)
-  w->writeS(0);
-  w->writeS(0);
-  w->writeI(0);
-
-  putInsData(w);
+    putInsData(w);
+  } else {
+    putInsData2(w,true,song);
+  }
 
   FILE* outFile=ps_fopen(path,"wb");
   if (outFile==NULL) {
diff --git a/src/engine/instrument.h b/src/engine/instrument.h
index 21ede72b1..829223f22 100644
--- a/src/engine/instrument.h
+++ b/src/engine/instrument.h
@@ -674,8 +674,8 @@ struct DivInstrument {
   void readFeatureN1(SafeReader& reader);
   void readFeatureFD(SafeReader& reader);
   void readFeatureWS(SafeReader& reader);
-  void readFeatureSL(SafeReader& reader, const DivSong* song);
-  void readFeatureWL(SafeReader& reader, const DivSong* song);
+  void readFeatureSL(SafeReader& reader, DivSong* song, short version);
+  void readFeatureWL(SafeReader& reader, DivSong* song, short version);
   void readFeatureMP(SafeReader& reader);
   void readFeatureSU(SafeReader& reader);
   void readFeatureES(SafeReader& reader);
@@ -707,9 +707,11 @@ struct DivInstrument {
   /**
    * save this instrument to a file.
    * @param path file path.
+   * @param oldFormat whether to save in legacy Furnace ins format.
+   * @param song if new format, a DivSong to read wavetables and samples.
    * @return whether it was successful.
    */
-  bool save(const char* path);
+  bool save(const char* path, bool oldFormat=false, DivSong* song=NULL);
 
   /**
    * save this instrument to a file in .dmp format.
diff --git a/src/engine/sample.cpp b/src/engine/sample.cpp
index f4a0d98b9..5f84aad01 100644
--- a/src/engine/sample.cpp
+++ b/src/engine/sample.cpp
@@ -39,6 +39,185 @@ DivSampleHistory::~DivSampleHistory() {
   if (data!=NULL) delete[] data;
 }
 
+void DivSample::putSampleData(SafeWriter* w) {
+  size_t blockStartSeek, blockEndSeek;
+
+  w->write("SMP2",4);
+  blockStartSeek=w->tell();
+  w->writeI(0);
+
+  w->writeString(name,false);
+  w->writeI(samples);
+  w->writeI(rate);
+  w->writeI(centerRate);
+  w->writeC(depth);
+  w->writeC(loopMode);
+  w->writeC(0); // reserved
+  w->writeC(0);
+  w->writeI(loop?loopStart:-1);
+  w->writeI(loop?loopEnd:-1);
+
+  for (int i=0; i<4; i++) {
+    w->writeI(0xffffffff);
+  }
+
+#ifdef TA_BIG_ENDIAN
+  // store 16-bit samples as little-endian
+  if (depth==DIV_SAMPLE_DEPTH_16BIT) {
+    unsigned char* sampleBuf=(unsigned char*)getCurBuf();
+    size_t bufLen=getCurBufLen();
+    for (size_t i=0; i<bufLen; i+=2) {
+      w->writeC(sampleBuf[i+1]);
+      w->writeC(sampleBuf[i]);
+    }
+  } else {
+    w->write(getCurBuf(),getCurBufLen());
+  }
+#else
+  w->write(getCurBuf(),getCurBufLen());
+#endif
+
+  blockEndSeek=w->tell();
+  w->seek(blockStartSeek,SEEK_SET);
+  w->writeI(blockEndSeek-blockStartSeek-4);
+  w->seek(0,SEEK_END);
+}
+
+// Delek why
+static double samplePitchesSD[11]={
+  0.1666666666, 0.2, 0.25, 0.333333333, 0.5,
+  1,
+  2, 3, 4, 5, 6
+};
+
+DivDataErrors DivSample::readSampleData(SafeReader& reader, short version) {
+  int vol=0;
+  int pitch=0;
+  char magic[4];
+
+  reader.read(magic,4);
+  if (strcmp(magic,"SMPL")!=0 && strcmp(magic,"SMP2")!=0) {
+    return DIV_DATA_INVALID_HEADER;
+  }
+  bool isNewSample=(strcmp(magic,"SMP2")==0);
+  reader.readI();
+  if (!isNewSample) logV("(old sample)");
+
+  name=reader.readString();
+  samples=reader.readI();
+  if (!isNewSample) {
+    loopEnd=samples;
+  }
+  rate=reader.readI();
+
+  if (isNewSample) {
+    centerRate=reader.readI();
+    depth=(DivSampleDepth)reader.readC();
+    if (version>=123) {
+      loopMode=(DivSampleLoopMode)reader.readC();
+    } else {
+      loopMode=DIV_SAMPLE_LOOP_FORWARD;
+      reader.readC();
+    }
+
+    // reserved
+    reader.readC();
+    reader.readC();
+
+    loopStart=reader.readI();
+    loopEnd=reader.readI();
+    loop=(loopStart>=0)&&(loopEnd>=0);
+
+    for (int i=0; i<4; i++) {
+      reader.readI();
+    }
+  } else {
+    if (version<58) {
+      vol=reader.readS();
+      pitch=reader.readS();
+    } else {
+      reader.readI();
+    }
+    depth=(DivSampleDepth)reader.readC();
+
+    // reserved
+    reader.readC();
+
+    // while version 32 stored this value, it was unused.
+    if (version>=38) {
+      centerRate=(unsigned short)reader.readS();
+    } else {
+      reader.readS();
+    }
+
+    if (version>=19) {
+      loopStart=reader.readI();
+      loop=(loopStart>=0)&&(loopEnd>=0);
+    } else {
+      reader.readI();
+    }
+  }
+
+  if (version>=58) { // modern sample
+    init(samples);
+    reader.read(getCurBuf(),getCurBufLen());
+#ifdef TA_BIG_ENDIAN
+    // convert 16-bit samples to big-endian
+    if (depth==DIV_SAMPLE_DEPTH_16BIT) {
+      unsigned char* sampleBuf=(unsigned char*)getCurBuf();
+      size_t sampleBufLen=getCurBufLen();
+      for (size_t pos=0; pos<sampleBufLen; pos+=2) {
+        sampleBuf[pos]^=sampleBuf[pos+1];
+        sampleBuf[pos+1]^=sampleBuf[pos];
+        sampleBuf[pos]^=sampleBuf[pos+1];
+      }
+    }
+#endif
+  } else { // legacy sample
+    int length=samples;
+    short* data=new short[length];
+    reader.read(data,2*length);
+
+#ifdef TA_BIG_ENDIAN
+    // convert 16-bit samples to big-endian
+    for (int pos=0; pos<length; pos++) {
+      data[pos]=((unsigned short)data[pos]>>8)|((unsigned short)data[pos]<<8);
+    }
+#endif
+
+    if (pitch!=5) {
+      logD("scaling from %d...",pitch);
+    }
+
+    // render data
+    if (depth!=DIV_SAMPLE_DEPTH_8BIT && depth!=DIV_SAMPLE_DEPTH_16BIT) {
+      logW("sample depth is wrong! (%d)",depth);
+      depth=DIV_SAMPLE_DEPTH_16BIT;
+    }
+    samples=(double)samples/samplePitchesSD[pitch];
+    init(samples);
+
+    unsigned int k=0;
+    float mult=(float)(vol)/50.0f;
+    for (double j=0; j<length; j+=samplePitchesSD[pitch]) {
+      if (k>=samples) {
+        break;
+      }
+      if (depth==DIV_SAMPLE_DEPTH_8BIT) {
+        float next=(float)(data[(unsigned int)j]-0x80)*mult;
+        data8[k++]=fmin(fmax(next,-128),127);
+      } else {
+        float next=(float)data[(unsigned int)j]*mult;
+        data16[k++]=fmin(fmax(next,-32768),32767);
+      }
+    }
+
+    delete[] data;
+  }
+
+  return DIV_DATA_SUCCESS;
+}
+
 bool DivSample::isLoopable() {
   return loop && ((loopStart>=0 && loopStart<loopEnd) && (loopEnd>loopStart && loopEnd<=(int)samples));
 }
diff --git a/src/engine/sample.h b/src/engine/sample.h
index 9fa11abf3..e0d2c5d7c 100644
--- a/src/engine/sample.h
+++ b/src/engine/sample.h
@@ -21,6 +21,8 @@
 #define _SAMPLE_H
 
 #include "../ta-utils.h"
+#include "safeWriter.h"
+#include "dataErrors.h"
 #include <deque>
 
 enum DivSampleLoopMode: unsigned char {
@@ -130,6 +132,20 @@ struct DivSample {
   std::deque<DivSampleHistory*> undoHist;
   std::deque<DivSampleHistory*> redoHist;
 
+  /**
+   * put sample data.
+   * @param w a SafeWriter.
+   */
+  void putSampleData(SafeWriter* w);
+
+  /**
+   * read sample data.
+   * @param reader the reader.
+   * @param version the format version.
+   * @return a DivDataErrors.
+   */
+  DivDataErrors readSampleData(SafeReader& reader, short version);
+
   /**
    * check if sample is loopable.
    * @return whether it is loopable.
diff --git a/src/gui/dataList.cpp b/src/gui/dataList.cpp
index 20f66dd59..face74247 100644
--- a/src/gui/dataList.cpp
+++ b/src/gui/dataList.cpp
@@ -132,6 +132,9 @@ void FurnaceGUI::drawInsList(bool asChild) {
         if (ImGui::MenuItem("instrument")) {
           doAction(GUI_ACTION_INS_LIST_SAVE);
         }
+        if (ImGui::MenuItem("instrument (legacy .fui)")) {
+          doAction(GUI_ACTION_INS_LIST_SAVE_OLD);
+        }
         if (ImGui::MenuItem("instrument (.dmp)")) {
           doAction(GUI_ACTION_INS_LIST_SAVE_DMP);
         }
@@ -151,6 +154,9 @@ void FurnaceGUI::drawInsList(bool asChild) {
       }
     } else {
       if (ImGui::BeginPopupContextItem("InsSaveFormats",ImGuiMouseButton_Right)) {
+        if (ImGui::MenuItem("save in legacy format...")) {
+          doAction(GUI_ACTION_INS_LIST_SAVE_OLD);
+        }
         if (ImGui::MenuItem("save as .dmp...")) {
           doAction(GUI_ACTION_INS_LIST_SAVE_DMP);
         }
@@ -434,6 +440,9 @@ void FurnaceGUI::drawInsList(bool asChild) {
             if (ImGui::MenuItem("save")) {
               doAction(GUI_ACTION_INS_LIST_SAVE);
             }
+            if (ImGui::MenuItem("save (legacy .fui)")) {
+              doAction(GUI_ACTION_INS_LIST_SAVE_OLD);
+            }
             if (ImGui::MenuItem("save (.dmp)")) {
               doAction(GUI_ACTION_INS_LIST_SAVE_DMP);
             }
diff --git a/src/gui/doAction.cpp b/src/gui/doAction.cpp
index 941d037c5..14fb4466a 100644
--- a/src/gui/doAction.cpp
+++ b/src/gui/doAction.cpp
@@ -599,6 +599,9 @@ void FurnaceGUI::doAction(int what) {
     case GUI_ACTION_INS_LIST_SAVE:
       if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE);
       break;
+    case GUI_ACTION_INS_LIST_SAVE_OLD:
+      if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE_OLD);
+      break;
     case GUI_ACTION_INS_LIST_SAVE_DMP:
       if (curIns>=0 && curIns<(int)e->song.ins.size()) openFileDialog(GUI_FILE_INS_SAVE_DMP);
       break;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 93c333689..54e2eedda 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1506,6 +1506,16 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
         dpiScale
       );
       break;
+    case GUI_FILE_INS_SAVE_OLD:
+      if (!dirExists(workingDirIns)) workingDirIns=getHomeDir();
+      hasOpened=fileDialog->openSave(
+        "Save Instrument",
+        {"Furnace instrument", "*.fui"},
+        "Furnace instrument{.fui}",
+        workingDirIns,
+        dpiScale
+      );
+      break;
     case GUI_FILE_INS_SAVE_DMP:
       if (!dirExists(workingDirIns)) workingDirIns=getHomeDir();
       hasOpened=fileDialog->openSave(
@@ -3855,6 +3865,7 @@ bool FurnaceGUI::loop() {
         case GUI_FILE_INS_OPEN:
         case GUI_FILE_INS_OPEN_REPLACE:
         case GUI_FILE_INS_SAVE:
+        case GUI_FILE_INS_SAVE_OLD:
         case GUI_FILE_INS_SAVE_DMP:
           workingDirIns=fileDialog->getPath()+DIR_SEPARATOR_STR;
           break;
@@ -3950,6 +3961,9 @@ bool FurnaceGUI::loop() {
           if (curFileDialog==GUI_FILE_INS_SAVE) {
             checkExtension(".fui");
           }
+          if (curFileDialog==GUI_FILE_INS_SAVE_OLD) {
+            checkExtension(".fui");
+          }
           if (curFileDialog==GUI_FILE_INS_SAVE_DMP) {
             checkExtension(".dmp");
           }
@@ -4041,7 +4055,12 @@ bool FurnaceGUI::loop() {
               break;
             case GUI_FILE_INS_SAVE:
               if (curIns>=0 && curIns<(int)e->song.ins.size()) {
-                e->song.ins[curIns]->save(copyOfName.c_str());
+                e->song.ins[curIns]->save(copyOfName.c_str(),false,&e->song);
+              }
+              break;
+            case GUI_FILE_INS_SAVE_OLD:
+              if (curIns>=0 && curIns<(int)e->song.ins.size()) {
+                e->song.ins[curIns]->save(copyOfName.c_str(),true);
               }
               break;
             case GUI_FILE_INS_SAVE_DMP:
diff --git a/src/gui/gui.h b/src/gui/gui.h
index f57e14429..8775a5f2c 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -313,6 +313,7 @@ enum FurnaceGUIFileDialogs {
   GUI_FILE_INS_OPEN,
   GUI_FILE_INS_OPEN_REPLACE,
   GUI_FILE_INS_SAVE,
+  GUI_FILE_INS_SAVE_OLD,
   GUI_FILE_INS_SAVE_DMP,
   GUI_FILE_WAVE_OPEN,
   GUI_FILE_WAVE_OPEN_REPLACE,
@@ -507,6 +508,7 @@ enum FurnaceGUIActions {
   GUI_ACTION_INS_LIST_OPEN,
   GUI_ACTION_INS_LIST_OPEN_REPLACE,
   GUI_ACTION_INS_LIST_SAVE,
+  GUI_ACTION_INS_LIST_SAVE_OLD,
   GUI_ACTION_INS_LIST_SAVE_DMP,
   GUI_ACTION_INS_LIST_MOVE_UP,
   GUI_ACTION_INS_LIST_MOVE_DOWN,
diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp
index 5b8c5dc7d..b542b3f71 100644
--- a/src/gui/guiConst.cpp
+++ b/src/gui/guiConst.cpp
@@ -590,6 +590,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
   D("INS_LIST_OPEN", "Open", 0),
   D("INS_LIST_OPEN_REPLACE", "Open (replace current)", 0),
   D("INS_LIST_SAVE", "Save", 0),
+  D("INS_LIST_SAVE_OLD", "Save (legacy .fui)", 0),
   D("INS_LIST_SAVE_DMP", "Save (.dmp)", 0),
   D("INS_LIST_MOVE_UP", "Move up", FURKMOD_SHIFT|SDLK_UP),
   D("INS_LIST_MOVE_DOWN", "Move down", FURKMOD_SHIFT|SDLK_DOWN),
@@ -1084,4 +1085,4 @@ const char* chipCategoryNames[]={
   "Special",
   "Sample",
   NULL
-};
\ No newline at end of file
+};
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index c2e2cb016..7dc010697 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -2167,6 +2167,9 @@ void FurnaceGUI::drawInsEdit() {
           doAction(GUI_ACTION_INS_LIST_SAVE);
         }
         if (ImGui::BeginPopupContextItem("InsSaveFormats",ImGuiMouseButton_Right)) {
+          if (ImGui::MenuItem("save in legacy format...")) {
+            doAction(GUI_ACTION_INS_LIST_SAVE_OLD);
+          }
           if (ImGui::MenuItem("save as .dmp...")) {
             doAction(GUI_ACTION_INS_LIST_SAVE_DMP);
           }

From bf501cbe883424597efa1361010cd1b29a72d9b4 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 02:38:17 -0500
Subject: [PATCH 43/86] debug wavetables?

---
 src/engine/wavetable.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/engine/wavetable.cpp b/src/engine/wavetable.cpp
index 9de8544fe..e068f06a1 100644
--- a/src/engine/wavetable.cpp
+++ b/src/engine/wavetable.cpp
@@ -48,6 +48,7 @@ DivDataErrors DivWavetable::readWaveData(SafeReader& reader, short version) {
   char magic[4];
   reader.read(magic,4);
   if (memcmp(magic,"WAVE",4)!=0) {
+    logV("header is invalid: %c%c%c%c",magic[0],magic[1],magic[2],magic[3]);
     return DIV_DATA_INVALID_HEADER;
   }
   reader.readI(); // reserved
@@ -57,7 +58,10 @@ DivDataErrors DivWavetable::readWaveData(SafeReader& reader, short version) {
   min=reader.readI();
   max=reader.readI();
 
-  if (len>256 || min!=0 || max>255) return DIV_DATA_INVALID_DATA;
+  if (len>256 || min!=0 || max>255) {
+    logV("invalid len/min/max: %d %d %d",len,min,max);
+    return DIV_DATA_INVALID_DATA;
+  }
 
   for (int i=0; i<len; i++) {
     data[i]=reader.readI();

From 1a31b80ea627ad6e903657fc4600cab09411ba38 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 02:41:57 -0500
Subject: [PATCH 44/86] fix critical bug

---
 src/engine/sample.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/engine/sample.cpp b/src/engine/sample.cpp
index 5f84aad01..2c15f676c 100644
--- a/src/engine/sample.cpp
+++ b/src/engine/sample.cpp
@@ -96,10 +96,11 @@ DivDataErrors DivSample::readSampleData(SafeReader& reader, short version) {
   char magic[4];
 
   reader.read(magic,4);
-  if (strcmp(magic,"SMPL")!=0 && strcmp(magic,"SMP2")!=0) {
+  if (memcmp(magic,"SMPL",4)!=0 && memcmp(magic,"SMP2",4)!=0) {
+    logV("header is invalid: %c%c%c%c",magic[0],magic[1],magic[2],magic[3]);
     return DIV_DATA_INVALID_HEADER;
   }
-  bool isNewSample=(strcmp(magic,"SMP2")==0);
+  bool isNewSample=(memcmp(magic,"SMP2",4)==0);
   reader.readI();
   if (!isNewSample) logV("(old sample)");
 

From 82649c9c816b5826d54baf7f8e90c0d2b0b42ba4 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 02:55:12 -0500
Subject: [PATCH 45/86] fix crash when loading instrument with samples

---
 src/gui/gui.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 54e2eedda..9d9136baa 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1474,8 +1474,12 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
         workingDirIns,
         dpiScale,
         [this](const char* path) {
+          int sampleCountBefore=e->song.sampleLen;
           std::vector<DivInstrument*> instruments=e->instrumentFromFile(path);
           if (!instruments.empty()) {
+            if (e->song.sampleLen!=sampleCountBefore) {
+              e->renderSamplesP();
+            }
             if (curFileDialog==GUI_FILE_INS_OPEN_REPLACE) {
               if (prevIns==-3) {
                 prevIns=curIns;
@@ -3069,10 +3073,14 @@ bool FurnaceGUI::loop() {
           break;
         case SDL_DROPFILE:
           if (ev.drop.file!=NULL) {
+            int sampleCountBefore=e->song.sampleLen;
             std::vector<DivInstrument*> instruments=e->instrumentFromFile(ev.drop.file);
             DivWavetable* droppedWave=NULL;
             DivSample* droppedSample=NULL;;
             if (!instruments.empty()) {
+              if (e->song.sampleLen!=sampleCountBefore) {
+                e->renderSamplesP();
+              }
               if (!e->getWarnings().empty()) {
                 showWarning(e->getWarnings(),GUI_WARN_GENERIC);
               }
@@ -4160,6 +4168,7 @@ bool FurnaceGUI::loop() {
               bool ask=false;
               bool warn=false;
               String warns="there were some warnings/errors while loading instruments:\n";
+              int sampleCountBefore=e->song.sampleLen;
               for (String i: fileDialog->getFileName()) {
                 std::vector<DivInstrument*> insTemp=e->instrumentFromFile(i.c_str());
                 if (insTemp.empty()) {
@@ -4174,6 +4183,9 @@ bool FurnaceGUI::loop() {
                   instruments.push_back(j);
                 }
               }
+              if (e->song.sampleLen!=sampleCountBefore) {
+                e->renderSamplesP();
+              }
               if (warn) {
                 if (instruments.empty()) {
                   if (fileDialog->getFileName().size()>1) {
@@ -4203,8 +4215,12 @@ bool FurnaceGUI::loop() {
               break;
             }
             case GUI_FILE_INS_OPEN_REPLACE: {
+              int sampleCountBefore=e->song.sampleLen;
               std::vector<DivInstrument*> instruments=e->instrumentFromFile(copyOfName.c_str());
               if (!instruments.empty()) {
+                if (e->song.sampleLen!=sampleCountBefore) {
+                  e->renderSamplesP();
+                }
                 if (!e->getWarnings().empty()) {
                   showWarning(e->getWarnings(),GUI_WARN_GENERIC);
                 }

From 0627e38d63482b5c06121360147d650d87a3ddca Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 03:01:57 -0500
Subject: [PATCH 46/86] don't load assets when loading temp ins

---
 src/engine/engine.h       | 2 +-
 src/engine/fileOpsIns.cpp | 4 ++--
 src/engine/instrument.cpp | 6 +++++-
 src/gui/gui.cpp           | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/engine/engine.h b/src/engine/engine.h
index 0c2782050..80dfe67a8 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -766,7 +766,7 @@ class DivEngine {
 
     // get instrument from file
     // if the returned vector is empty then there was an error.
-    std::vector<DivInstrument*> instrumentFromFile(const char* path);
+    std::vector<DivInstrument*> instrumentFromFile(const char* path, bool loadAssets=true);
 
     // load temporary instrument
     void loadTempIns(DivInstrument* which);
diff --git a/src/engine/fileOpsIns.cpp b/src/engine/fileOpsIns.cpp
index c002efea2..4920308b5 100644
--- a/src/engine/fileOpsIns.cpp
+++ b/src/engine/fileOpsIns.cpp
@@ -1814,7 +1814,7 @@ void DivEngine::loadWOPN(SafeReader& reader, std::vector<DivInstrument*>& ret, S
   }
 }
 
-std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path) {
+std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path, bool loadAssets) {
   std::vector<DivInstrument*> ret;
   warnings="";
 
@@ -1919,7 +1919,7 @@ std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path) {
         reader.seek(dataPtr,SEEK_SET);
       }
 
-      if (ins->readInsData(reader,version,&song)!=DIV_DATA_SUCCESS) {
+      if (ins->readInsData(reader,version,loadAssets?(&song):NULL)!=DIV_DATA_SUCCESS) {
         lastError="invalid instrument header/data!";
         delete ins;
         delete[] buf;
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 3bba85340..867d25640 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -2502,7 +2502,11 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
     } else if (memcmp(featCode,"X1",2)==0) { // X1-010
       readFeatureX1(reader);
     } else {
-      logW("unknown feature code %c%c!",featCode[0],featCode[1]);
+      if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
+        // nothing
+      } else {
+        logW("unknown feature code %c%c!",featCode[0],featCode[1]);
+      }
       // skip feature
       unsigned short skip=reader.readS();
       reader.seek(skip,SEEK_CUR);
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 9d9136baa..99455b150 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1475,7 +1475,7 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
         dpiScale,
         [this](const char* path) {
           int sampleCountBefore=e->song.sampleLen;
-          std::vector<DivInstrument*> instruments=e->instrumentFromFile(path);
+          std::vector<DivInstrument*> instruments=e->instrumentFromFile(path,false);
           if (!instruments.empty()) {
             if (e->song.sampleLen!=sampleCountBefore) {
               e->renderSamplesP();

From 51f5ffe05b282182c3ac691fee1b2ae17fb9e034 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 03:33:33 -0500
Subject: [PATCH 47/86] one more demo song

by SuperJet Spade
---
 demos/Rave_Dancetune_VSU-VUE.fur | Bin 0 -> 4692 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 demos/Rave_Dancetune_VSU-VUE.fur

diff --git a/demos/Rave_Dancetune_VSU-VUE.fur b/demos/Rave_Dancetune_VSU-VUE.fur
new file mode 100644
index 0000000000000000000000000000000000000000..6af04b61f7f16063a0dff3c18d6fbb7f786f2697
GIT binary patch
literal 4692
zcmaJ@c{tQ<+b$G?7$c!*OxuXE%Ti2Zl!`17BQb_7B|O>pA;T!LBuf-R^4MeIF}7sQ
zzGajxQHC)X>lm}Vqvt)2=l#Cp``&-9<GAnNwVd~PUDt8`0$x#U-QuJSM9N-HHjLYp
zhxQ>L#(c*w0>&WX9etvD_d3$Xl;Q71VIUF6*hDGi=CWV!RMzX*a0%=SASiK-`w0*L
zc*Ee60b&wAna6<nqULx(GSq9pN*=uvigtnF3sYItzR9hJ{e3-sM*Sg<H6DZ@LJ^^;
zps2vVAou~%q0Tz<Pn-49uWhyT5s--W$i=ORMz<AW>{32bEyj5H()HrPzx*C+x<chm
z2ERMvewg~0Fw#9f{3>B~+>v(cB2@X+draPS>l?Wk+p8_@+S{*a&HKRH`-7ijfp4U`
z_r$lRfRZVeeM1Xj#F<>eUU~Of?NIz@C8<}@R4LKvz}vZsuMit#ff(J&BvN_ilW#Up
z?EcDfeZV_7TleI`)Qt@tOI<vUWKvS^$7?pzqCY=n=(7;2Ppp382fOC8?Gke|0i;9Y
z8Jy3)cW3A5U`-Z;KIkvm=<>vles-|9Nk#>8#iws2Mqx*FP#tsf+otxQt*40ec}cw5
z{ee8PAib;YV5oOj4%p6RU|mCU<A?jf2Co5`S;vE~L$l%H{(=O$`N7Gx7&tCViPUL+
zP-hhn&)$uPo9Ma?XoNWr2xn=K(wfvs35t>%YpAi0D0NbahTu2Xbe}KS>l)ckL(RTt
zq^InMp7fs4sr-_!h;kWH)yUXj-cQaNcN_w5Wo&Fmo_XEak^f;k13y!EeLUlgXtuR%
zYI}RPXiE6I0&CgyXid6$W5)xcFmaqhFZpuc+Nh;e^rjoJcenKAC^cyOfpoRD!7+hR
zz2d-D?Fo-woAI)VAe|=suw4=U$i<Rc59tT^i?JWH++5r~-$C9Xjm#^$td9Oj${RiI
zR;}#TOI$8jm0I^LRvC6^b=H1n>D^qUF8ReTa&T&-O$U|j`62Cszn0eUEV6Xcy2AO_
z9f3{1C{bq~e`4n5f%YSgk0Q{Zhog0O?a-6&$4DcR9>s%8BjcM<#*tJzkq~R>(bsvF
zk&wAr2F)Qaw8`GFOnI6#!egUa8hF*>8aA(Vf}j~nsV0}>o#QXWTjOkEm*`ik#_^ut
z2yX-P2TMG)D#jXXKGfM>WPBVMbt^BlIJcnu#lQR2gmEA96I=YXO~>4AI%pRvlosdS
zJK4zo*!L*+^c}-pH>h^0<-F`86Q{M&&7Zf>Ybv?7Ouj@f4DHf$(Io`0%fW53##s$L
z7O6ER5~9fkF1x2*UL<hKjyvtVZ=43YOM%AjU!iJS+PQQN?rK|H>I~$+Duk!sKQwN&
z4f=2n*Cwnjr)_y3wE#W%+L_lnYDCa9Ot2meg<g>iI85NyiClj3nfgfO6z)Y(SNUwx
zM!NKM|Is5yN=omv4;CFWn10JLipy+%aLg(y1(3NU@dV<9(6FU32jCN5(kziRZ*893
zNp1PTD=jA7IyurYjQ+7K<UcW4;51<yjo?~$bSOv&i^-!8@sp!{<juOhkc^zX+(^v~
zI!)6^Dzq~`Z};d2XTxqK!sxTSm0Or2zrsRnoy6yrM+09-*Tk-0>lR>#mfMSq*<#V5
z_oFr)2q}e5TIa$B%m(2S#-RbyX9O{$LM=5lM+JPz)$KjZJM9khAjPO%WmOOUKDA2K
zsGix9mLa=b>0o4SM9R&QyPaJ}Ez^1Y6J>7@j%Td;^3?fON`q(f#YR&WEOS$TR?y%E
zS9srRZYukwBN+=$?*lMZqh)TAae=^}qY@V+gz2_KK#$O~`$xjxT?ya1A{v22-9a<c
zJx)Kc7K#P?Soi>A%)$0JKr1iha)?`Lp3}Zx=Ohj*?5l!~dwl<?+8=)f7XEIcXPBRy
z`5%OQ&!FdM8U3MikC(Vm`;AI3pk#iCt6)%7A7Xv`mDe5NJ*VX#K?sY6@+ICwrTXW)
z(bUNJr$V`Ii+R741~)zCxyRcdPJWvn+}xfpYb6G+Ze#@BK~E<C2P~91Sc7TjPrQlq
z2z-@|ykK9)Oyku$?i7HZF~jv|u7MSHq~tJ$=^Z`Z)>;WE>(;g5DgKpf3YHftyp-kB
zD%Xx%j;$*-q@|p-tgfg`NhwCwMyHUGfna%!3a`AIsIC`I{$tB>D=to%H|I`d?(gf-
zDyeUAUcOZ4-tf#Z*)|}%d#ULdrFxwLFJpi@rCJYzo9nE1!kPZD=cByc|9s@EfPY!>
z5Rm00I!m<kP`&^4d2L3D@0Pt516230^6lNqN1lnwZ3eZY$C+0yJofbq9Xit^=@o|a
zvl}Y=R#8Q9E4q-SJ`(&SQ+)pP^3%y*_4r<NbnirCrqG1e`xBDd6m3%j>CGjg)i`GO
zlkj3;Ue@J?G+>Mrz7-^w{1*5p8n`Jk(w#*=k6>#R29uk(nDaTyrR<_3^zC2M_6hac
z>!_G0j3>Ped$|W6gSEfib>L~xUv%udu<ikj(Bc%m{PN#{MNzDV9dSTJBSYL_W;(M`
z9s-0xQwfIUCP98c$`sFFnSZb(rPiZ7M~6tc-8&wrm*X7_S8g<`sRMCQi%x<bhtxo&
z69?k4`zW73K&1zgfca-2z-+HmdzXIrcQv6Sn_trx-Za+h8Z+L_@>fNuTb!W+3^Hhl
z(AG^mJ*Cmxjj9OKg5kN4#UIOwc*Ly_#VRr|+D*CVR>7lWLO&4Bo>@E)#WG;?h%N)<
zo<fyKVEXoh{*XOF#BkWl4TnxFoE5treAxU(-~~PsY?@v!$E7!9{;6n7wxIP5dub82
zkZm-?N{-|_E>`3e6N`hk-Xo_&I%`-|EFTlW-ucob5Bc6LhK`n5F^L(#G;U^ZLiKxq
zb2jXB$f^$FBT;n(6TOcz^DQ~7TblB@8p=$)_$}GpL_6o5&i4YH9A0;n6SUa{#5I3F
zkD9vhU`>xy<B^Cwbk-F!VrC%i%P~6bL5h$+QWX^Z6h(q{b*{nz_4nr?^5ey}jN*lx
z$BwJBx?-ql=ASUgouEy{X8|DtY}d_|G#Cjc!NQYaOU!I>X8!A@9GU>6W90_ltGBT;
zz=JdW1VlJ%a}>sD0~rk14|*H};&NGV(8R)NRm;E}Ov7dZR%V)Rpcjsn$;E!OCP)aO
zfvl2?JS3DS^W+`_NkAD$jO-pVW8M}xbv}x1CaG^X_wFK_!@~}awcd*n1VmK%JWAqM
z`+5agAnxjflcT;pS<icEin20Uwuln?3OmPq`iqeUS{7!KOWBWeF{e+3-e$kYE);L1
z`LS9Sh3Ujhb_L!0G>^lAL&{~rD|I(yidb?Hh4f;c=f13#Y6LrI9bB!mfX(NlzoFyY
z`|DT+le&w$RzG1Dl(OHrO=7gy6C}AvU{#*x-FYTJWG^S53t#I{TY%n3CWh0kzm2Xl
zpArH%D9FM5KHzMGh6DOU;722FHmz$PUAP6j0T#r3+e|1ITup(~()g_vWKvI`i1yeS
zYO6Gc+xOjSH=E%WRQkB@Z*%ShQW0|4&}#jxV&h=S3_+7W*ZAt9@9O}S(pR4!!ZoCQ
zX4~h-P~U!X5vT)E%m|O?KEv_-is$5gs#M|&NkZgu3))@4oAi@d1kdCtYBTGy#`Ta2
z*uWP+HVSD;a(0q38<a-t$)=X!{;NYLFBS{*Np9oa<^DU36*MFaZT%)Q<&pjse=Ok5
z7~#ZO93NpJKhux%A*UERiJx5;;I`FSD3H!ZNstz=YcyjAz7p~ca*Rxd&(e7goiUZT
zW>15LH`DkhTh+BgB5B^+=MSByxsr~krJ|HVsGqg?bjPxF*96*8c(3?7VOLw%j<rsE
zU5qhNSZ<7NUlWKH-s0UgG;S)xnm)93)IUeV3-|yr-G@%<*2blJg#6?1Wx2!G>_@C+
z*q6=@a&LB>=PNJC^OLkWaY68sVw|)l<Iey|wRjogp*6R>dXE8azeF;Jv?^Z_XV-h7
z$_UYfFf^v3sjyun4%Rc!N!h2W_J}0TsU7=33cgwk(tGbK=ImN8$gQeI{e92Dl>R1Z
zyG;;%mmbB8de7YhjIQfT0X{A5mOAh{H#x*JX?YsXzb#-$w$jeYR0yGUiTWhBa>%uP
zy}A?S6y;&rE+RIW6l!t85^@*^j_#nuF%RqXfI2W{iOpU1V?TucnGol_39%uj5Q0-*
z)T!$t{;G6*$$~~Ot+;}1xPlG2g3Y;t5nQ_oJX@ZC5}4NcVc6*k%r*ORL;LdU_T@M1
z%Qu=|AttS^BHCl)T)vLoQ%U@M<Ba*sB`59Y3%3fqYuw|K!aqMG;U~{5_1lCg8qynO
zBN}8Pm`JYOYM!mzfTdW_7y^Ve<k~IdskY)8SBP*=`Z#K6pR7wU8T~J5HMgKu5Hv<C
zjoHj@W&@BRtn!Sr?D;t2IGbv9D`-1&nbj{@Uc;6@cg&N{$d=!GBm{y*Ea4y!eZ3g0
z>BsNv@9ab%zXV9H0rV;NCecbyHcU;S8S)9T)tm@C!SRx{U&X9quJIiZ1iY~W%$TZT
z9ms?smFOAZ3^3_;<SFbbhU*|3hXn%A>@k(S9+8z0e7G^;*e-~+k|(Y(HQQKdFaiQG
zGSDN<LX#DYezDu#)5ra!dCAq(=ZAuA^oXJThaaZzPN}%3?;clsnEscQix~ZYktcGH
zg-q@cjU1&B-tFf;r}B5Bw1hhTusuhXJ<@gF59Y5h9P0D*cphAzd0xpTE@1xzY4y;L
za?Ji2+QNTZ0~DL<6Lnbq_o7t5#-{l;#tr$}Mtxb5@s_Li#Yr+Oy7*cz*S}|6cq{Ey
zSest$KRd7&Z=G{2oAG!ia&JI!Ffql*c9A&(Jk0$C@lepmR0Sj3ikh<ZaS>Iu&)ui{
zRn<6UP!_X%?O<ouIlpkp49yLJ-ALvY^>`;*(BA&{!CE*&f9#;M>yJUjrQao$5hqt-
zB|rVe@f2|6O^0kGhW?&aEpW<eJf{=5&*x1;EFLG^;1NVg&gOw8b>*6^+I1utsH049
zqsr)4w$o4fS(PND&s8bAPjk3+u@_^NWpC@JikBaniQ{3M|B`rZjyaCr)8f)@3+Y!k
zL)wgwz^v?6Zu?*OYWvmh?axdegJ(@D4ve2KR>78yc1$aeAA(HsTTBxJ&Td|PXUj&f
zu<J=s3gbW<%5-LhqY-2|F+ELe$o~?l)t8(Su@-zYz%|PMRJM;UdIQ0+_Q3xy$k2k%
zfC79Wh-=LjXSJ-Q`R^?B!8WozS#Q`O>tMK^Om&$l<b^U)bN%JwIKJ{V26k6wg*7|L
znxYi3ekL+ohRR+0FlT3215HzOMOnI)-jLNM*f72E2Il@etc1mp*`1YPlp+M#=o^8;
z%0);#^-H;I!Mx37wrM5lGrA)@F2p4FV#c=eMW3G_;TAbkw?YT|?iQ|0?*~L631LWF
zBvij)r$cc6MuOzy?@ZNgtb{j)1aqQu_~=ek*p3C7!~}8l?{Ua)GtBXH=DP&qdhhe0
zD02N4Hw^5IKJn!upwCd~wm1t;<ZVMqDzm)w7`T-3Y1Uhj1YtV3l+{3sWaTwy`!R71
z?5d({{JOXp>oGq@10r#fsB!RAgT%aMhgRRCEb6-5WfF>T<lo0U&Jk#swl?Ya>gIj}
zxRNK$Ahcn5ErL<?47|3|Y>4>CJCpDu$mCK(xJ+u9lv>XFnC~q@t`e8vG!s1tT#$ba
z$G9CJ!zOiPLU-!89wP}rezWz+V_a*(+&Bh=t;A?O3~cT1f*({fW)P{<iAzC^)a4ri
zwF2yWBy!aa@imjw<qDxQ#a`izyp%|1^Q#UED*CSKu+Bsow$dM+;5FeE6C)EohXpxV
z{a#@YzD}5+6sKm(s;D^!xHug0AnXssWfuB-B5V#Eot?f1;o$!PVd%7JOa^!Yn23?k
ToD<%`&A8<6pJDH$=zIMOv2kXR

literal 0
HcmV?d00001


From 8f59ceb6a6914e111b9da37c3b6883a0fcf2927b Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 04:04:26 -0500
Subject: [PATCH 48/86] dev127 - experiment with new ins on .fur

---
 src/engine/engine.h       |   4 +-
 src/engine/fileOps.cpp    |   3 +-
 src/engine/instrument.cpp | 148 +++++++++++++++++++-------------------
 3 files changed, 80 insertions(+), 75 deletions(-)

diff --git a/src/engine/engine.h b/src/engine/engine.h
index 80dfe67a8..e187ba7b9 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -47,8 +47,8 @@
 #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
 #define BUSY_END isBusy.unlock(); softLocked=false;
 
-#define DIV_VERSION "dev126"
-#define DIV_ENGINE_VERSION 126
+#define DIV_VERSION "dev127"
+#define DIV_ENGINE_VERSION 127
 // for imports
 #define DIV_VERSION_MOD 0xff01
 #define DIV_VERSION_FC 0xff02
diff --git a/src/engine/fileOps.cpp b/src/engine/fileOps.cpp
index 15bb77113..d37028afd 100644
--- a/src/engine/fileOps.cpp
+++ b/src/engine/fileOps.cpp
@@ -4503,7 +4503,8 @@ SafeWriter* DivEngine::saveFur(bool notPrimary) {
   for (int i=0; i<song.insLen; i++) {
     DivInstrument* ins=song.ins[i];
     insPtr.push_back(w->tell());
-    ins->putInsData(w);
+    logV("writing instrument %d...",i);
+    ins->putInsData2(w,false);
   }
 
   /// WAVETABLE
diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 867d25640..1c2ddbf0a 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -213,6 +213,7 @@ bool DivInstrumentSNES::operator==(const DivInstrumentSNES& other) {
 #undef _C
 
 #define FEATURE_BEGIN(x) \
+  logV("- %s",x); \
   w->write(x,2); \
   size_t featStartSeek=w->tell(); \
   w->writeS(0);
@@ -1878,7 +1879,7 @@ void DivInstrument::readFeatureMA(SafeReader& reader) {
 
   unsigned short macroHeaderLen=reader.readS();
 
-  DivInstrumentMacro& target=std.volMacro;
+  DivInstrumentMacro* target=&std.volMacro;
 
   while (reader.tell()<endOfFeat) {
     size_t endOfMacroHeader=reader.tell()+macroHeaderLen;
@@ -1889,101 +1890,104 @@ void DivInstrument::readFeatureMA(SafeReader& reader) {
 
     switch (macroCode) {
       case 0:
-        target=std.volMacro;
+        target=&std.volMacro;
         break;
       case 1:
-        target=std.arpMacro;
+        target=&std.arpMacro;
         break;
       case 2:
-        target=std.dutyMacro;
+        target=&std.dutyMacro;
         break;
       case 3:
-        target=std.waveMacro;
+        target=&std.waveMacro;
         break;
       case 4:
-        target=std.pitchMacro;
+        target=&std.pitchMacro;
         break;
       case 5:
-        target=std.ex1Macro;
+        target=&std.ex1Macro;
         break;
       case 6:
-        target=std.ex2Macro;
+        target=&std.ex2Macro;
         break;
       case 7:
-        target=std.ex3Macro;
+        target=&std.ex3Macro;
         break;
       case 8:
-        target=std.algMacro;
+        target=&std.algMacro;
         break;
       case 9:
-        target=std.fbMacro;
+        target=&std.fbMacro;
         break;
       case 10:
-        target=std.fmsMacro;
+        target=&std.fmsMacro;
         break;
       case 11:
-        target=std.amsMacro;
+        target=&std.amsMacro;
         break;
       case 12:
-        target=std.panLMacro;
+        target=&std.panLMacro;
         break;
       case 13:
-        target=std.panRMacro;
+        target=&std.panRMacro;
         break;
       case 14:
-        target=std.phaseResetMacro;
+        target=&std.phaseResetMacro;
         break;
       case 15:
-        target=std.ex4Macro;
+        target=&std.ex4Macro;
         break;
       case 16:
-        target=std.ex5Macro;
+        target=&std.ex5Macro;
         break;
       case 17:
-        target=std.ex6Macro;
+        target=&std.ex6Macro;
         break;
       case 18:
-        target=std.ex7Macro;
+        target=&std.ex7Macro;
         break;
       case 19:
-        target=std.ex8Macro;
+        target=&std.ex8Macro;
+        break;
+      default:
+        logW("invalid macro code %d!");
         break;
     }
 
-    target.len=reader.readC();
-    target.loop=reader.readC();
-    target.rel=reader.readC();
-    target.mode=reader.readC();
+    target->len=reader.readC();
+    target->loop=reader.readC();
+    target->rel=reader.readC();
+    target->mode=reader.readC();
 
     unsigned char wordSize=reader.readC();
-    target.open=wordSize&7;
+    target->open=wordSize&7;
     wordSize>>=6;
 
-    target.delay=reader.readC();
-    target.speed=reader.readC();
+    target->delay=reader.readC();
+    target->speed=reader.readC();
 
     reader.seek(endOfMacroHeader,SEEK_SET);
 
     // read macro
     switch (wordSize) {
       case 0:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=(unsigned char)reader.readC();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=(unsigned char)reader.readC();
         }
         break;
       case 1:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=(signed char)reader.readC();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=(signed char)reader.readC();
         }
         break;
       case 2:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=reader.readS();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=reader.readS();
         }
         break;
       default:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=reader.readI();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=reader.readI();
         }
         break;
     }
@@ -2082,7 +2086,7 @@ void DivInstrument::readFeatureOx(SafeReader& reader, int op) {
 
   unsigned short macroHeaderLen=reader.readS();
 
-  DivInstrumentMacro& target=std.opMacros[op].amMacro;
+  DivInstrumentMacro* target=&std.opMacros[op].amMacro;
 
   while (reader.tell()<endOfFeat) {
     size_t endOfMacroHeader=reader.tell()+macroHeaderLen;
@@ -2093,101 +2097,101 @@ void DivInstrument::readFeatureOx(SafeReader& reader, int op) {
 
     switch (macroCode) {
       case 0:
-        target=std.opMacros[op].amMacro;
+        target=&std.opMacros[op].amMacro;
         break;
       case 1:
-        target=std.opMacros[op].arMacro;
+        target=&std.opMacros[op].arMacro;
         break;
       case 2:
-        target=std.opMacros[op].drMacro;
+        target=&std.opMacros[op].drMacro;
         break;
       case 3:
-        target=std.opMacros[op].multMacro;
+        target=&std.opMacros[op].multMacro;
         break;
       case 4:
-        target=std.opMacros[op].rrMacro;
+        target=&std.opMacros[op].rrMacro;
         break;
       case 5:
-        target=std.opMacros[op].slMacro;
+        target=&std.opMacros[op].slMacro;
         break;
       case 6:
-        target=std.opMacros[op].tlMacro;
+        target=&std.opMacros[op].tlMacro;
         break;
       case 7:
-        target=std.opMacros[op].dt2Macro;
+        target=&std.opMacros[op].dt2Macro;
         break;
       case 8:
-        target=std.opMacros[op].rsMacro;
+        target=&std.opMacros[op].rsMacro;
         break;
       case 9:
-        target=std.opMacros[op].dtMacro;
+        target=&std.opMacros[op].dtMacro;
         break;
       case 10:
-        target=std.opMacros[op].d2rMacro;
+        target=&std.opMacros[op].d2rMacro;
         break;
       case 11:
-        target=std.opMacros[op].ssgMacro;
+        target=&std.opMacros[op].ssgMacro;
         break;
       case 12:
-        target=std.opMacros[op].damMacro;
+        target=&std.opMacros[op].damMacro;
         break;
       case 13:
-        target=std.opMacros[op].dvbMacro;
+        target=&std.opMacros[op].dvbMacro;
         break;
       case 14:
-        target=std.opMacros[op].egtMacro;
+        target=&std.opMacros[op].egtMacro;
         break;
       case 15:
-        target=std.opMacros[op].kslMacro;
+        target=&std.opMacros[op].kslMacro;
         break;
       case 16:
-        target=std.opMacros[op].susMacro;
+        target=&std.opMacros[op].susMacro;
         break;
       case 17:
-        target=std.opMacros[op].vibMacro;
+        target=&std.opMacros[op].vibMacro;
         break;
       case 18:
-        target=std.opMacros[op].wsMacro;
+        target=&std.opMacros[op].wsMacro;
         break;
       case 19:
-        target=std.opMacros[op].ksrMacro;
+        target=&std.opMacros[op].ksrMacro;
         break;
     }
 
-    target.len=reader.readC();
-    target.loop=reader.readC();
-    target.rel=reader.readC();
-    target.mode=reader.readC();
+    target->len=reader.readC();
+    target->loop=reader.readC();
+    target->rel=reader.readC();
+    target->mode=reader.readC();
 
     unsigned char wordSize=reader.readC();
-    target.open=wordSize&7;
+    target->open=wordSize&7;
     wordSize>>=6;
 
-    target.delay=reader.readC();
-    target.speed=reader.readC();
+    target->delay=reader.readC();
+    target->speed=reader.readC();
 
     reader.seek(endOfMacroHeader,SEEK_SET);
 
     // read macro
     switch (wordSize) {
       case 0:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=(unsigned char)reader.readC();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=(unsigned char)reader.readC();
         }
         break;
       case 1:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=(signed char)reader.readC();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=(signed char)reader.readC();
         }
         break;
       case 2:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=reader.readS();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=reader.readS();
         }
         break;
       default:
-        for (int i=0; i<target.len; i++) {
-          target.val[i]=reader.readI();
+        for (int i=0; i<target->len; i++) {
+          target->val[i]=reader.readI();
         }
         break;
     }

From 98a88a9199532a75a3ddd3d2a5824a51e29944ac Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 04:07:21 -0500
Subject: [PATCH 49/86] add helper ins end marker when saving to .fur

---
 src/engine/instrument.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 1c2ddbf0a..6a7bb5fae 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -1140,6 +1140,10 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
     }
   }
 
+  if (!fui) {
+    w->write("EN",2);
+  }
+
   blockEndSeek=w->tell();
   if (!fui) {
     w->seek(blockStartSeek,SEEK_SET);

From ea9ee0b95dcd3e1e1ce8744c37b90cbce6a696a9 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 05:26:39 -0500
Subject: [PATCH 50/86] update format.md

---
 papers/format.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/papers/format.md b/papers/format.md
index 25990f1b4..e29b12891 100644
--- a/papers/format.md
+++ b/papers/format.md
@@ -32,6 +32,10 @@ these fields are 0 in format versions prior to 100 (0.6pre1).
 
 the format versions are:
 
+- 127: Furnace dev127
+- 126: Furnace dev126
+- 125: Furnace dev125
+- 124: Furnace dev124
 - 123: Furnace dev123
 - 122: Furnace dev122
 - 121: Furnace dev121
@@ -437,7 +441,23 @@ clock=4000000
 stereo=true
 ```
 
-# instrument
+# instrument (>=127)
+
+Furnace dev127 and higher use the new instrument format.
+
+```
+size | description
+-----|------------------------------------
+  4  | "INS2" block ID
+  4  | size of this block
+  2  | format version
+  2  | instrument type
+ ??? | features...
+```
+
+see [newIns.md](newIns.md) for more information.
+
+# old instrument (<127)
 
 notes:
 

From 38cccbe351a25fad4f1ecac00290011041e5ea65 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 05:43:15 -0500
Subject: [PATCH 51/86] update newIns.md

---
 papers/newIns.md | 62 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/papers/newIns.md b/papers/newIns.md
index 4baab71e1..dbc1e4f2d 100644
--- a/papers/newIns.md
+++ b/papers/newIns.md
@@ -4,6 +4,32 @@ the main issue with Furnace instrument files is that they are too big, even if t
 
 the aim of this new format is to greatly reduce the size of a resulting instrument.
 
+# information
+
+this format is "featural", meaning that only used parameters are stored (depending on instrument types).
+this is the biggest improvement over the previous format, which stored everything including unused parameters.
+
+features which are not recognized by Furnace will be ignored.
+
+instruments are not compressed using zlib, unlike Furnace songs.
+
+all numbers are little-endian.
+
+the following fields may be found in "size":
+- `f` indicates a floating point number.
+- `STR` is a UTF-8 zero-terminated string.
+- `???` is an array of variable size.
+- `S??` is an array of `STR`s.
+- `1??` is an array of bytes.
+- `2??` is an array of shorts.
+- `4??` is an array of ints.
+
+the format may change across versions. a `(>=VER)` indicates this field is only present starting from format version `VER`, and `(<VER)` indicates this field is present only before version `VER`.
+
+furthermore, an `or reserved` indicates this field is always present, but is reserved when the version condition is not met.
+
+the `size of this block` fields represent the size of a block excluding the ID and the aforementioned field.
+
 # header
 
 .fui files use the following header:
@@ -77,6 +103,10 @@ size | description
 
 # FM data (FM)
 
+- FM operator order is:
+  - 1/3/2/4 (internal order) for OPN, OPM, OPZ and OPL 4-op
+  - 1/2/?/? (? = unused) for OPL 2-op and OPLL
+
 ```
 size | description
 -----|------------------------------------
@@ -111,6 +141,15 @@ size | description
 
 # macro data (MA)
 
+notes:
+
+- the macro range varies depending on the instrument type.
+- "macro open" indicates whether the macro is collapsed or not in the instrument editor.
+- meaning of extended macros varies depending on instrument type.
+- meaning of panning macros varies depending on instrument type:
+  - for hard-panned chips (e.g. FM and Game Boy): left panning is 2-bit panning macro (left/right)
+  - otherwise both left and right panning macros are used
+
 ```
 size | description
 -----|------------------------------------
@@ -166,6 +205,29 @@ size | description
      | - length: macro length × word sizs
 ```
 
+## interpreting macro mode values
+
+- sequence (normal): I think this is obvious...
+- ADSR:
+  - `val[0]`: bottom
+  - `val[1]`: top
+  - `val[2]`: attack
+  - `val[3]`: hold time
+  - `val[4]`: decay
+  - `val[5]`: sustain level
+  - `val[6]`: sustain hold time
+  - `val[7]`: decay 2
+  - `val[8]`: release
+- LFO:
+  - `val[11]`: speed
+  - `val[12]`: waveform
+    - 0: triangle
+    - 1: saw
+    - 2: pulse
+  - `val[13]`: phase
+  - `val[14]`: loop
+  - `val[15]`: global (not sure how will I implement this)
+
 # C64 data (64)
 
 ```

From d943eb02ae11a62f1232bed9d53bff9deac92f8a Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 15:34:24 -0500
Subject: [PATCH 52/86] fix serious bug when saving op macros

---
 src/engine/instrument.cpp | 41 ++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/engine/instrument.cpp b/src/engine/instrument.cpp
index 6a7bb5fae..dc991f6ad 100644
--- a/src/engine/instrument.cpp
+++ b/src/engine/instrument.cpp
@@ -455,25 +455,25 @@ void DivInstrument::writeFeatureOx(SafeWriter* w, int ope) {
   const DivInstrumentSTD::OpMacro& o=std.opMacros[ope];
 
   writeMacro(w,o.amMacro,0);
-  writeMacro(w,o.arMacro,0);
-  writeMacro(w,o.drMacro,0);
-  writeMacro(w,o.multMacro,0);
-  writeMacro(w,o.rrMacro,0);
-  writeMacro(w,o.slMacro,0);
-  writeMacro(w,o.tlMacro,0);
-  writeMacro(w,o.dt2Macro,0);
-  writeMacro(w,o.rsMacro,0);
-  writeMacro(w,o.dtMacro,0);
-  writeMacro(w,o.d2rMacro,0);
-  writeMacro(w,o.ssgMacro,0);
-  writeMacro(w,o.damMacro,0);
-  writeMacro(w,o.dvbMacro,0);
-  writeMacro(w,o.egtMacro,0);
-  writeMacro(w,o.kslMacro,0);
-  writeMacro(w,o.susMacro,0);
-  writeMacro(w,o.vibMacro,0);
-  writeMacro(w,o.wsMacro,0);
-  writeMacro(w,o.ksrMacro,0);
+  writeMacro(w,o.arMacro,1);
+  writeMacro(w,o.drMacro,2);
+  writeMacro(w,o.multMacro,3);
+  writeMacro(w,o.rrMacro,4);
+  writeMacro(w,o.slMacro,5);
+  writeMacro(w,o.tlMacro,6);
+  writeMacro(w,o.dt2Macro,7);
+  writeMacro(w,o.rsMacro,8);
+  writeMacro(w,o.dtMacro,9);
+  writeMacro(w,o.d2rMacro,10);
+  writeMacro(w,o.ssgMacro,11);
+  writeMacro(w,o.damMacro,12);
+  writeMacro(w,o.dvbMacro,13);
+  writeMacro(w,o.egtMacro,14);
+  writeMacro(w,o.kslMacro,15);
+  writeMacro(w,o.susMacro,16);
+  writeMacro(w,o.vibMacro,17);
+  writeMacro(w,o.wsMacro,18);
+  writeMacro(w,o.ksrMacro,19);
 
   // "stop reading" code
   w->writeC(-1);
@@ -996,7 +996,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song) {
     }
   }
 
-  if (featureFM) {
+  if (featureFM || !fui) {
     // check FM macros
     int opCount=4;
     bool storeExtendedAsWell=true;
@@ -2464,6 +2464,7 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
   while ((int)reader.tell()<dataLen) {
     // read feature code
     reader.read(featCode,2);
+    logV("- %c%c",featCode[0],featCode[1]);
 
     if (memcmp(featCode,"EN",2)==0) { // end of instrument
       break;

From 8041173eb96f4343352125e7ed785c67577479e3 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 21 Nov 2022 16:12:29 -0500
Subject: [PATCH 53/86] YMZ280B: fix VGM export

---
 src/engine/platform/sound/ymz280b.cpp |  6 ++++--
 src/engine/platform/ymz280b.cpp       | 10 ++++++++++
 src/engine/vgmOps.cpp                 | 15 ---------------
 src/gui/editControls.cpp              |  4 +++-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/engine/platform/sound/ymz280b.cpp b/src/engine/platform/sound/ymz280b.cpp
index 74fafe672..4ab0e87ee 100644
--- a/src/engine/platform/sound/ymz280b.cpp
+++ b/src/engine/platform/sound/ymz280b.cpp
@@ -286,6 +286,8 @@ int ymz280b_device::generate_pcm8(struct YMZ280BVoice *voice, s16 *buffer, int s
 
 ***********************************************************************************************/
 
+// according to this core, it should be little-endian.
+// but it's big-endian in VGMPlay...
 int ymz280b_device::generate_pcm16(struct YMZ280BVoice *voice, s16 *buffer, int samples)
 {
 	u32 position = voice->position;
@@ -298,7 +300,7 @@ int ymz280b_device::generate_pcm16(struct YMZ280BVoice *voice, s16 *buffer, int
 		while (samples)
 		{
 			/* fetch the current value */
-			val = (s16)((m_ext_mem[position / 2 + 1] << 8) + m_ext_mem[position / 2 + 0]);
+			val = (s16)((m_ext_mem[position / 2 + 0] << 8) + m_ext_mem[position / 2 + 1]);
 
 			/* output to the buffer, scaling by the volume */
 			*buffer++ = val;
@@ -321,7 +323,7 @@ int ymz280b_device::generate_pcm16(struct YMZ280BVoice *voice, s16 *buffer, int
 		while (samples)
 		{
 			/* fetch the current value */
-			val = (s16)((m_ext_mem[position / 2 + 1] << 8) + m_ext_mem[position / 2 + 0]);
+			val = (s16)((m_ext_mem[position / 2 + 0] << 8) + m_ext_mem[position / 2 + 1]);
 
 			/* output to the buffer, scaling by the volume */
 			*buffer++ = val;
diff --git a/src/engine/platform/ymz280b.cpp b/src/engine/platform/ymz280b.cpp
index b2797cd60..5ad8a0ed5 100644
--- a/src/engine/platform/ymz280b.cpp
+++ b/src/engine/platform/ymz280b.cpp
@@ -431,7 +431,17 @@ void DivPlatformYMZ280B::renderSamples() {
     unsigned char* src=(unsigned char*)s->getCurBuf();
     int actualLength=MIN((int)(getSampleMemCapacity()-memPos),length);
     if (actualLength>0) {
+#ifdef TA_BIG_ENDIAN
       memcpy(&sampleMem[memPos],src,actualLength);
+#else
+      if (s->depth==DIV_SAMPLE_DEPTH_16BIT) {
+        for (int i=0; i<actualLength; i++) {
+          sampleMem[memPos+i]=src[i^1];
+        }
+      } else {
+        memcpy(&sampleMem[memPos],src,actualLength);
+      }
+#endif
       sampleOff[i]=memPos;
       memPos+=length;
     }
diff --git a/src/engine/vgmOps.cpp b/src/engine/vgmOps.cpp
index 25df47cd0..70d149ac9 100644
--- a/src/engine/vgmOps.cpp
+++ b/src/engine/vgmOps.cpp
@@ -1746,21 +1746,6 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
       size_t sampleMemLen=writeZ280[i]->getSampleMemUsage();
       unsigned char* sampleMem=new unsigned char[sampleMemLen];
       memcpy(sampleMem,writeZ280[i]->getSampleMem(),sampleMemLen);
-      // TODO: please fix this later
-      /*
-      for (int i=0; i<song.sampleLen; i++) {
-        DivSample* s=song.sample[i];
-        if (s->depth==DIV_SAMPLE_DEPTH_16BIT) {
-          unsigned int pos=s->offYMZ280B;
-          for (unsigned int j=0; j<s->samples; j++) {
-            unsigned char lo=sampleMem[pos+j*2];
-            unsigned char hi=sampleMem[pos+j*2+1];
-            sampleMem[pos+j*2]=hi;
-            sampleMem[pos+j*2+1]=lo;
-          }
-        }
-      }
-      */
       w->writeC(0x67);
       w->writeC(0x66);
       w->writeC(0x86);
diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp
index fe72351a6..6bfde0107 100644
--- a/src/gui/editControls.cpp
+++ b/src/gui/editControls.cpp
@@ -204,7 +204,9 @@ void FurnaceGUI::drawMobileControls() {
           ImGui::SameLine();
           ImGui::Button("Export Audio");
           ImGui::SameLine();
-          ImGui::Button("Export VGM");
+          if (ImGui::Button("Export VGM")) {
+            openFileDialog(GUI_FILE_EXPORT_VGM);
+          }
 
           ImGui::Button("CmdStream");
 

From ca204e6d690083ace2e952aff7fced21973dc32a Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 22 Nov 2022 23:09:21 -0500
Subject: [PATCH 54/86] Please enter the commit message for your changes. Lines
 starting

---
 src/engine/platform/sms.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/engine/platform/sms.h b/src/engine/platform/sms.h
index e636b9d88..96a2e5bfd 100644
--- a/src/engine/platform/sms.h
+++ b/src/engine/platform/sms.h
@@ -82,6 +82,8 @@ class DivPlatformSMS: public DivDispatch {
   friend void putDispatchChip(void*,int);
   friend void putDispatchChan(void*,int,int);
 
+  double NOTE_SN(int note);
+
   void acquire_nuked(short* bufL, short* bufR, size_t start, size_t len);
   void acquire_mame(short* bufL, short* bufR, size_t start, size_t len);
   public:

From e21040169f06a6507cd3b83a674eb6e8d1b3f606 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Wed, 23 Nov 2022 03:17:04 -0500
Subject: [PATCH 55/86] GUI: possibly improved sample zooming

sorry I dropped the compact mode because I am making the toolbar dynamic
soon...
---
 src/gui/gui.cpp        |    1 +
 src/gui/gui.h          |    1 +
 src/gui/sampleEdit.cpp | 1701 ++++++++++++++--------------------------
 src/gui/settings.cpp   |    5 -
 4 files changed, 582 insertions(+), 1126 deletions(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 99455b150..159050f38 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -5836,6 +5836,7 @@ FurnaceGUI::FurnaceGUI():
   oldOrdersLen(0),
   sampleZoom(1.0),
   prevSampleZoom(1.0),
+  minSampleZoom(1.0),
   samplePos(0),
   resizeSize(1024),
   silenceSize(1024),
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 8775a5f2c..9ed37fe35 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1583,6 +1583,7 @@ class FurnaceGUI {
   // sample editor specific
   double sampleZoom;
   double prevSampleZoom;
+  double minSampleZoom;
   int samplePos;
   int resizeSize, silenceSize;
   double resampleTarget;
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 2dc12ad56..aa0032b92 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -97,29 +97,115 @@ void FurnaceGUI::drawSampleEdit() {
           loopType=sampleLoopModes[sample->loopMode];
         }
       }
-      if (!settings.sampleLayout) {
-        ImGui::Text("Name");
+
+      String sampleIndex=fmt::sprintf("%d",curSample);
+      ImGui::SetNextItemWidth(72.0f*dpiScale);
+      if (ImGui::BeginCombo("##SampleSelect",sampleIndex.c_str())) {
+        String name;
+        for (size_t i=0; i<e->song.sample.size(); i++) {
+          name=fmt::sprintf("%d: %s##_SMPS%d",i,e->song.sample[i]->name,i);
+          if (ImGui::Selectable(name.c_str(),curSample==(int)i)) {
+            curSample=i;
+            sample=e->song.sample[curSample];
+            updateSampleTex=true;
+          }
+        }
+        ImGui::EndCombo();
+      }
+
+      ImGui::SameLine();
+
+      if (ImGui::Button(ICON_FA_FOLDER_OPEN "##SELoad")) {
+        doAction(GUI_ACTION_SAMPLE_LIST_OPEN_REPLACE);
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_FLOPPY_O "##SESave")) {
+        doAction(GUI_ACTION_SAMPLE_LIST_SAVE);
+      }
+
+      ImGui::SameLine();
+
+      ImGui::Text("Name");
+      ImGui::SameLine();
+      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+      if (ImGui::InputText("##SampleName",&sample->name)) {
+        MARK_MODIFIED;
+      }
+
+      if (ImGui::BeginTable("SampleProps",4,ImGuiTableFlags_SizingStretchSame)) {
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::Text("Type");
         ImGui::SameLine();
         ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-        if (ImGui::InputText("##SampleName",&sample->name)) {
-          MARK_MODIFIED;
+        if (ImGui::BeginCombo("##SampleType",sampleType.c_str())) {
+          for (int i=0; i<DIV_SAMPLE_DEPTH_MAX; i++) {
+            if (sampleDepths[i]==NULL) continue;
+            if (ImGui::Selectable(sampleDepths[i])) {
+              sample->prepareUndo(true);
+              e->lockEngine([sample]() {
+                sample->render();
+              });
+              sample->depth=(DivSampleDepth)i;
+              e->renderSamplesP();
+              updateSampleTex=true;
+              MARK_MODIFIED;
+            }
+          }
+          ImGui::EndCombo();
         }
 
-        if (ImGui::BeginTable("SampleProps",4,ImGuiTableFlags_SizingStretchSame)) {
+        ImGui::TableNextColumn();
+        ImGui::Text("C-4 (Hz)");
+        ImGui::SameLine();
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (ImGui::InputInt("##SampleCenter",&sample->centerRate,10,200)) { MARK_MODIFIED
+          if (sample->centerRate<100) sample->centerRate=100;
+          if (sample->centerRate>65535) sample->centerRate=65535;
+        }
+
+        ImGui::TableNextColumn();
+        ImGui::Text("Compat Rate");
+        ImGui::SameLine();
+        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        if (ImGui::InputInt("##SampleRate",&sample->rate,10,200)) { MARK_MODIFIED
+          if (sample->rate<100) sample->rate=100;
+          if (sample->rate>96000) sample->rate=96000;
+        }
+
+        ImGui::TableNextColumn();
+        bool doLoop=(sample->isLoopable());
+        if (ImGui::Checkbox("Loop",&doLoop)) { MARK_MODIFIED
+          if (doLoop) {
+            sample->loop=true;
+            sample->loopStart=0;
+            sample->loopEnd=sample->samples;
+          } else {
+            sample->loop=false;
+            sample->loopStart=-1;
+            sample->loopEnd=sample->samples;
+          }
+          updateSampleTex=true;
+          if (e->getSampleFormatMask()&(1U<<DIV_SAMPLE_DEPTH_BRR)) {
+            e->renderSamplesP();
+          }
+        }
+        if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
+          ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
+        }
+        if (doLoop || keepLoopAlive) {
+          keepLoopAlive=false;
           ImGui::TableNextRow();
           ImGui::TableNextColumn();
-          ImGui::Text("Type");
+          ImGui::Text("Loop Mode");
           ImGui::SameLine();
           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-          if (ImGui::BeginCombo("##SampleType",sampleType.c_str())) {
-            for (int i=0; i<DIV_SAMPLE_DEPTH_MAX; i++) {
-              if (sampleDepths[i]==NULL) continue;
-              if (ImGui::Selectable(sampleDepths[i])) {
+          if (ImGui::BeginCombo("##SampleLoopMode",loopType.c_str())) {
+            for (int i=0; i<DIV_SAMPLE_LOOP_MAX; i++) {
+              if (sampleLoopModes[i]==NULL) continue;
+              if (ImGui::Selectable(sampleLoopModes[i])) {
                 sample->prepareUndo(true);
-                e->lockEngine([sample]() {
-                  sample->render();
-                });
-                sample->depth=(DivSampleDepth)i;
+                sample->loopMode=(DivSampleLoopMode)i;
                 e->renderSamplesP();
                 updateSampleTex=true;
                 MARK_MODIFIED;
@@ -127,35 +213,37 @@ void FurnaceGUI::drawSampleEdit() {
             }
             ImGui::EndCombo();
           }
-
           ImGui::TableNextColumn();
-          ImGui::Text("C-4 (Hz)");
+          ImGui::Text("Loop Start");
           ImGui::SameLine();
           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-          if (ImGui::InputInt("##SampleCenter",&sample->centerRate,10,200)) { MARK_MODIFIED
-            if (sample->centerRate<100) sample->centerRate=100;
-            if (sample->centerRate>65535) sample->centerRate=65535;
-          }
-
-          ImGui::TableNextColumn();
-          ImGui::Text("Compat Rate");
-          ImGui::SameLine();
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-          if (ImGui::InputInt("##SampleRate",&sample->rate,10,200)) { MARK_MODIFIED
-            if (sample->rate<100) sample->rate=100;
-            if (sample->rate>96000) sample->rate=96000;
-          }
-
-          ImGui::TableNextColumn();
-          bool doLoop=(sample->isLoopable());
-          if (ImGui::Checkbox("Loop",&doLoop)) { MARK_MODIFIED
-            if (doLoop) {
-              sample->loop=true;
+          if (ImGui::InputInt("##LoopStartPosition",&sample->loopStart,1,16)) { MARK_MODIFIED
+            if (sample->loopStart<0) {
               sample->loopStart=0;
-              sample->loopEnd=sample->samples;
-            } else {
-              sample->loop=false;
-              sample->loopStart=-1;
+            }
+            if (sample->loopStart>sample->loopEnd) {
+              sample->loopStart=sample->loopEnd;
+            }
+            updateSampleTex=true;
+            if (e->getSampleFormatMask()&(1U<<DIV_SAMPLE_DEPTH_BRR)) {
+              e->renderSamplesP();
+            }
+          }
+          if (ImGui::IsItemActive()) {
+            keepLoopAlive=true;
+          }
+          if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
+            ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
+          }
+          ImGui::TableNextColumn();
+          ImGui::Text("Loop End");
+          ImGui::SameLine();
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          if (ImGui::InputInt("##LoopEndPosition",&sample->loopEnd,1,16)) { MARK_MODIFIED
+            if (sample->loopEnd<sample->loopStart) {
+              sample->loopEnd=sample->loopStart;
+            }
+            if (sample->loopEnd>=(int)sample->samples) {
               sample->loopEnd=sample->samples;
             }
             updateSampleTex=true;
@@ -163,1116 +251,472 @@ void FurnaceGUI::drawSampleEdit() {
               e->renderSamplesP();
             }
           }
+          if (ImGui::IsItemActive()) {
+            keepLoopAlive=true;
+          }
           if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
             ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
           }
-          if (doLoop || keepLoopAlive) {
-            keepLoopAlive=false;
-            ImGui::TableNextRow();
-            ImGui::TableNextColumn();
-            ImGui::Text("Loop Mode");
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (ImGui::BeginCombo("##SampleLoopMode",loopType.c_str())) {
-              for (int i=0; i<DIV_SAMPLE_LOOP_MAX; i++) {
-                if (sampleLoopModes[i]==NULL) continue;
-                if (ImGui::Selectable(sampleLoopModes[i])) {
-                  sample->prepareUndo(true);
-                  sample->loopMode=(DivSampleLoopMode)i;
-                  e->renderSamplesP();
-                  updateSampleTex=true;
-                  MARK_MODIFIED;
-                }
-              }
-              ImGui::EndCombo();
+        }
+        ImGui::EndTable();
+      }
+
+      /*
+      if (ImGui::Button("Apply")) {
+        e->renderSamplesP();
+      }
+      ImGui::SameLine();
+      */
+      ImGui::Separator();
+
+      pushToggleColors(!sampleDragMode);
+      if (ImGui::Button(ICON_FA_I_CURSOR "##SSelect")) {
+        sampleDragMode=false;
+      }
+      popToggleColors();
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Edit mode: Select");
+      }
+      ImGui::SameLine();
+      pushToggleColors(sampleDragMode);
+      if (ImGui::Button(ICON_FA_PENCIL "##SDraw")) {
+        sampleDragMode=true;
+      }
+      popToggleColors();
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Edit mode: Draw");
+      }
+      ImGui::BeginDisabled(sample->depth!=DIV_SAMPLE_DEPTH_8BIT && sample->depth!=DIV_SAMPLE_DEPTH_16BIT);
+      ImGui::SameLine();
+      ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
+      ImGui::SameLine();
+      ImGui::Button(ICON_FA_ARROWS_H "##SResize");
+      if (ImGui::IsItemClicked()) {
+        resizeSize=sample->samples;
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Resize");
+      }
+      if (openSampleResizeOpt) {
+        openSampleResizeOpt=false;
+        ImGui::OpenPopup("SResizeOpt");
+      }
+      if (ImGui::BeginPopupContextItem("SResizeOpt",ImGuiPopupFlags_MouseButtonLeft)) {
+        if (ImGui::InputInt("Samples",&resizeSize,1,64)) {
+          if (resizeSize<0) resizeSize=0;
+          if (resizeSize>16777215) resizeSize=16777215;
+        }
+        if (ImGui::Button("Resize")) {
+          sample->prepareUndo(true);
+          e->lockEngine([this,sample]() {
+            if (!sample->resize(resizeSize)) {
+              showError("couldn't resize! make sure your sample is 8 or 16-bit.");
             }
-            ImGui::TableNextColumn();
-            ImGui::Text("Loop Start");
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (ImGui::InputInt("##LoopStartPosition",&sample->loopStart,1,16)) { MARK_MODIFIED
-              if (sample->loopStart<0) {
-                sample->loopStart=0;
-              }
-              if (sample->loopStart>sample->loopEnd) {
-                sample->loopStart=sample->loopEnd;
-              }
-              updateSampleTex=true;
-              if (e->getSampleFormatMask()&(1U<<DIV_SAMPLE_DEPTH_BRR)) {
-                e->renderSamplesP();
-              }
-            }
-            if (ImGui::IsItemActive()) {
-              keepLoopAlive=true;
-            }
-            if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
-              ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
-            }
-            ImGui::TableNextColumn();
-            ImGui::Text("Loop End");
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (ImGui::InputInt("##LoopEndPosition",&sample->loopEnd,1,16)) { MARK_MODIFIED
-              if (sample->loopEnd<sample->loopStart) {
-                sample->loopEnd=sample->loopStart;
-              }
-              if (sample->loopEnd>=(int)sample->samples) {
-                sample->loopEnd=sample->samples;
-              }
-              updateSampleTex=true;
-              if (e->getSampleFormatMask()&(1U<<DIV_SAMPLE_DEPTH_BRR)) {
-                e->renderSamplesP();
-              }
-            }
-            if (ImGui::IsItemActive()) {
-              keepLoopAlive=true;
-            }
-            if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
-              ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
-            }
-          }
-          ImGui::EndTable();
-        }
-
-        /*
-        if (ImGui::Button("Apply")) {
-          e->renderSamplesP();
-        }
-        ImGui::SameLine();
-        */
-        ImGui::Separator();
-
-        pushToggleColors(!sampleDragMode);
-        if (ImGui::Button(ICON_FA_I_CURSOR "##SSelect")) {
-          sampleDragMode=false;
-        }
-        popToggleColors();
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Edit mode: Select");
-        }
-        ImGui::SameLine();
-        pushToggleColors(sampleDragMode);
-        if (ImGui::Button(ICON_FA_PENCIL "##SDraw")) {
-          sampleDragMode=true;
-        }
-        popToggleColors();
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Edit mode: Draw");
-        }
-        ImGui::BeginDisabled(sample->depth!=DIV_SAMPLE_DEPTH_8BIT && sample->depth!=DIV_SAMPLE_DEPTH_16BIT);
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_ARROWS_H "##SResize");
-        if (ImGui::IsItemClicked()) {
-          resizeSize=sample->samples;
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Resize");
-        }
-        if (openSampleResizeOpt) {
-          openSampleResizeOpt=false;
-          ImGui::OpenPopup("SResizeOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SResizeOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          if (ImGui::InputInt("Samples",&resizeSize,1,64)) {
-            if (resizeSize<0) resizeSize=0;
-            if (resizeSize>16777215) resizeSize=16777215;
-          }
-          if (ImGui::Button("Resize")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              if (!sample->resize(resizeSize)) {
-                showError("couldn't resize! make sure your sample is 8 or 16-bit.");
-              }
-              e->renderSamples();
-            });
-            updateSampleTex=true;
-            sampleSelStart=-1;
-            sampleSelEnd=-1;
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        } else {
-          resizeSize=sample->samples;
-        }
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_EXPAND "##SResample");
-        if (ImGui::IsItemClicked()) {
-          resampleTarget=sample->rate;
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Resample");
-        }
-        if (openSampleResampleOpt) {
-          openSampleResampleOpt=false;
-          ImGui::OpenPopup("SResampleOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SResampleOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          ImGui::Text("Rate");
-          if (ImGui::InputDouble("##SRRate",&resampleTarget,1.0,50.0,"%g")) {
-            if (resampleTarget<0) resampleTarget=0;
-            if (resampleTarget>96000) resampleTarget=96000;
-          }
-          ImGui::SameLine();
-          if (ImGui::Button("0.5x")) {
-            resampleTarget*=0.5;
-          }
-          ImGui::SameLine();
-          if (ImGui::Button("==")) {
-            resampleTarget=sample->rate;
-          }
-          ImGui::SameLine();
-          if (ImGui::Button("2.0x")) {
-            resampleTarget*=2.0;
-          }
-          double factor=resampleTarget/(double)sample->rate;
-          if (ImGui::InputDouble("Factor",&factor,0.125,0.5,"%g")) {
-            resampleTarget=(double)sample->rate*factor;
-            if (resampleTarget<0) resampleTarget=0;
-            if (resampleTarget>96000) resampleTarget=96000;
-          }
-          ImGui::Combo("Filter",&resampleStrat,resampleStrats,6);
-          if (ImGui::Button("Resample")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              if (!sample->resample(resampleTarget,resampleStrat)) {
-                showError("couldn't resample! make sure your sample is 8 or 16-bit.");
-              }
-              e->renderSamples();
-            });
-            updateSampleTex=true;
-            sampleSelStart=-1;
-            sampleSelEnd=-1;
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        } else {
-          resampleTarget=sample->rate;
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_UNDO "##SUndo")) {
-          doUndoSample();
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Undo");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_REPEAT "##SRedo")) {
-          doRedoSample();
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Redo");
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_VOLUME_UP "##SAmplify");
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Amplify");
-        }
-        if (openSampleAmplifyOpt) {
-          openSampleAmplifyOpt=false;
-          ImGui::OpenPopup("SAmplifyOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SAmplifyOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          ImGui::Text("Volume");
-          if (ImGui::InputFloat("##SRVolume",&amplifyVol,10.0,50.0,"%g%%")) {
-            if (amplifyVol<0) amplifyVol=0;
-            if (amplifyVol>10000) amplifyVol=10000;
-          }
-          ImGui::SameLine();
-          ImGui::Text("(%.1fdB)",20.0*log10(amplifyVol/100.0f));
-          if (ImGui::Button("Apply")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              SAMPLE_OP_BEGIN;
-              float vol=amplifyVol/100.0f;
-
-              if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  float val=sample->data16[i]*vol;
-                  if (val<-32768) val=-32768;
-                  if (val>32767) val=32767;
-                  sample->data16[i]=val;
-                }
-              } else if (sample->depth==DIV_SAMPLE_DEPTH_8BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  float val=sample->data8[i]*vol;
-                  if (val<-128) val=-128;
-                  if (val>127) val=127;
-                  sample->data8[i]=val;
-                }
-              }
-
-              updateSampleTex=true;
-
-              e->renderSamples();
-            });
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ARROWS_V "##SNormalize")) {
-          doAction(GUI_ACTION_SAMPLE_NORMALIZE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Normalize");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ARROW_UP "##SFadeIn")) {
-          doAction(GUI_ACTION_SAMPLE_FADE_IN);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Fade in");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ARROW_DOWN "##SFadeOut")) {
-          doAction(GUI_ACTION_SAMPLE_FADE_OUT);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Fade out");
-        }
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_ADJUST "##SInsertSilence");
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Insert silence");
-        }
-        if (openSampleSilenceOpt) {
-          openSampleSilenceOpt=false;
-          ImGui::OpenPopup("SSilenceOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SSilenceOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          if (ImGui::InputInt("Samples",&silenceSize,1,64)) {
-            if (silenceSize<0) silenceSize=0;
-            if (silenceSize>16777215) silenceSize=16777215;
-          }
-          if (ImGui::Button("Go")) {
-            int pos=(sampleSelStart==-1 || sampleSelStart==sampleSelEnd)?sample->samples:sampleSelStart;
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample,pos]() {
-              if (!sample->insert(pos,silenceSize)) {
-                showError("couldn't insert! make sure your sample is 8 or 16-bit.");
-              }
-              e->renderSamples();
-            });
-            updateSampleTex=true;
-            sampleSelStart=pos;
-            sampleSelEnd=pos+silenceSize;
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ERASER "##SSilence")) {
-          doAction(GUI_ACTION_SAMPLE_SILENCE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Apply silence");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_TIMES "##SDelete")) {
-          doAction(GUI_ACTION_SAMPLE_DELETE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Delete");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_CROP "##STrim")) {
-          doAction(GUI_ACTION_SAMPLE_TRIM);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Trim");
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_BACKWARD "##SReverse")) {
-          doAction(GUI_ACTION_SAMPLE_REVERSE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Reverse");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_SORT_AMOUNT_ASC "##SInvert")) {
-          doAction(GUI_ACTION_SAMPLE_INVERT);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Invert");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_LEVEL_DOWN "##SSign")) {
-          doAction(GUI_ACTION_SAMPLE_SIGN);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Signed/unsigned exchange");
-        }
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_INDUSTRY "##SFilter");
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Apply filter");
-        }
-        if (openSampleFilterOpt) {
-          openSampleFilterOpt=false;
-          ImGui::OpenPopup("SFilterOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SFilterOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          float lowP=sampleFilterL*100.0f;
-          float bandP=sampleFilterB*100.0f;
-          float highP=sampleFilterH*100.0f;
-          float resP=sampleFilterRes*100.0f;
-          ImGui::Text("Cutoff:");
-          if (ImGui::SliderFloat("From",&sampleFilterCutStart,0.0f,sample->rate*0.5,"%.0fHz")) {
-            if (sampleFilterCutStart<0.0) sampleFilterCutStart=0.0;
-            if (sampleFilterCutStart>sample->rate*0.5) sampleFilterCutStart=sample->rate*0.5;
-          }
-          if (ImGui::SliderFloat("To",&sampleFilterCutEnd,0.0f,sample->rate*0.5,"%.0fHz")) {
-            if (sampleFilterCutEnd<0.0) sampleFilterCutEnd=0.0;
-            if (sampleFilterCutEnd>sample->rate*0.5) sampleFilterCutEnd=sample->rate*0.5;
-          }
-          ImGui::Separator();
-          if (ImGui::SliderFloat("Resonance",&resP,0.0f,99.0f,"%.1f%%")) {
-            sampleFilterRes=resP/100.0f;
-            if (sampleFilterRes<0.0f) sampleFilterRes=0.0f;
-            if (sampleFilterRes>0.99f) sampleFilterRes=0.99f;
-          }
-          ImGui::Text("Power");
-          ImGui::SameLine();
-          if (ImGui::RadioButton("1x",sampleFilterPower==1)) {
-            sampleFilterPower=1;
-          }
-          ImGui::SameLine();
-          if (ImGui::RadioButton("2x",sampleFilterPower==2)) {
-            sampleFilterPower=2;
-          }
-          ImGui::SameLine();
-          if (ImGui::RadioButton("3x",sampleFilterPower==3)) {
-            sampleFilterPower=3;
-          }
-          ImGui::Separator();
-          if (ImGui::SliderFloat("Low-pass",&lowP,0.0f,100.0f,"%.1f%%")) {
-            sampleFilterL=lowP/100.0f;
-            if (sampleFilterL<0.0f) sampleFilterL=0.0f;
-            if (sampleFilterL>1.0f) sampleFilterL=1.0f;
-          }
-          if (ImGui::SliderFloat("Band-pass",&bandP,0.0f,100.0f,"%.1f%%")) {
-            sampleFilterB=bandP/100.0f;
-            if (sampleFilterB<0.0f) sampleFilterB=0.0f;
-            if (sampleFilterB>1.0f) sampleFilterB=1.0f;
-          }
-          if (ImGui::SliderFloat("High-pass",&highP,0.0f,100.0f,"%.1f%%")) {
-            sampleFilterH=highP/100.0f;
-            if (sampleFilterH<0.0f) sampleFilterH=0.0f;
-            if (sampleFilterH>1.0f) sampleFilterH=1.0f;
-          }
-
-          if (ImGui::Button("Apply")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              SAMPLE_OP_BEGIN;
-              float res=1.0-pow(sampleFilterRes,0.5f);
-              float low=0;
-              float band=0;
-              float high=0;
-
-              double power=(sampleFilterCutStart>sampleFilterCutEnd)?0.5:2.0;
-
-              if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  double freq=sampleFilterCutStart+(sampleFilterCutEnd-sampleFilterCutStart)*pow(double(i-start)/double(end-start),power);
-                  double cut=sin((freq/double(sample->rate))*M_PI);
-
-                  for (int j=0; j<sampleFilterPower; j++) {
-                    low=low+cut*band;
-                    high=float(sample->data16[i])-low-(res*band);
-                    band=cut*high+band;
-                  }
-
-                  float val=low*sampleFilterL+band*sampleFilterB+high*sampleFilterH;
-                  if (val<-32768) val=-32768;
-                  if (val>32767) val=32767;
-                  sample->data16[i]=val;
-                }
-              } else if (sample->depth==DIV_SAMPLE_DEPTH_8BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  double freq=sampleFilterCutStart+(sampleFilterCutEnd-sampleFilterCutStart)*pow(double(i-start)/double(end-start),power);
-                  double cut=sin((freq/double(sample->rate))*M_PI);
-
-                  for (int j=0; j<sampleFilterPower; j++) {
-                    low=low+cut*band;
-                    high=float(sample->data8[i])-low-(res*band);
-                    band=cut*high+band;
-                  }
-
-                  float val=low*sampleFilterL+band*sampleFilterB+high*sampleFilterH;
-                  if (val<-128) val=-128;
-                  if (val>127) val=127;
-                  sample->data8[i]=val;
-                }
-              }
-
-              updateSampleTex=true;
-
-              e->renderSamples();
-            });
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        }
-        ImGui::EndDisabled();
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_PLAY "##PreviewSample")) {
-          e->previewSample(curSample);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Preview sample");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_STOP "##StopSample")) {
-          e->stopSamplePreview();
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Stop sample preview");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_UPLOAD "##MakeIns")) {
-          doAction(GUI_ACTION_SAMPLE_MAKE_INS);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Create instrument from sample");
-        }
-
-        ImGui::SameLine();
-        double zoomPercent=100.0/sampleZoom;
-        ImGui::Text("Zoom");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(150.0f*dpiScale);
-        if (ImGui::InputDouble("##SZoom",&zoomPercent,5.0,20.0,"%g%%")) {
-          if (zoomPercent>10000.0) zoomPercent=10000.0;
-          if (zoomPercent<1.0) zoomPercent=1.0;
-          sampleZoom=100.0/zoomPercent;
-          if (sampleZoom<0.01) sampleZoom=0.01;
-          sampleZoomAuto=false;
+            e->renderSamples();
+          });
           updateSampleTex=true;
+          sampleSelStart=-1;
+          sampleSelEnd=-1;
+          MARK_MODIFIED;
+          ImGui::CloseCurrentPopup();
         }
-        ImGui::SameLine();
-        if (sampleZoomAuto) {
-          if (ImGui::Button("100%")) {
-            sampleZoom=1.0;
-            sampleZoomAuto=false;
-            updateSampleTex=true;
-          }
-        } else {
-          if (ImGui::Button("Auto")) {
-            sampleZoomAuto=true;
-            updateSampleTex=true;
-          }
-        }
+        ImGui::EndPopup();
       } else {
-        ImGui::Text("Name");
+        resizeSize=sample->samples;
+      }
+      ImGui::SameLine();
+      ImGui::Button(ICON_FA_EXPAND "##SResample");
+      if (ImGui::IsItemClicked()) {
+        resampleTarget=sample->rate;
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Resample");
+      }
+      if (openSampleResampleOpt) {
+        openSampleResampleOpt=false;
+        ImGui::OpenPopup("SResampleOpt");
+      }
+      if (ImGui::BeginPopupContextItem("SResampleOpt",ImGuiPopupFlags_MouseButtonLeft)) {
+        ImGui::Text("Rate");
+        if (ImGui::InputDouble("##SRRate",&resampleTarget,1.0,50.0,"%g")) {
+          if (resampleTarget<0) resampleTarget=0;
+          if (resampleTarget>96000) resampleTarget=96000;
+        }
         ImGui::SameLine();
-        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-        if (ImGui::InputText("##SampleName",&sample->name)) {
+        if (ImGui::Button("0.5x")) {
+          resampleTarget*=0.5;
+        }
+        ImGui::SameLine();
+        if (ImGui::Button("==")) {
+          resampleTarget=sample->rate;
+        }
+        ImGui::SameLine();
+        if (ImGui::Button("2.0x")) {
+          resampleTarget*=2.0;
+        }
+        double factor=resampleTarget/(double)sample->rate;
+        if (ImGui::InputDouble("Factor",&factor,0.125,0.5,"%g")) {
+          resampleTarget=(double)sample->rate*factor;
+          if (resampleTarget<0) resampleTarget=0;
+          if (resampleTarget>96000) resampleTarget=96000;
+        }
+        ImGui::Combo("Filter",&resampleStrat,resampleStrats,6);
+        if (ImGui::Button("Resample")) {
+          sample->prepareUndo(true);
+          e->lockEngine([this,sample]() {
+            if (!sample->resample(resampleTarget,resampleStrat)) {
+              showError("couldn't resample! make sure your sample is 8 or 16-bit.");
+            }
+            e->renderSamples();
+          });
+          updateSampleTex=true;
+          sampleSelStart=-1;
+          sampleSelEnd=-1;
           MARK_MODIFIED;
+          ImGui::CloseCurrentPopup();
         }
-
-        if (ImGui::BeginTable("SampleProps",2,ImGuiTableFlags_SizingStretchSame)) {
-          ImGui::TableNextRow();
-          ImGui::TableNextColumn();
-          ImGui::Text("Type");
-          ImGui::SameLine();
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-          if (ImGui::BeginCombo("##SampleType",sampleType.c_str())) {
-            for (int i=0; i<DIV_SAMPLE_DEPTH_MAX; i++) {
-              if (sampleDepths[i]==NULL) continue;
-              if (ImGui::Selectable(sampleDepths[i])) {
-                sample->prepareUndo(true);
-                e->lockEngine([sample]() {
-                  sample->render();
-                });
-                sample->depth=(DivSampleDepth)i;
-                e->renderSamplesP();
-                updateSampleTex=true;
-                MARK_MODIFIED;
-              }
-            }
-            ImGui::EndCombo();
-          }
-
-          ImGui::TableNextColumn();
-          ImGui::Text("C-4 (Hz)");
-          ImGui::SameLine();
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-          if (ImGui::InputInt("##SampleCenter",&sample->centerRate,10,200)) { MARK_MODIFIED
-            if (sample->centerRate<100) sample->centerRate=100;
-            if (sample->centerRate>65535) sample->centerRate=65535;
-          }
-
-          ImGui::TableNextRow();
-          ImGui::TableNextColumn();
-          ImGui::Text("Compat Rate");
-          ImGui::SameLine();
-          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-          if (ImGui::InputInt("##SampleRate",&sample->rate,10,200)) { MARK_MODIFIED
-            if (sample->rate<100) sample->rate=100;
-            if (sample->rate>96000) sample->rate=96000;
-          }
-
-          ImGui::TableNextColumn();
-          bool doLoop=(sample->isLoopable());
-          if (ImGui::Checkbox("Loop",&doLoop)) { MARK_MODIFIED
-            if (doLoop) {
-              sample->loop=true;
-              sample->loopStart=0;
-              sample->loopEnd=sample->samples;
-            } else {
-              sample->loop=false;
-              sample->loopStart=-1;
-              sample->loopEnd=sample->samples;
-            }
-            updateSampleTex=true;
-            if (e->getSampleFormatMask()&(1U<<DIV_SAMPLE_DEPTH_BRR)) {
-              e->renderSamplesP();
-            }
-          }
-          if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
-            ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
-          }
-          if (doLoop || keepLoopAlive) {
-            keepLoopAlive=false;
-            ImGui::TableNextRow();
-            ImGui::TableNextColumn();
-            ImGui::Text("Loop Mode");
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (ImGui::BeginCombo("##SampleLoopMode",loopType.c_str())) {
-              for (int i=0; i<DIV_SAMPLE_LOOP_MAX; i++) {
-                if (sampleLoopModes[i]==NULL) continue;
-                if (ImGui::Selectable(sampleLoopModes[i])) {
-                  sample->prepareUndo(true);
-                  sample->loopMode=(DivSampleLoopMode)i;
-                  e->renderSamplesP();
-                  updateSampleTex=true;
-                  MARK_MODIFIED;
-                }
-              }
-              ImGui::EndCombo();
-            }
-            ImGui::TableNextRow();
-            ImGui::TableNextColumn();
-            ImGui::Text("Loop Start");
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (ImGui::InputInt("##LoopStartPosition",&sample->loopStart,1,16)) { MARK_MODIFIED
-              if (sample->loopStart<0) {
-                sample->loopStart=0;
-              }
-              if (sample->loopStart>sample->loopEnd) {
-                sample->loopStart=sample->loopEnd;
-              }
-              if (e->getSampleFormatMask()&(1U<<DIV_SAMPLE_DEPTH_BRR)) {
-                e->renderSamplesP();
-              }
-              updateSampleTex=true;
-            }
-            if (ImGui::IsItemActive()) {
-              keepLoopAlive=true;
-            }
-            if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
-              ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
-            }
-            ImGui::TableNextColumn();
-            ImGui::Text("Loop End");
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-            if (ImGui::InputInt("##LoopEndPosition",&sample->loopEnd,1,16)) { MARK_MODIFIED
-              if (sample->loopEnd<sample->loopStart) {
-                sample->loopEnd=sample->loopStart;
-              }
-              if (sample->loopEnd>=(int)sample->samples) {
-                sample->loopEnd=sample->samples;
-              }
-              if (e->getSampleFormatMask()&(1U<<DIV_SAMPLE_DEPTH_BRR)) {
-                e->renderSamplesP();
-              }
-              updateSampleTex=true;
-            }
-            if (ImGui::IsItemActive()) {
-              keepLoopAlive=true;
-            }
-            if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
-              ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
-            }
-          }
-          ImGui::EndTable();
+        ImGui::EndPopup();
+      } else {
+        resampleTarget=sample->rate;
+      }
+      ImGui::SameLine();
+      ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_UNDO "##SUndo")) {
+        doUndoSample();
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Undo");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_REPEAT "##SRedo")) {
+        doRedoSample();
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Redo");
+      }
+      ImGui::SameLine();
+      ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
+      ImGui::SameLine();
+      ImGui::Button(ICON_FA_VOLUME_UP "##SAmplify");
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Amplify");
+      }
+      if (openSampleAmplifyOpt) {
+        openSampleAmplifyOpt=false;
+        ImGui::OpenPopup("SAmplifyOpt");
+      }
+      if (ImGui::BeginPopupContextItem("SAmplifyOpt",ImGuiPopupFlags_MouseButtonLeft)) {
+        ImGui::Text("Volume");
+        if (ImGui::InputFloat("##SRVolume",&amplifyVol,10.0,50.0,"%g%%")) {
+          if (amplifyVol<0) amplifyVol=0;
+          if (amplifyVol>10000) amplifyVol=10000;
         }
-
-        /*
+        ImGui::SameLine();
+        ImGui::Text("(%.1fdB)",20.0*log10(amplifyVol/100.0f));
         if (ImGui::Button("Apply")) {
-          e->renderSamplesP();
+          sample->prepareUndo(true);
+          e->lockEngine([this,sample]() {
+            SAMPLE_OP_BEGIN;
+            float vol=amplifyVol/100.0f;
+
+            if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
+              for (unsigned int i=start; i<end; i++) {
+                float val=sample->data16[i]*vol;
+                if (val<-32768) val=-32768;
+                if (val>32767) val=32767;
+                sample->data16[i]=val;
+              }
+            } else if (sample->depth==DIV_SAMPLE_DEPTH_8BIT) {
+              for (unsigned int i=start; i<end; i++) {
+                float val=sample->data8[i]*vol;
+                if (val<-128) val=-128;
+                if (val>127) val=127;
+                sample->data8[i]=val;
+              }
+            }
+
+            updateSampleTex=true;
+
+            e->renderSamples();
+          });
+          MARK_MODIFIED;
+          ImGui::CloseCurrentPopup();
+        }
+        ImGui::EndPopup();
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_ARROWS_V "##SNormalize")) {
+        doAction(GUI_ACTION_SAMPLE_NORMALIZE);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Normalize");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_ARROW_UP "##SFadeIn")) {
+        doAction(GUI_ACTION_SAMPLE_FADE_IN);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Fade in");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_ARROW_DOWN "##SFadeOut")) {
+        doAction(GUI_ACTION_SAMPLE_FADE_OUT);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Fade out");
+      }
+      ImGui::SameLine();
+      ImGui::Button(ICON_FA_ADJUST "##SInsertSilence");
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Insert silence");
+      }
+      if (openSampleSilenceOpt) {
+        openSampleSilenceOpt=false;
+        ImGui::OpenPopup("SSilenceOpt");
+      }
+      if (ImGui::BeginPopupContextItem("SSilenceOpt",ImGuiPopupFlags_MouseButtonLeft)) {
+        if (ImGui::InputInt("Samples",&silenceSize,1,64)) {
+          if (silenceSize<0) silenceSize=0;
+          if (silenceSize>16777215) silenceSize=16777215;
+        }
+        if (ImGui::Button("Go")) {
+          int pos=(sampleSelStart==-1 || sampleSelStart==sampleSelEnd)?sample->samples:sampleSelStart;
+          sample->prepareUndo(true);
+          e->lockEngine([this,sample,pos]() {
+            if (!sample->insert(pos,silenceSize)) {
+              showError("couldn't insert! make sure your sample is 8 or 16-bit.");
+            }
+            e->renderSamples();
+          });
+          updateSampleTex=true;
+          sampleSelStart=pos;
+          sampleSelEnd=pos+silenceSize;
+          MARK_MODIFIED;
+          ImGui::CloseCurrentPopup();
+        }
+        ImGui::EndPopup();
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_ERASER "##SSilence")) {
+        doAction(GUI_ACTION_SAMPLE_SILENCE);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Apply silence");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_TIMES "##SDelete")) {
+        doAction(GUI_ACTION_SAMPLE_DELETE);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Delete");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_CROP "##STrim")) {
+        doAction(GUI_ACTION_SAMPLE_TRIM);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Trim");
+      }
+      ImGui::SameLine();
+      ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_BACKWARD "##SReverse")) {
+        doAction(GUI_ACTION_SAMPLE_REVERSE);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Reverse");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_SORT_AMOUNT_ASC "##SInvert")) {
+        doAction(GUI_ACTION_SAMPLE_INVERT);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Invert");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_LEVEL_DOWN "##SSign")) {
+        doAction(GUI_ACTION_SAMPLE_SIGN);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Signed/unsigned exchange");
+      }
+      ImGui::SameLine();
+      ImGui::Button(ICON_FA_INDUSTRY "##SFilter");
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Apply filter");
+      }
+      if (openSampleFilterOpt) {
+        openSampleFilterOpt=false;
+        ImGui::OpenPopup("SFilterOpt");
+      }
+      if (ImGui::BeginPopupContextItem("SFilterOpt",ImGuiPopupFlags_MouseButtonLeft)) {
+        float lowP=sampleFilterL*100.0f;
+        float bandP=sampleFilterB*100.0f;
+        float highP=sampleFilterH*100.0f;
+        float resP=sampleFilterRes*100.0f;
+        ImGui::Text("Cutoff:");
+        if (ImGui::SliderFloat("From",&sampleFilterCutStart,0.0f,sample->rate*0.5,"%.0fHz")) {
+          if (sampleFilterCutStart<0.0) sampleFilterCutStart=0.0;
+          if (sampleFilterCutStart>sample->rate*0.5) sampleFilterCutStart=sample->rate*0.5;
+        }
+        if (ImGui::SliderFloat("To",&sampleFilterCutEnd,0.0f,sample->rate*0.5,"%.0fHz")) {
+          if (sampleFilterCutEnd<0.0) sampleFilterCutEnd=0.0;
+          if (sampleFilterCutEnd>sample->rate*0.5) sampleFilterCutEnd=sample->rate*0.5;
         }
-        ImGui::SameLine();
-        */
         ImGui::Separator();
+        if (ImGui::SliderFloat("Resonance",&resP,0.0f,99.0f,"%.1f%%")) {
+          sampleFilterRes=resP/100.0f;
+          if (sampleFilterRes<0.0f) sampleFilterRes=0.0f;
+          if (sampleFilterRes>0.99f) sampleFilterRes=0.99f;
+        }
+        ImGui::Text("Power");
+        ImGui::SameLine();
+        if (ImGui::RadioButton("1x",sampleFilterPower==1)) {
+          sampleFilterPower=1;
+        }
+        ImGui::SameLine();
+        if (ImGui::RadioButton("2x",sampleFilterPower==2)) {
+          sampleFilterPower=2;
+        }
+        ImGui::SameLine();
+        if (ImGui::RadioButton("3x",sampleFilterPower==3)) {
+          sampleFilterPower=3;
+        }
+        ImGui::Separator();
+        if (ImGui::SliderFloat("Low-pass",&lowP,0.0f,100.0f,"%.1f%%")) {
+          sampleFilterL=lowP/100.0f;
+          if (sampleFilterL<0.0f) sampleFilterL=0.0f;
+          if (sampleFilterL>1.0f) sampleFilterL=1.0f;
+        }
+        if (ImGui::SliderFloat("Band-pass",&bandP,0.0f,100.0f,"%.1f%%")) {
+          sampleFilterB=bandP/100.0f;
+          if (sampleFilterB<0.0f) sampleFilterB=0.0f;
+          if (sampleFilterB>1.0f) sampleFilterB=1.0f;
+        }
+        if (ImGui::SliderFloat("High-pass",&highP,0.0f,100.0f,"%.1f%%")) {
+          sampleFilterH=highP/100.0f;
+          if (sampleFilterH<0.0f) sampleFilterH=0.0f;
+          if (sampleFilterH>1.0f) sampleFilterH=1.0f;
+        }
 
-        pushToggleColors(!sampleDragMode);
-        if (ImGui::Button(ICON_FA_I_CURSOR "##SSelect")) {
-          sampleDragMode=false;
-        }
-        popToggleColors();
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Edit mode: Select");
-        }
-        ImGui::SameLine();
-        pushToggleColors(sampleDragMode);
-        if (ImGui::Button(ICON_FA_PENCIL "##SDraw")) {
-          sampleDragMode=true;
-        }
-        popToggleColors();
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Edit mode: Draw");
-        }
-        ImGui::BeginDisabled(sample->depth!=DIV_SAMPLE_DEPTH_8BIT && sample->depth!=DIV_SAMPLE_DEPTH_16BIT);
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(7.0*dpiScale,dpiScale));
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_ARROWS_H "##SResize");
-        if (ImGui::IsItemClicked()) {
-          resizeSize=sample->samples;
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Resize");
-        }
-        if (openSampleResizeOpt) {
-          openSampleResizeOpt=false;
-          ImGui::OpenPopup("SResizeOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SResizeOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          if (ImGui::InputInt("Samples",&resizeSize,1,64)) {
-            if (resizeSize<0) resizeSize=0;
-            if (resizeSize>16777215) resizeSize=16777215;
-          }
-          if (ImGui::Button("Resize")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              if (!sample->resize(resizeSize)) {
-                showError("couldn't resize! make sure your sample is 8 or 16-bit.");
+        if (ImGui::Button("Apply")) {
+          sample->prepareUndo(true);
+          e->lockEngine([this,sample]() {
+            SAMPLE_OP_BEGIN;
+            float res=1.0-pow(sampleFilterRes,0.5f);
+            float low=0;
+            float band=0;
+            float high=0;
+
+            double power=(sampleFilterCutStart>sampleFilterCutEnd)?0.5:2.0;
+
+            if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
+              for (unsigned int i=start; i<end; i++) {
+                double freq=sampleFilterCutStart+(sampleFilterCutEnd-sampleFilterCutStart)*pow(double(i-start)/double(end-start),power);
+                double cut=sin((freq/double(sample->rate))*M_PI);
+
+                for (int j=0; j<sampleFilterPower; j++) {
+                  low=low+cut*band;
+                  high=float(sample->data16[i])-low-(res*band);
+                  band=cut*high+band;
+                }
+
+                float val=low*sampleFilterL+band*sampleFilterB+high*sampleFilterH;
+                if (val<-32768) val=-32768;
+                if (val>32767) val=32767;
+                sample->data16[i]=val;
               }
-              e->renderSamples();
-            });
+            } else if (sample->depth==DIV_SAMPLE_DEPTH_8BIT) {
+              for (unsigned int i=start; i<end; i++) {
+                double freq=sampleFilterCutStart+(sampleFilterCutEnd-sampleFilterCutStart)*pow(double(i-start)/double(end-start),power);
+                double cut=sin((freq/double(sample->rate))*M_PI);
+
+                for (int j=0; j<sampleFilterPower; j++) {
+                  low=low+cut*band;
+                  high=float(sample->data8[i])-low-(res*band);
+                  band=cut*high+band;
+                }
+
+                float val=low*sampleFilterL+band*sampleFilterB+high*sampleFilterH;
+                if (val<-128) val=-128;
+                if (val>127) val=127;
+                sample->data8[i]=val;
+              }
+            }
+
             updateSampleTex=true;
-            sampleSelStart=-1;
-            sampleSelEnd=-1;
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        } else {
-          resizeSize=sample->samples;
-        }
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_EXPAND "##SResample");
-        if (ImGui::IsItemClicked()) {
-          resampleTarget=sample->rate;
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Resample");
-        }
-        if (openSampleResampleOpt) {
-          openSampleResampleOpt=false;
-          ImGui::OpenPopup("SResampleOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SResampleOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          ImGui::Text("Rate");
-          if (ImGui::InputDouble("##SRRate",&resampleTarget,1.0,50.0,"%g")) {
-            if (resampleTarget<0) resampleTarget=0;
-            if (resampleTarget>96000) resampleTarget=96000;
-          }
-          ImGui::SameLine();
-          if (ImGui::Button("0.5x")) {
-            resampleTarget*=0.5;
-          }
-          ImGui::SameLine();
-          if (ImGui::Button("==")) {
-            resampleTarget=sample->rate;
-          }
-          ImGui::SameLine();
-          if (ImGui::Button("2.0x")) {
-            resampleTarget*=2.0;
-          }
-          double factor=resampleTarget/(double)sample->rate;
-          if (ImGui::InputDouble("Factor",&factor,0.125,0.5,"%g")) {
-            resampleTarget=(double)sample->rate*factor;
-            if (resampleTarget<0) resampleTarget=0;
-            if (resampleTarget>96000) resampleTarget=96000;
-          }
-          ImGui::Combo("Filter",&resampleStrat,resampleStrats,6);
-          if (ImGui::Button("Resample")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              if (!sample->resample(resampleTarget,resampleStrat)) {
-                showError("couldn't resample! make sure your sample is 8 or 16-bit.");
-              }
-              e->renderSamples();
-            });
-            updateSampleTex=true;
-            sampleSelStart=-1;
-            sampleSelEnd=-1;
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        } else {
-          resampleTarget=sample->rate;
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(0.5*dpiScale,dpiScale));
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_INDUSTRY "##SFilter");
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Apply filter");
-        }
-        if (openSampleFilterOpt) {
-          openSampleFilterOpt=false;
-          ImGui::OpenPopup("SFilterOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SFilterOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          float lowP=sampleFilterL*100.0f;
-          float bandP=sampleFilterB*100.0f;
-          float highP=sampleFilterH*100.0f;
-          float resP=sampleFilterRes*100.0f;
-          ImGui::Text("Cutoff:");
-          if (CWSliderFloat("From",&sampleFilterCutStart,0.0f,sample->rate*0.5,"%.0fHz")) {
-            if (sampleFilterCutStart<0.0) sampleFilterCutStart=0.0;
-            if (sampleFilterCutStart>sample->rate*0.5) sampleFilterCutStart=sample->rate*0.5;
-          }
-          if (CWSliderFloat("To",&sampleFilterCutEnd,0.0f,sample->rate*0.5,"%.0fHz")) {
-            if (sampleFilterCutEnd<0.0) sampleFilterCutEnd=0.0;
-            if (sampleFilterCutEnd>sample->rate*0.5) sampleFilterCutEnd=sample->rate*0.5;
-          }
-          ImGui::Separator();
-          if (CWSliderFloat("Resonance",&resP,0.0f,99.0f,"%.1f%%")) {
-            sampleFilterRes=resP/100.0f;
-            if (sampleFilterRes<0.0f) sampleFilterRes=0.0f;
-            if (sampleFilterRes>0.99f) sampleFilterRes=0.99f;
-          }
-          ImGui::Text("Power");
-          ImGui::SameLine();
-          if (ImGui::RadioButton("1x",sampleFilterPower==1)) {
-            sampleFilterPower=1;
-          }
-          ImGui::SameLine();
-          if (ImGui::RadioButton("2x",sampleFilterPower==2)) {
-            sampleFilterPower=2;
-          }
-          ImGui::SameLine();
-          if (ImGui::RadioButton("3x",sampleFilterPower==3)) {
-            sampleFilterPower=3;
-          }
-          ImGui::Separator();
-          if (CWSliderFloat("Low-pass",&lowP,0.0f,100.0f,"%.1f%%")) {
-            sampleFilterL=lowP/100.0f;
-            if (sampleFilterL<0.0f) sampleFilterL=0.0f;
-            if (sampleFilterL>1.0f) sampleFilterL=1.0f;
-          }
-          if (CWSliderFloat("Band-pass",&bandP,0.0f,100.0f,"%.1f%%")) {
-            sampleFilterB=bandP/100.0f;
-            if (sampleFilterB<0.0f) sampleFilterB=0.0f;
-            if (sampleFilterB>1.0f) sampleFilterB=1.0f;
-          }
-          if (CWSliderFloat("High-pass",&highP,0.0f,100.0f,"%.1f%%")) {
-            sampleFilterH=highP/100.0f;
-            if (sampleFilterH<0.0f) sampleFilterH=0.0f;
-            if (sampleFilterH>1.0f) sampleFilterH=1.0f;
-          }
 
-          if (ImGui::Button("Apply")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              SAMPLE_OP_BEGIN;
-              float res=1.0-pow(sampleFilterRes,0.5f);
-              float low=0;
-              float band=0;
-              float high=0;
+            e->renderSamples();
+          });
+          MARK_MODIFIED;
+          ImGui::CloseCurrentPopup();
+        }
+        ImGui::EndPopup();
+      }
+      ImGui::EndDisabled();
+      ImGui::SameLine();
+      ImGui::Dummy(ImVec2(4.0*dpiScale,dpiScale));
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_PLAY "##PreviewSample")) {
+        e->previewSample(curSample);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Preview sample");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_STOP "##StopSample")) {
+        e->stopSamplePreview();
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Stop sample preview");
+      }
+      ImGui::SameLine();
+      if (ImGui::Button(ICON_FA_UPLOAD "##MakeIns")) {
+        doAction(GUI_ACTION_SAMPLE_MAKE_INS);
+      }
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("Create instrument from sample");
+      }
 
-              double power=(sampleFilterCutStart>sampleFilterCutEnd)?0.5:2.0;
-
-              if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  double freq=sampleFilterCutStart+(sampleFilterCutEnd-sampleFilterCutStart)*pow(double(i-start)/double(end-start),power);
-                  double cut=sin((freq/double(sample->rate))*M_PI);
-
-                  for (int j=0; j<sampleFilterPower; j++) {
-                    low=low+cut*band;
-                    high=float(sample->data16[i])-low-(res*band);
-                    band=cut*high+band;
-                  }
-
-                  float val=low*sampleFilterL+band*sampleFilterB+high*sampleFilterH;
-                  if (val<-32768) val=-32768;
-                  if (val>32767) val=32767;
-                  sample->data16[i]=val;
-                }
-              } else if (sample->depth==DIV_SAMPLE_DEPTH_8BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  double freq=sampleFilterCutStart+(sampleFilterCutEnd-sampleFilterCutStart)*pow(double(i-start)/double(end-start),power);
-                  double cut=sin((freq/double(sample->rate))*M_PI);
-
-                  for (int j=0; j<sampleFilterPower; j++) {
-                    low=low+cut*band;
-                    high=float(sample->data8[i])-low-(res*band);
-                    band=cut*high+band;
-                  }
-
-                  float val=low*sampleFilterL+band*sampleFilterB+high*sampleFilterH;
-                  if (val<-128) val=-128;
-                  if (val>127) val=127;
-                  sample->data8[i]=val;
-                }
-              }
-
-              updateSampleTex=true;
-
-              e->renderSamples();
-            });
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(0.5*dpiScale,dpiScale));
-        ImGui::SameLine();
-
-
-        ImGui::Button(ICON_FA_VOLUME_UP "##SAmplify");
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Amplify");
-        }
-        if (openSampleAmplifyOpt) {
-          openSampleAmplifyOpt=false;
-          ImGui::OpenPopup("SAmplifyOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SAmplifyOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          ImGui::Text("Volume");
-          if (ImGui::InputFloat("##SRVolume",&amplifyVol,10.0,50.0,"%g%%")) {
-            if (amplifyVol<0) amplifyVol=0;
-            if (amplifyVol>10000) amplifyVol=10000;
-          }
-          ImGui::SameLine();
-          ImGui::Text("(%.1fdB)",20.0*log10(amplifyVol/100.0f));
-          if (ImGui::Button("Apply")) {
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample]() {
-              SAMPLE_OP_BEGIN;
-              float vol=amplifyVol/100.0f;
-
-              if (sample->depth==DIV_SAMPLE_DEPTH_16BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  float val=sample->data16[i]*vol;
-                  if (val<-32768) val=-32768;
-                  if (val>32767) val=32767;
-                  sample->data16[i]=val;
-                }
-              } else if (sample->depth==DIV_SAMPLE_DEPTH_8BIT) {
-                for (unsigned int i=start; i<end; i++) {
-                  float val=sample->data8[i]*vol;
-                  if (val<-128) val=-128;
-                  if (val>127) val=127;
-                  sample->data8[i]=val;
-                }
-              }
-
-              updateSampleTex=true;
-
-              e->renderSamples();
-            });
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ARROWS_V "##SNormalize")) {
-          doAction(GUI_ACTION_SAMPLE_NORMALIZE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Normalize");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ARROW_UP "##SFadeIn")) {
-          doAction(GUI_ACTION_SAMPLE_FADE_IN);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Fade in");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ARROW_DOWN "##SFadeOut")) {
-          doAction(GUI_ACTION_SAMPLE_FADE_OUT);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Fade out");
-        }
-
-        if (ImGui::Button(ICON_FA_UNDO "##SUndo")) {
-          doUndoSample();
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Undo");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_REPEAT "##SRedo")) {
-          doRedoSample();
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Redo");
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(7.0*dpiScale,dpiScale));
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_BACKWARD "##SReverse")) {
-          doAction(GUI_ACTION_SAMPLE_REVERSE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Reverse");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_SORT_AMOUNT_ASC "##SInvert")) {
-          doAction(GUI_ACTION_SAMPLE_INVERT);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Invert");
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(0.5*dpiScale,dpiScale));
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_LEVEL_DOWN "##SSign")) {
-          doAction(GUI_ACTION_SAMPLE_SIGN);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Signed/unsigned exchange");
-        }
-        ImGui::SameLine();
-        ImGui::Dummy(ImVec2(0.5*dpiScale,dpiScale));
-        ImGui::SameLine();
-        ImGui::Button(ICON_FA_ADJUST "##SInsertSilence");
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Insert silence");
-        }
-        if (openSampleSilenceOpt) {
-          openSampleSilenceOpt=false;
-          ImGui::OpenPopup("SSilenceOpt");
-        }
-        if (ImGui::BeginPopupContextItem("SSilenceOpt",ImGuiPopupFlags_MouseButtonLeft)) {
-          if (ImGui::InputInt("Samples",&silenceSize,1,64)) {
-            if (silenceSize<0) silenceSize=0;
-            if (silenceSize>16777215) silenceSize=16777215;
-          }
-          if (ImGui::Button("Go")) {
-            int pos=(sampleSelStart==-1 || sampleSelStart==sampleSelEnd)?sample->samples:sampleSelStart;
-            sample->prepareUndo(true);
-            e->lockEngine([this,sample,pos]() {
-              if (!sample->insert(pos,silenceSize)) {
-                showError("couldn't insert! make sure your sample is 8 or 16-bit.");
-              }
-              e->renderSamples();
-            });
-            updateSampleTex=true;
-            sampleSelStart=pos;
-            sampleSelEnd=pos+silenceSize;
-            MARK_MODIFIED;
-            ImGui::CloseCurrentPopup();
-          }
-          ImGui::EndPopup();
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_ERASER "##SSilence")) {
-          doAction(GUI_ACTION_SAMPLE_SILENCE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Apply silence");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_TIMES "##SDelete")) {
-          doAction(GUI_ACTION_SAMPLE_DELETE);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Delete");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_CROP "##STrim")) {
-          doAction(GUI_ACTION_SAMPLE_TRIM);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Trim");
-        }
-
-        ImGui::EndDisabled();
-
-        if (ImGui::Button(ICON_FA_PLAY "##PreviewSample")) {
-          e->previewSample(curSample);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Preview sample");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_STOP "##StopSample")) {
-          e->stopSamplePreview();
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Stop sample preview");
-        }
-        ImGui::SameLine();
-        if (ImGui::Button(ICON_FA_UPLOAD "##MakeIns")) {
-          doAction(GUI_ACTION_SAMPLE_MAKE_INS);
-        }
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("Create instrument from sample");
-        }
-        ImGui::SameLine();
-        double zoomPercent=100.0/sampleZoom;
-        ImGui::Text("Zoom");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(150.0f*dpiScale);
-        if (ImGui::InputDouble("##SZoom",&zoomPercent,5.0,20.0,"%g%%")) {
-          if (zoomPercent>10000.0) zoomPercent=10000.0;
-          if (zoomPercent<1.0) zoomPercent=1.0;
-          sampleZoom=100.0/zoomPercent;
-          if (sampleZoom<0.01) sampleZoom=0.01;
+      ImGui::SameLine();
+      double zoomPercent=100.0/sampleZoom;
+      bool checkZoomLimit=false;
+      ImGui::Text("Zoom");
+      ImGui::SameLine();
+      ImGui::SetNextItemWidth(150.0f*dpiScale);
+      if (ImGui::InputDouble("##SZoom",&zoomPercent,zoomPercent/8.0,20.0,"%g%%")) {
+        if (zoomPercent>10000.0) zoomPercent=10000.0;
+        if (zoomPercent<0.01) zoomPercent=0.01;
+        sampleZoom=100.0/zoomPercent;
+        sampleZoomAuto=false;
+        checkZoomLimit=true;
+        updateSampleTex=true;
+      }
+      ImGui::SameLine();
+      if (sampleZoomAuto) {
+        ImGui::BeginDisabled(minSampleZoom<1.0);
+        if (ImGui::Button("100%")) {
+          sampleZoom=1.0;
           sampleZoomAuto=false;
           updateSampleTex=true;
+          checkZoomLimit=true;
         }
-        ImGui::SameLine();
-        if (sampleZoomAuto) {
-          if (ImGui::Button("100%")) {
-            sampleZoom=1.0;
-            sampleZoomAuto=false;
-            updateSampleTex=true;
-          }
-        } else {
-          if (ImGui::Button("Auto")) {
-            sampleZoomAuto=true;
-            updateSampleTex=true;
-          }
+        ImGui::EndDisabled();
+      } else {
+        if (ImGui::Button("Auto")) {
+          sampleZoomAuto=true;
+          updateSampleTex=true;
         }
       }
 
       ImGui::Separator();
 
       ImVec2 avail=ImGui::GetContentRegionAvail(); // graph size determined here
-      if (ImGui::GetContentRegionAvail().y>(ImGui::GetContentRegionAvail().x*0.5f)) {
+      // don't do this. reason: mobile.
+      /*if (ImGui::GetContentRegionAvail().y>(ImGui::GetContentRegionAvail().x*0.5f)) {
         avail=ImVec2(ImGui::GetContentRegionAvail().x,ImGui::GetContentRegionAvail().x*0.5f);
-      }
+      }*/
       avail.y-=ImGui::GetFontSize()+ImGui::GetStyle().ItemSpacing.y+ImGui::GetStyle().ScrollbarSize;
       if (avail.y<1.0) { // Prevents crash
         avail.y=1.0;
@@ -1281,12 +725,24 @@ void FurnaceGUI::drawSampleEdit() {
       int availX=avail.x;
       int availY=avail.y;
 
+      minSampleZoom=(double)sample->samples/avail.x;
+
+      if (checkZoomLimit) {
+        logV("sample: %f min: %f",sampleZoom,minSampleZoom);
+        int bounds=((int)sample->samples-round(avail.x*sampleZoom));
+        if (bounds<0) bounds=0;
+        if (samplePos>bounds) samplePos=bounds;
+        if (sampleZoom>minSampleZoom) {
+          sampleZoomAuto=true;
+        }
+      }
+
       if (sampleZoomAuto) {
         samplePos=0;
         if (sample->samples<1 || avail.x<=0) {
           sampleZoom=1.0;
         } else {
-          sampleZoom=(double)sample->samples/avail.x;
+          sampleZoom=minSampleZoom;
         }
         if (sampleZoom!=prevSampleZoom) {
           prevSampleZoom=sampleZoom;
@@ -1496,6 +952,9 @@ void FurnaceGUI::drawSampleEdit() {
             if (bounds<0) bounds=0;
             if (samplePos>bounds) samplePos=bounds;
             updateSampleTex=true;
+            if (sampleZoom>minSampleZoom) {
+              sampleZoomAuto=true;
+            }
           } else {
             if (wheelY!=0) {
               if (!sampleZoomAuto) {
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 7f95ffa04..1fae27922 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -1540,11 +1540,6 @@ void FurnaceGUI::drawSettings() {
             settings.waveLayout=waveLayoutB;
           }
 
-          bool sampleLayoutB=settings.sampleLayout;
-          if (ImGui::Checkbox("Use compact sample editor",&sampleLayoutB)) {
-            settings.sampleLayout=sampleLayoutB;
-          }
-
           bool oldMacroVSliderB=settings.oldMacroVSlider;
           if (ImGui::Checkbox("Use classic macro editor vertical slider",&oldMacroVSliderB)) {
             settings.oldMacroVSlider=oldMacroVSliderB;

From b289ac97fc0232f81d9703f33c9e50cb662d26cd Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Wed, 23 Nov 2022 03:35:24 -0500
Subject: [PATCH 56/86] GUi: yay finally edge scroll in sample editor!

---
 src/gui/sampleEdit.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index aa0032b92..6d5032368 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -881,6 +881,28 @@ void FurnaceGUI::drawSampleEdit() {
           }
         }
 
+        if (ImGui::IsItemActive()) {
+          logV("item is active...");
+          if (ImGui::GetMousePos().x>rectMax.x) {
+            double delta=pow(MAX(1.0,(ImGui::GetMousePos().x-rectMax.x)*0.04),2.0);
+            samplePos+=MAX(1.0,sampleZoom*delta);
+            int bounds=((int)sample->samples-round(avail.x*sampleZoom));
+            if (bounds<0) bounds=0;
+            if (samplePos>bounds) samplePos=bounds;
+            updateSampleTex=true;
+            processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y);
+            WAKE_UP;
+          }
+          if (ImGui::GetMousePos().x<rectMin.x) {
+            double delta=pow(MAX(1.0,(rectMin.x-ImGui::GetMousePos().x)*0.04),2.0);
+            samplePos-=MAX(1.0,sampleZoom*delta);
+            if (samplePos<0) samplePos=0;
+            updateSampleTex=true;
+            processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y);
+            WAKE_UP;
+          }
+        }
+
         if (!sampleDragMode && ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
           ImGui::OpenPopup("SRightClick");
         }

From 201f3ff0f84410f4ec01926ab85aa133bcfda921 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Wed, 23 Nov 2022 03:40:59 -0500
Subject: [PATCH 57/86] GUI: more natural sample zooming

---
 src/gui/sampleEdit.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 6d5032368..077732ddb 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -882,7 +882,6 @@ void FurnaceGUI::drawSampleEdit() {
         }
 
         if (ImGui::IsItemActive()) {
-          logV("item is active...");
           if (ImGui::GetMousePos().x>rectMax.x) {
             double delta=pow(MAX(1.0,(ImGui::GetMousePos().x-rectMax.x)*0.04),2.0);
             samplePos+=MAX(1.0,sampleZoom*delta);
@@ -964,11 +963,18 @@ void FurnaceGUI::drawSampleEdit() {
         if (ImGui::IsItemHovered()) {
           if (ctrlWheeling) {
             double zoomPercent=100.0/sampleZoom;
-            zoomPercent+=wheelY*10.0;
+            if (wheelY>0) {
+              for (int i=0; i<wheelY; i++) {
+                zoomPercent+=zoomPercent/8.0;
+              }
+            } else {
+              for (int i=0; i<-wheelY; i++) {
+                zoomPercent-=zoomPercent/8.0;
+              }
+            }
             if (zoomPercent>10000.0) zoomPercent=10000.0;
-            if (zoomPercent<1.0) zoomPercent=1.0;
+            if (zoomPercent<0.01) zoomPercent=0.01;
             sampleZoom=100.0/zoomPercent;
-            if (sampleZoom<0.01) sampleZoom=0.01;
             sampleZoomAuto=false;
             int bounds=((int)sample->samples-round(rectSize.x*sampleZoom));
             if (bounds<0) bounds=0;

From 7841c3d0b636b8423842aa04d07e9cacbf130ae0 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Wed, 23 Nov 2022 04:03:03 -0500
Subject: [PATCH 58/86] GUI: natural ctrl-scroll zoom in sample editor!

---
 src/gui/sampleEdit.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 077732ddb..8a6809c5d 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -965,11 +965,18 @@ void FurnaceGUI::drawSampleEdit() {
             double zoomPercent=100.0/sampleZoom;
             if (wheelY>0) {
               for (int i=0; i<wheelY; i++) {
+                double oldArea=round(rectSize.x*100.0/zoomPercent);
                 zoomPercent+=zoomPercent/8.0;
+                double increment=fabs(oldArea-(rectSize.x*100.0/zoomPercent))*((ImGui::GetMousePos().x-rectMin.x)/rectSize.x);
+                samplePos+=increment;
               }
             } else {
               for (int i=0; i<-wheelY; i++) {
+                double oldArea=round(rectSize.x*100.0/zoomPercent);
                 zoomPercent-=zoomPercent/8.0;
+                double increment=fabs(oldArea-(rectSize.x*100.0/zoomPercent))*((ImGui::GetMousePos().x-rectMin.x)/rectSize.x);
+                samplePos-=increment;
+                if (samplePos<0) samplePos=0;
               }
             }
             if (zoomPercent>10000.0) zoomPercent=10000.0;

From 7709a9c3f6063d2c5a1c253b5e4871329b73da77 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Fri, 25 Nov 2022 14:33:56 -0500
Subject: [PATCH 59/86] dev128 - prepare for SN noise and hard fix fp b

file picker bug...
---
 src/engine/engine.h           |  4 ++--
 src/engine/fileOps.cpp        | 19 ++++++++++++++++++-
 src/engine/platform/sms.cpp   |  1 +
 src/engine/platform/sms.h     |  1 +
 src/engine/platform/t6w28.cpp |  1 +
 src/engine/platform/t6w28.h   |  1 +
 src/gui/fileDialog.cpp        | 16 ++++++++++++++++
 7 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/engine/engine.h b/src/engine/engine.h
index e187ba7b9..ab028aca4 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -47,8 +47,8 @@
 #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
 #define BUSY_END isBusy.unlock(); softLocked=false;
 
-#define DIV_VERSION "dev127"
-#define DIV_ENGINE_VERSION 127
+#define DIV_VERSION "dev128"
+#define DIV_ENGINE_VERSION 128
 // for imports
 #define DIV_VERSION_MOD 0xff01
 #define DIV_VERSION_FC 0xff02
diff --git a/src/engine/fileOps.cpp b/src/engine/fileOps.cpp
index d37028afd..e01a57101 100644
--- a/src/engine/fileOps.cpp
+++ b/src/engine/fileOps.cpp
@@ -208,7 +208,9 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
     }*/
 
     // Game Boy arp+soundLen screwery
-    ds.systemFlags[0].set("enoughAlready",true);
+    if (ds.system[0]==DIV_SYSTEM_GB) {
+      ds.systemFlags[0].set("enoughAlready",true);
+    }
 
     logI("reading module data...");
     if (ds.version>0x0c) {
@@ -966,6 +968,11 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
       ds.system[1]=DIV_SYSTEM_FDS;
     }
 
+    // SMS noise freq
+    if (ds.system[0]==DIV_SYSTEM_SMS) {
+      ds.systemFlags[0].set("noEasyNoise",true);
+    }
+
     ds.systemName=getSongSystemLegacyName(ds,!getConfInt("noMultiSystem",0));
 
     if (active) quitDispatch();
@@ -2513,6 +2520,16 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
       }
     }
 
+    // SN noise compat
+    if (ds.version<128) {
+      for (int i=0; i<ds.systemLen; i++) {
+        if (ds.system[i]==DIV_SYSTEM_SMS ||
+            ds.system[i]==DIV_SYSTEM_T6W28) {
+          ds.systemFlags[i].set("noEasyNoise",true);
+        }
+      }
+    }
+
     if (active) quitDispatch();
     BUSY_BEGIN_SOFT;
     saveLock.lock();
diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index 60cb13c58..44e92c379 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -467,6 +467,7 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
       break;
   }
   resetPhase=!flags.getBool("noPhaseReset",false);
+  easyNoise=!flags.getBool("noEasyNoise",false);
   divider=16;
   toneDivider=64.0;
   noiseDivider=64.0;
diff --git a/src/engine/platform/sms.h b/src/engine/platform/sms.h
index 96a2e5bfd..bc673f03d 100644
--- a/src/engine/platform/sms.h
+++ b/src/engine/platform/sms.h
@@ -70,6 +70,7 @@ class DivPlatformSMS: public DivDispatch {
   bool isRealSN;
   bool stereo;
   bool nuked;
+  bool easyNoise;
   sn76496_base_device* sn;
   ympsg_t sn_nuked;
   struct QueuedWrite {
diff --git a/src/engine/platform/t6w28.cpp b/src/engine/platform/t6w28.cpp
index 0f4dbf827..033bf10af 100644
--- a/src/engine/platform/t6w28.cpp
+++ b/src/engine/platform/t6w28.cpp
@@ -330,6 +330,7 @@ void DivPlatformT6W28::setFlags(const DivConfig& flags) {
   for (int i=0; i<4; i++) {
     oscBuf[i]->rate=rate;
   }
+  easyNoise=!flags.getBool("noEasyNoise",false);
 
   if (t6w!=NULL) {
     delete t6w;
diff --git a/src/engine/platform/t6w28.h b/src/engine/platform/t6w28.h
index 5b5f1fc8f..c95850d04 100644
--- a/src/engine/platform/t6w28.h
+++ b/src/engine/platform/t6w28.h
@@ -60,6 +60,7 @@ class DivPlatformT6W28: public DivDispatch {
   DivDispatchOscBuffer* oscBuf[4];
   bool isMuted[4];
   bool antiClickEnabled;
+  bool easyNoise;
   struct QueuedWrite {
       unsigned char addr;
       unsigned char val;
diff --git a/src/gui/fileDialog.cpp b/src/gui/fileDialog.cpp
index c5103019a..9b13fff0d 100644
--- a/src/gui/fileDialog.cpp
+++ b/src/gui/fileDialog.cpp
@@ -80,6 +80,14 @@ bool FurnaceGUIFileDialog::openLoad(String header, std::vector<String> filter, c
   if (opened) return false;
   saving=false;
   curPath=path;
+
+  // strip excess directory separators
+  while (!curPath.empty()) {
+    if (curPath[curPath.size()-1]!=DIR_SEPARATOR) break;
+    curPath.erase(curPath.size()-1);
+  }
+  curPath+=DIR_SEPARATOR;
+
   logD("opening load file dialog with curPath %s",curPath.c_str());
   if (sysDialog) {
 #ifdef USE_NFD
@@ -145,6 +153,14 @@ bool FurnaceGUIFileDialog::openSave(String header, std::vector<String> filter, c
   if (opened) return false;
   saving=true;
   curPath=path;
+
+  // strip excess directory separators
+  while (!curPath.empty()) {
+    if (curPath[curPath.size()-1]!=DIR_SEPARATOR) break;
+    curPath.erase(curPath.size()-1);
+  }
+  curPath+=DIR_SEPARATOR;
+
   logD("opening save file dialog with curPath %s",curPath.c_str());
   if (sysDialog) {
 #ifdef USE_NFD

From 182731a2d7dac83164c4336852801f6147ec3803 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 01:13:32 -0500
Subject: [PATCH 60/86] GUI: update credits

---
 src/gui/about.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 924f2c0cc..75578106d 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -93,6 +93,7 @@ const char* aboutLine[]={
   "SnugglyBun",
   "SuperJet Spade",
   "TakuikaNinja",
+  "The Blender Fiddler",
   "TheDuccinator",
   "theloredev",
   "TheRealHedgehogSonic",

From a6b2f501d020c2d896b556704c1619c921957073 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 02:34:53 -0500
Subject: [PATCH 61/86] SN: implement easy noise!

---
 src/engine/platform/sms.cpp | 47 ++++++++++++++++++++++++++++---------
 src/engine/platform/sms.h   |  4 +++-
 src/gui/sysConf.cpp         |  6 +++++
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index 44e92c379..d3085c19b 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -119,10 +119,29 @@ void DivPlatformSMS::acquire(short* bufL, short* bufR, size_t start, size_t len)
   }
 }
 
+double DivPlatformSMS::NOTE_SN(int ch, int note) {
+  double CHIP_DIVIDER=toneDivider;
+  if (ch==3) CHIP_DIVIDER=noiseDivider;
+  if (parent->song.linearPitch==2 || !easyNoise) {
+    return NOTE_PERIODIC(note);
+  }
+  if (note>easyThreshold) {
+    return MAX(0,8-easyThreshold);
+  }
+  return NOTE_PERIODIC(note);
+}
+
+int DivPlatformSMS::snCalcFreq(int ch) {
+  if (parent->song.linearPitch==2 && easyNoise && chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2>(easyThreshold<<7)) {
+    int ret=(0x440-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(easyThreshold<<7)))>>7;
+    if (ret<0) ret=0;
+    return ret;
+  }
+  return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,toneDivider);
+}
+
 void DivPlatformSMS::tick(bool sysTick) {
   for (int i=0; i<4; i++) {
-    double CHIP_DIVIDER=toneDivider;
-    if (i==3) CHIP_DIVIDER=noiseDivider;
     chan[i].std.next();
     if (chan[i].std.vol.had) {
       chan[i].outVol=VOL_SCALE_LOG_BROKEN(chan[i].std.vol.val,chan[i].vol,15);
@@ -137,7 +156,7 @@ void DivPlatformSMS::tick(bool sysTick) {
         // TODO: add compatibility flag. this is horrible.
         int areYouSerious=parent->calcArp(chan[i].note,chan[i].std.arp.val);
         while (areYouSerious>0x60) areYouSerious-=12;
-        chan[i].baseFreq=NOTE_PERIODIC(areYouSerious);
+        chan[i].baseFreq=NOTE_SN(i,areYouSerious);
         chan[i].actualNote=areYouSerious;
         chan[i].freqChanged=true;
       }
@@ -177,7 +196,7 @@ void DivPlatformSMS::tick(bool sysTick) {
   }
   for (int i=0; i<3; i++) {
     if (chan[i].freqChanged) {
-      chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true,0,chan[i].pitch2,chipClock,toneDivider);
+      chan[i].freq=snCalcFreq(i);
       if (chan[i].freq>1023) chan[i].freq=1023;
       if (parent->song.snNoLowPeriods) {
         if (chan[i].freq<8) chan[i].freq=1;
@@ -196,7 +215,8 @@ void DivPlatformSMS::tick(bool sysTick) {
     }
   }
   if (chan[3].freqChanged || updateSNMode) {
-    chan[3].freq=parent->calcFreq(chan[3].baseFreq,chan[3].pitch,true,0,chan[3].pitch2,chipClock,noiseDivider);
+    chan[3].freq=snCalcFreq(3);
+    //parent->calcFreq(chan[3].baseFreq,chan[3].pitch,true,0,chan[3].pitch2,chipClock,noiseDivider);
     if (chan[3].freq>1023) chan[3].freq=1023;
     if (parent->song.snNoLowPeriods) {
       if (chan[3].actualNote>0x5d) chan[3].freq=0x01;
@@ -244,12 +264,10 @@ void DivPlatformSMS::tick(bool sysTick) {
 }
 
 int DivPlatformSMS::dispatch(DivCommand c) {
-  double CHIP_DIVIDER=toneDivider;
-  if (c.chan==3) CHIP_DIVIDER=noiseDivider;
   switch (c.cmd) {
     case DIV_CMD_NOTE_ON:
       if (c.value!=DIV_NOTE_NULL) {
-        chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);
+        chan[c.chan].baseFreq=NOTE_SN(c.chan,c.value);
         chan[c.chan].freqChanged=true;
         chan[c.chan].note=c.value;
         chan[c.chan].actualNote=c.value;
@@ -300,7 +318,7 @@ int DivPlatformSMS::dispatch(DivCommand c) {
       chan[c.chan].freqChanged=true;
       break;
     case DIV_CMD_NOTE_PORTA: {
-      int destFreq=NOTE_PERIODIC(c.value2);
+      int destFreq=NOTE_SN(c.chan,c.value2);
       bool return2=false;
       if (destFreq>chan[c.chan].baseFreq) {
         chan[c.chan].baseFreq+=c.value;
@@ -340,7 +358,7 @@ int DivPlatformSMS::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_LEGATO:
-      chan[c.chan].baseFreq=NOTE_PERIODIC(c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val):(0)));
+      chan[c.chan].baseFreq=NOTE_SN(c.chan,c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val):(0)));
       chan[c.chan].freqChanged=true;
       chan[c.chan].note=c.value;
       chan[c.chan].actualNote=c.value;
@@ -349,7 +367,7 @@ int DivPlatformSMS::dispatch(DivCommand c) {
       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 (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will) chan[c.chan].baseFreq=NOTE_PERIODIC(chan[c.chan].note);
+      if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will) chan[c.chan].baseFreq=NOTE_SN(c.chan,chan[c.chan].note);
       chan[c.chan].inPorta=c.value;
       break;
     case DIV_CMD_GET_VOLMAX:
@@ -446,24 +464,31 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
   switch (flags.getInt("clockSel",0)) {
     case 1:
       chipClock=COLOR_PAL*4.0/5.0;
+      easyThreshold=92;
       break;
     case 2:
       chipClock=4000000;
+      easyThreshold=95;
       break;
     case 3:
       chipClock=COLOR_NTSC/2.0;
+      easyThreshold=80;
       break;
     case 4:
       chipClock=3000000;
+      easyThreshold=89;
       break;
     case 5:
       chipClock=2000000;
+      easyThreshold=82;
       break;
     case 6:
       chipClock=COLOR_NTSC/8.0;
+      easyThreshold=57;
       break;
     default:
       chipClock=COLOR_NTSC;
+      easyThreshold=92;
       break;
   }
   resetPhase=!flags.getBool("noPhaseReset",false);
diff --git a/src/engine/platform/sms.h b/src/engine/platform/sms.h
index bc673f03d..32c181933 100644
--- a/src/engine/platform/sms.h
+++ b/src/engine/platform/sms.h
@@ -65,6 +65,7 @@ class DivPlatformSMS: public DivDispatch {
   int divider=16;
   double toneDivider=64.0;
   double noiseDivider=64.0;
+  int easyThreshold;
   bool updateSNMode;
   bool resetPhase;
   bool isRealSN;
@@ -83,7 +84,8 @@ class DivPlatformSMS: public DivDispatch {
   friend void putDispatchChip(void*,int);
   friend void putDispatchChan(void*,int,int);
 
-  double NOTE_SN(int note);
+  double NOTE_SN(int ch, int note);
+  int snCalcFreq(int ch);
 
   void acquire_nuked(short* bufL, short* bufR, size_t start, size_t len);
   void acquire_mame(short* bufL, short* bufR, size_t start, size_t len);
diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp
index 9ac674bc5..eb4f06544 100644
--- a/src/gui/sysConf.cpp
+++ b/src/gui/sysConf.cpp
@@ -76,6 +76,7 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
       int clockSel=flags.getInt("clockSel",0);
       int chipType=flags.getInt("chipType",0);
       bool noPhaseReset=flags.getBool("noPhaseReset",false);
+      bool noEasyNoise=flags.getBool("noEasyNoise",false);
 
       ImGui::Text("Clock rate:");
       if (ImGui::RadioButton("3.58MHz (NTSC)",clockSel==0)) {
@@ -152,11 +153,16 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
         altered=true;
       }
 
+      if (ImGui::Checkbox("Disable easy period to note mapping on upper octaves",&noEasyNoise)) {
+        altered=true;
+      }
+
       if (altered) {
         e->lockSave([&]() {
           flags.set("clockSel",clockSel);
           flags.set("chipType",chipType);
           flags.set("noPhaseReset",noPhaseReset);
+          flags.set("noEasyNoise",noEasyNoise);
         });
       }
       break;

From e8f5c9f5f9b8d61feafd013a6c8d475eb73ec7cb Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 03:58:19 -0500
Subject: [PATCH 62/86] GUI: prepare improvements in the sample editor

---
 src/gui/gui.cpp        |   1 +
 src/gui/gui.h          |   1 +
 src/gui/sampleEdit.cpp | 106 ++++++++++++++++++++++++-----------------
 3 files changed, 64 insertions(+), 44 deletions(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 159050f38..eb93d3d05 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -5845,6 +5845,7 @@ FurnaceGUI::FurnaceGUI():
   amplifyVol(100.0),
   sampleSelStart(-1),
   sampleSelEnd(-1),
+  sampleInfo(true),
   sampleDragActive(false),
   sampleDragMode(false),
   sampleDrag16(false),
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 9ed37fe35..80e9909f6 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1590,6 +1590,7 @@ class FurnaceGUI {
   int resampleStrat;
   float amplifyVol;
   int sampleSelStart, sampleSelEnd;
+  bool sampleInfo;
   bool sampleDragActive, sampleDragMode, sampleDrag16, sampleZoomAuto;
   void* sampleDragTarget;
   ImVec2 sampleDragStart;
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 8a6809c5d..d87191007 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -132,47 +132,18 @@ void FurnaceGUI::drawSampleEdit() {
         MARK_MODIFIED;
       }
 
-      if (ImGui::BeginTable("SampleProps",4,ImGuiTableFlags_SizingStretchSame)) {
-        ImGui::TableNextRow();
-        ImGui::TableNextColumn();
-        ImGui::Text("Type");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-        if (ImGui::BeginCombo("##SampleType",sampleType.c_str())) {
-          for (int i=0; i<DIV_SAMPLE_DEPTH_MAX; i++) {
-            if (sampleDepths[i]==NULL) continue;
-            if (ImGui::Selectable(sampleDepths[i])) {
-              sample->prepareUndo(true);
-              e->lockEngine([sample]() {
-                sample->render();
-              });
-              sample->depth=(DivSampleDepth)i;
-              e->renderSamplesP();
-              updateSampleTex=true;
-              MARK_MODIFIED;
-            }
-          }
-          ImGui::EndCombo();
-        }
+      ImGui::Separator();
 
+      if (ImGui::BeginTable("SampleProps",4,ImGuiTableFlags_SizingStretchSame|ImGuiTableFlags_BordersV|ImGuiTableFlags_BordersOuterH)) {
+        ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
         ImGui::TableNextColumn();
-        ImGui::Text("C-4 (Hz)");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-        if (ImGui::InputInt("##SampleCenter",&sample->centerRate,10,200)) { MARK_MODIFIED
-          if (sample->centerRate<100) sample->centerRate=100;
-          if (sample->centerRate>65535) sample->centerRate=65535;
+        if (ImGui::Button(sampleInfo?(ICON_FA_CHEVRON_UP "##SECollapse"):(ICON_FA_CHEVRON_DOWN "##SECollapse"))) {
+          sampleInfo=!sampleInfo;
         }
-
+        ImGui::SameLine();
+        ImGui::Text("Info");
         ImGui::TableNextColumn();
-        ImGui::Text("Compat Rate");
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
-        if (ImGui::InputInt("##SampleRate",&sample->rate,10,200)) { MARK_MODIFIED
-          if (sample->rate<100) sample->rate=100;
-          if (sample->rate>96000) sample->rate=96000;
-        }
-
+        ImGui::Text("Rate");
         ImGui::TableNextColumn();
         bool doLoop=(sample->isLoopable());
         if (ImGui::Checkbox("Loop",&doLoop)) { MARK_MODIFIED
@@ -193,11 +164,53 @@ void FurnaceGUI::drawSampleEdit() {
         if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
           ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
         }
-        if (doLoop || keepLoopAlive) {
-          keepLoopAlive=false;
+        ImGui::TableNextColumn();
+        ImGui::Text("Chips");
+        
+        if (sampleInfo) {
           ImGui::TableNextRow();
           ImGui::TableNextColumn();
-          ImGui::Text("Loop Mode");
+          ImGui::Text("Type");
+          ImGui::SameLine();
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          if (ImGui::BeginCombo("##SampleType",sampleType.c_str())) {
+            for (int i=0; i<DIV_SAMPLE_DEPTH_MAX; i++) {
+              if (sampleDepths[i]==NULL) continue;
+              if (ImGui::Selectable(sampleDepths[i])) {
+                sample->prepareUndo(true);
+                e->lockEngine([sample]() {
+                  sample->render();
+                });
+                sample->depth=(DivSampleDepth)i;
+                e->renderSamplesP();
+                updateSampleTex=true;
+                MARK_MODIFIED;
+              }
+            }
+            ImGui::EndCombo();
+          }
+
+          ImGui::TableNextColumn();
+          ImGui::Text("C-4 (Hz)");
+          ImGui::SameLine();
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          if (ImGui::InputInt("##SampleCenter",&sample->centerRate,10,200)) { MARK_MODIFIED
+            if (sample->centerRate<100) sample->centerRate=100;
+            if (sample->centerRate>65535) sample->centerRate=65535;
+          }
+
+          ImGui::Text("Compat");
+          ImGui::SameLine();
+          ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+          if (ImGui::InputInt("##SampleRate",&sample->rate,10,200)) { MARK_MODIFIED
+            if (sample->rate<100) sample->rate=100;
+            if (sample->rate>96000) sample->rate=96000;
+          }
+
+          ImGui::TableNextColumn();
+          ImGui::BeginDisabled(!(doLoop || keepLoopAlive));
+          keepLoopAlive=false;
+          ImGui::Text("Mode");
           ImGui::SameLine();
           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
           if (ImGui::BeginCombo("##SampleLoopMode",loopType.c_str())) {
@@ -213,8 +226,8 @@ void FurnaceGUI::drawSampleEdit() {
             }
             ImGui::EndCombo();
           }
-          ImGui::TableNextColumn();
-          ImGui::Text("Loop Start");
+
+          ImGui::Text("Start");
           ImGui::SameLine();
           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
           if (ImGui::InputInt("##LoopStartPosition",&sample->loopStart,1,16)) { MARK_MODIFIED
@@ -235,8 +248,8 @@ void FurnaceGUI::drawSampleEdit() {
           if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
             ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
           }
-          ImGui::TableNextColumn();
-          ImGui::Text("Loop End");
+
+          ImGui::Text("End");
           ImGui::SameLine();
           ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
           if (ImGui::InputInt("##LoopEndPosition",&sample->loopEnd,1,16)) { MARK_MODIFIED
@@ -257,7 +270,12 @@ void FurnaceGUI::drawSampleEdit() {
           if (ImGui::IsItemHovered() && sample->depth==DIV_SAMPLE_DEPTH_BRR) {
             ImGui::SetTooltip("changing the loop in a BRR sample may result in glitches!");
           }
+          ImGui::EndDisabled();
+
+          ImGui::TableNextColumn();
+          ImGui::Text("To-do...");
         }
+
         ImGui::EndTable();
       }
 

From d4f96617fc840b36e7a2aca0d89a7f2998a6d2a8 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 04:13:11 -0500
Subject: [PATCH 63/86] GUI: ready for sample chip sel grid?

---
 src/engine/sample.h    | 11 ++++++++++-
 src/gui/sampleEdit.cpp | 29 ++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/engine/sample.h b/src/engine/sample.h
index e0d2c5d7c..0e233843c 100644
--- a/src/engine/sample.h
+++ b/src/engine/sample.h
@@ -113,6 +113,8 @@ struct DivSample {
   // - 2: Pingpong loop
   DivSampleLoopMode loopMode;
 
+  bool renderOn[4][32];
+
   // these are the new data structures.
   signed char* data8; // 8
   short* data16; // 16
@@ -325,7 +327,14 @@ struct DivSample {
     lengthB(0),
     lengthBRR(0),
     lengthVOX(0),
-    samples(0) {}
+    samples(0) {
+    for (int i=0; i<32; i++) {
+      renderOn[0][i]=true;
+      renderOn[1][i]=true;
+      renderOn[2][i]=true;
+      renderOn[3][i]=true;
+    }
+  }
   ~DivSample();
 };
 
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index d87191007..44acb6971 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -273,7 +273,34 @@ void FurnaceGUI::drawSampleEdit() {
           ImGui::EndDisabled();
 
           ImGui::TableNextColumn();
-          ImGui::Text("To-do...");
+          
+          if (e->song.systemLen<1) {
+            ImGui::Text("NO CHIPS LESS GOOO");
+          } else {
+            if (ImGui::BeginTable("SEChipSel",e->song.systemLen+1,ImGuiTableFlags_SizingFixedSame|ImGuiTableFlags_ScrollX)) {
+              ImGui::TableNextRow();
+              ImGui::TableNextColumn();
+              for (int i=0; i<e->song.systemLen; i++) {
+                ImGui::TableNextColumn();
+                ImGui::Text("%d",i+1);
+              }
+              char id[1024];
+              for (int i=0; i<4; i++) {
+                ImGui::TableNextRow();
+                ImGui::TableNextColumn();
+                ImGui::Text("%c",'A'+i);
+                for (int j=0; j<e->song.systemLen; j++) {
+                  ImGui::TableNextColumn();
+                  snprintf(id,1023,"##_SEC%d_%d",i,j);
+                  if (ImGui::Checkbox(id,&sample->renderOn[i][j])) {
+                    showError("wait! I have not implemented that yet!");
+                  }
+                }
+              }
+              ImGui::EndTable();
+            }
+          }
+          
         }
 
         ImGui::EndTable();

From 1c8440b68d2897c298c0cad8a251af168d1527ea Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 17:15:01 -0500
Subject: [PATCH 65/86] chip sample selection, part 1

---
 src/gui/sampleEdit.cpp | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 44acb6971..9f692c776 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -274,26 +274,53 @@ void FurnaceGUI::drawSampleEdit() {
 
           ImGui::TableNextColumn();
           
-          if (e->song.systemLen<1) {
+          bool isChipVisible[32];
+          bool isTypeVisible[4];
+          bool isMemVisible[4][32];
+          memset(isChipVisible,0,32*sizeof(bool));
+          memset(isTypeVisible,0,4*sizeof(bool));
+          memset(isMemVisible,0,32*4*sizeof(bool));
+          for (int i=0; i<e->song.systemLen; i++) {
+            DivDispatch* dispatch=e->getDispatch(i);
+            if (dispatch==NULL) continue;
+
+            for (int j=0; j<4; j++) {
+              if (dispatch->getSampleMemCapacity(j)==0) continue;
+              isChipVisible[i]=true;
+              isTypeVisible[j]=true;
+              isMemVisible[j][i]=true;
+            }
+          }
+          int selColumns=1;
+          for (int i=0; i<32; i++) {
+            if (isChipVisible[i]) selColumns++;
+          }
+          if (selColumns<=1) {
             ImGui::Text("NO CHIPS LESS GOOO");
           } else {
-            if (ImGui::BeginTable("SEChipSel",e->song.systemLen+1,ImGuiTableFlags_SizingFixedSame|ImGuiTableFlags_ScrollX)) {
+            if (ImGui::BeginTable("SEChipSel",selColumns,ImGuiTableFlags_SizingFixedSame|ImGuiTableFlags_ScrollX)) {
               ImGui::TableNextRow();
               ImGui::TableNextColumn();
               for (int i=0; i<e->song.systemLen; i++) {
+                if (!isChipVisible[i]) continue;
                 ImGui::TableNextColumn();
                 ImGui::Text("%d",i+1);
               }
               char id[1024];
               for (int i=0; i<4; i++) {
+                if (!isTypeVisible[i]) continue;
+
                 ImGui::TableNextRow();
                 ImGui::TableNextColumn();
                 ImGui::Text("%c",'A'+i);
                 for (int j=0; j<e->song.systemLen; j++) {
+                  if (!isChipVisible[j]) continue;
                   ImGui::TableNextColumn();
+
+                  if (!isMemVisible[i][j]) continue;
                   snprintf(id,1023,"##_SEC%d_%d",i,j);
                   if (ImGui::Checkbox(id,&sample->renderOn[i][j])) {
-                    showError("wait! I have not implemented that yet!");
+                    e->renderSamplesP();
                   }
                 }
               }

From 85cb64b2276076237c97b336e8344d4e7cbf8c0a Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 18:44:04 -0500
Subject: [PATCH 66/86] chip sample selection, part 2

add functions to retrieve whether a sample was loaded in chip memory
eventually I'll put warning feedback on the sample list
---
 src/engine/dispatch.h              | 15 +++++++++++++
 src/engine/platform/abstract.cpp   |  4 ++++
 src/engine/platform/msm6258.cpp    |  6 ++++++
 src/engine/platform/msm6258.h      |  2 ++
 src/engine/platform/msm6295.cpp    |  6 ++++++
 src/engine/platform/msm6295.h      |  2 ++
 src/engine/platform/nes.cpp        |  6 ++++++
 src/engine/platform/nes.h          |  2 ++
 src/engine/platform/opl.cpp        |  6 ++++++
 src/engine/platform/opl.h          |  2 ++
 src/engine/platform/qsound.cpp     |  6 ++++++
 src/engine/platform/qsound.h       |  2 ++
 src/engine/platform/rf5c68.cpp     |  6 ++++++
 src/engine/platform/rf5c68.h       |  2 ++
 src/engine/platform/snes.cpp       |  6 ++++++
 src/engine/platform/snes.h         |  2 ++
 src/engine/platform/su.cpp         |  6 ++++++
 src/engine/platform/su.h           |  2 ++
 src/engine/platform/x1_010.cpp     |  6 ++++++
 src/engine/platform/x1_010.h       |  2 ++
 src/engine/platform/ym2608.cpp     |  6 ++++++
 src/engine/platform/ym2608.h       |  2 ++
 src/engine/platform/ym2610shared.h | 11 ++++++++++
 src/engine/platform/ymz280b.cpp    |  6 ++++++
 src/engine/platform/ymz280b.h      |  2 ++
 src/gui/gui.h                      |  7 ++++++
 src/gui/guiConst.cpp               |  7 ++++++
 src/gui/sampleEdit.cpp             | 34 ++++++++++++++++++++++++++++++
 src/gui/settings.cpp               |  7 ++++++
 29 files changed, 173 insertions(+)

diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h
index 5607defc2..da52342fb 100644
--- a/src/engine/dispatch.h
+++ b/src/engine/dispatch.h
@@ -520,19 +520,34 @@ class DivDispatch {
 
     /**
      * Get sample memory buffer.
+     * @param index the memory index.
+     * @return a pointer to sample memory, or NULL.
      */
     virtual const void* getSampleMem(int index = 0);
 
     /**
      * Get sample memory capacity.
+     * @param index the memory index.
+     * @return memory capacity in bytes, or 0 if memory doesn't exist.
      */
     virtual size_t getSampleMemCapacity(int index = 0);
 
     /**
      * Get sample memory usage.
+     * @param index the memory index.
+     * @return memory usage in bytes.
      */
     virtual size_t getSampleMemUsage(int index = 0);
 
+    /**
+     * check whether sample has been loaded in memory.
+     * @param memory index.
+     * @param sample the sample in question.
+     * @return whether it did.
+     */
+    virtual bool isSampleLoaded(int index, int sample);
+    
+
     /**
      * Render samples into sample memory.
      */
diff --git a/src/engine/platform/abstract.cpp b/src/engine/platform/abstract.cpp
index 8b3239f05..9b5c377cf 100644
--- a/src/engine/platform/abstract.cpp
+++ b/src/engine/platform/abstract.cpp
@@ -156,6 +156,10 @@ size_t DivDispatch::getSampleMemUsage(int index) {
   return 0;
 }
 
+bool DivDispatch::isSampleLoaded(int index, int sample) {
+  return false;
+}
+
 void DivDispatch::renderSamples() {
   
 }
diff --git a/src/engine/platform/msm6258.cpp b/src/engine/platform/msm6258.cpp
index 17e88ae6d..a5e0192f8 100644
--- a/src/engine/platform/msm6258.cpp
+++ b/src/engine/platform/msm6258.cpp
@@ -362,6 +362,12 @@ size_t DivPlatformMSM6258::getSampleMemUsage(int index) {
   return index == 0 ? adpcmMemLen : 0;
 }
 
+bool DivPlatformMSM6258::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformMSM6258::renderSamples() {
   memset(adpcmMem,0,getSampleMemCapacity(0));
 
diff --git a/src/engine/platform/msm6258.h b/src/engine/platform/msm6258.h
index 02ec7e14b..d4d10cf02 100644
--- a/src/engine/platform/msm6258.h
+++ b/src/engine/platform/msm6258.h
@@ -81,6 +81,7 @@ class DivPlatformMSM6258: public DivDispatch {
 
     unsigned char* adpcmMem;
     size_t adpcmMemLen;
+    bool sampleLoaded[256];
     unsigned char sampleBank, msmPan, msmDivider, rateSel, msmClock, clockSel;
     signed char msmDividerCount, msmClockCount;
     short msmOut;
@@ -113,6 +114,7 @@ class DivPlatformMSM6258: public DivDispatch {
     const void* getSampleMem(int index);
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp
index d46a9bb61..3c590e1b4 100644
--- a/src/engine/platform/msm6295.cpp
+++ b/src/engine/platform/msm6295.cpp
@@ -335,6 +335,12 @@ size_t DivPlatformMSM6295::getSampleMemUsage(int index) {
   return index == 0 ? adpcmMemLen : 0;
 }
 
+bool DivPlatformMSM6295::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformMSM6295::renderSamples() {
   unsigned int sampleOffVOX[256];
 
diff --git a/src/engine/platform/msm6295.h b/src/engine/platform/msm6295.h
index 40d357572..c9aecbb25 100644
--- a/src/engine/platform/msm6295.h
+++ b/src/engine/platform/msm6295.h
@@ -68,6 +68,7 @@ class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
 
     unsigned char* adpcmMem;
     size_t adpcmMemLen;
+    bool sampleLoaded[256];
     unsigned char sampleBank;
 
     int delay, updateOsc;
@@ -101,6 +102,7 @@ class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
     virtual const void* getSampleMem(int index) override;
     virtual size_t getSampleMemCapacity(int index) override;
     virtual size_t getSampleMemUsage(int index) override;
+    virtual bool isSampleLoaded(int index, int sample) override;
     virtual void renderSamples() override;
 
     virtual int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) override;
diff --git a/src/engine/platform/nes.cpp b/src/engine/platform/nes.cpp
index 47d815733..4ed958f38 100644
--- a/src/engine/platform/nes.cpp
+++ b/src/engine/platform/nes.cpp
@@ -721,6 +721,12 @@ size_t DivPlatformNES::getSampleMemUsage(int index) {
   return index==0?dpcmMemLen:0;
 }
 
+bool DivPlatformNES::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformNES::renderSamples() {
   memset(dpcmMem,0,getSampleMemCapacity(0));
 
diff --git a/src/engine/platform/nes.h b/src/engine/platform/nes.h
index 16f52f20c..d3965a1e9 100644
--- a/src/engine/platform/nes.h
+++ b/src/engine/platform/nes.h
@@ -68,6 +68,7 @@ class DivPlatformNES: public DivDispatch {
   int dacSample;
   unsigned char* dpcmMem;
   size_t dpcmMemLen;
+  bool sampleLoaded[256];
   unsigned char dpcmBank;
   unsigned char sampleBank;
   unsigned char writeOscBuf;
@@ -115,6 +116,7 @@ class DivPlatformNES: public DivDispatch {
     const void* getSampleMem(int index);
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/opl.cpp b/src/engine/platform/opl.cpp
index e7152bca2..b44466576 100644
--- a/src/engine/platform/opl.cpp
+++ b/src/engine/platform/opl.cpp
@@ -1757,6 +1757,12 @@ size_t DivPlatformOPL::getSampleMemUsage(int index) {
   return (index==0 && adpcmChan>=0) ? adpcmBMemLen : 0;
 }
 
+bool DivPlatformOPL::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformOPL::renderSamples() {
   if (adpcmChan<0) return;
   memset(adpcmBMem,0,getSampleMemCapacity(0));
diff --git a/src/engine/platform/opl.h b/src/engine/platform/opl.h
index 8fe8cb25a..3eb1da77d 100644
--- a/src/engine/platform/opl.h
+++ b/src/engine/platform/opl.h
@@ -91,6 +91,7 @@ class DivPlatformOPL: public DivDispatch {
     size_t adpcmBMemLen;
     DivOPLAInterface iface;
     unsigned int sampleOffB[256];
+    bool sampleLoaded[256];
   
     ymfm::adpcm_b_engine* adpcmB;
     const unsigned char** slotsNonDrums;
@@ -152,6 +153,7 @@ class DivPlatformOPL: public DivDispatch {
     const void* getSampleMem(int index);
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/qsound.cpp b/src/engine/platform/qsound.cpp
index 315255283..97cf3f391 100644
--- a/src/engine/platform/qsound.cpp
+++ b/src/engine/platform/qsound.cpp
@@ -644,6 +644,12 @@ size_t DivPlatformQSound::getSampleMemUsage(int index) {
   return index == 0 ? sampleMemLen : 0;
 }
 
+bool DivPlatformQSound::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 // TODO: ADPCM... come on...
 void DivPlatformQSound::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
diff --git a/src/engine/platform/qsound.h b/src/engine/platform/qsound.h
index 894886270..d092d4d99 100644
--- a/src/engine/platform/qsound.h
+++ b/src/engine/platform/qsound.h
@@ -69,6 +69,7 @@ class DivPlatformQSound: public DivDispatch {
 
   unsigned char* sampleMem;
   size_t sampleMemLen;
+  bool sampleLoaded[256];
   struct qsound_chip chip;
   unsigned short regPool[512];
 
@@ -103,6 +104,7 @@ class DivPlatformQSound: public DivDispatch {
     const void* getSampleMem(int index = 0);
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/rf5c68.cpp b/src/engine/platform/rf5c68.cpp
index d07868962..eec62f5b3 100644
--- a/src/engine/platform/rf5c68.cpp
+++ b/src/engine/platform/rf5c68.cpp
@@ -385,6 +385,12 @@ size_t DivPlatformRF5C68::getSampleMemUsage(int index) {
   return index == 0 ? sampleMemLen : 0;
 }
 
+bool DivPlatformRF5C68::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformRF5C68::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOffRFC,0,256*sizeof(unsigned int));
diff --git a/src/engine/platform/rf5c68.h b/src/engine/platform/rf5c68.h
index 4c64c2d6c..84cb68672 100644
--- a/src/engine/platform/rf5c68.h
+++ b/src/engine/platform/rf5c68.h
@@ -67,6 +67,7 @@ class DivPlatformRF5C68: public DivDispatch {
   int chipType;
   unsigned char curChan;
   unsigned int sampleOffRFC[256];
+  bool sampleLoaded[256];
 
   unsigned char* sampleMem;
   size_t sampleMemLen;
@@ -99,6 +100,7 @@ class DivPlatformRF5C68: public DivDispatch {
     const void* getSampleMem(int index = 0);
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/snes.cpp b/src/engine/platform/snes.cpp
index f7790e424..8ab24dda7 100644
--- a/src/engine/platform/snes.cpp
+++ b/src/engine/platform/snes.cpp
@@ -797,6 +797,12 @@ size_t DivPlatformSNES::getSampleMemUsage(int index) {
   return index == 0 ? sampleMemLen : 0;
 }
 
+bool DivPlatformSNES::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformSNES::renderSamples() {
   memset(copyOfSampleMem,0,getSampleMemCapacity());
   memset(sampleOff,0,256*sizeof(unsigned int));
diff --git a/src/engine/platform/snes.h b/src/engine/platform/snes.h
index a21db150c..ad3b0ab2e 100644
--- a/src/engine/platform/snes.h
+++ b/src/engine/platform/snes.h
@@ -109,6 +109,7 @@ class DivPlatformSNES: public DivDispatch {
   signed char copyOfSampleMem[65536];
   size_t sampleMemLen;
   unsigned int sampleOff[256];
+  bool sampleLoaded[256];
   unsigned char regPool[0x80];
   SPC_DSP dsp;
   friend void putDispatchChan(void*,int,int);
@@ -136,6 +137,7 @@ class DivPlatformSNES: public DivDispatch {
     const void* getSampleMem(int index = 0);
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/su.cpp b/src/engine/platform/su.cpp
index c00847fc7..6833eac1d 100644
--- a/src/engine/platform/su.cpp
+++ b/src/engine/platform/su.cpp
@@ -547,6 +547,12 @@ size_t DivPlatformSoundUnit::getSampleMemUsage(int index) {
   return (index==0)?sampleMemLen:0;
 }
 
+bool DivPlatformSoundUnit::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformSoundUnit::renderSamples() {
   memset(su->pcm,0,getSampleMemCapacity(0));
   memset(sampleOffSU,0,256*sizeof(unsigned int));
diff --git a/src/engine/platform/su.h b/src/engine/platform/su.h
index 004c04c5c..e7eff8d44 100644
--- a/src/engine/platform/su.h
+++ b/src/engine/platform/su.h
@@ -102,6 +102,7 @@ class DivPlatformSoundUnit: public DivDispatch {
   unsigned char initIlCtrl, initIlSize, initFil1;
   signed char echoVol, initEchoVol;
   unsigned int sampleOffSU[256];
+  bool sampleLoaded[256];
 
   int cycles, curChan, delay;
   short tempL;
@@ -138,6 +139,7 @@ class DivPlatformSoundUnit: public DivDispatch {
     const void* getSampleMem(int index);
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/x1_010.cpp b/src/engine/platform/x1_010.cpp
index 6f220242c..f017d6c35 100644
--- a/src/engine/platform/x1_010.cpp
+++ b/src/engine/platform/x1_010.cpp
@@ -949,6 +949,12 @@ size_t DivPlatformX1_010::getSampleMemUsage(int index) {
   return index >= 0 ? sampleMemLen : 0;
 }
 
+bool DivPlatformX1_010::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformX1_010::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOffX1,0,256*sizeof(unsigned int));
diff --git a/src/engine/platform/x1_010.h b/src/engine/platform/x1_010.h
index ff5557bb5..e54a3e896 100644
--- a/src/engine/platform/x1_010.h
+++ b/src/engine/platform/x1_010.h
@@ -116,6 +116,7 @@ class DivPlatformX1_010: public DivDispatch, public vgsound_emu_mem_intf {
   bool isBanked=false;
   unsigned int bankSlot[8];
   unsigned int sampleOffX1[256];
+  bool sampleLoaded[256];
 
   unsigned char regPool[0x2000];
   double NoteX1_010(int ch, int note);
@@ -146,6 +147,7 @@ class DivPlatformX1_010: public DivDispatch, public vgsound_emu_mem_intf {
     const void* getSampleMem(int index = 0);
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     const char** getRegisterSheet();
     void setBanked(bool banked);
diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp
index a58bad8d6..2995c6dad 100644
--- a/src/engine/platform/ym2608.cpp
+++ b/src/engine/platform/ym2608.cpp
@@ -1336,6 +1336,12 @@ size_t DivPlatformYM2608::getSampleMemUsage(int index) {
   return index == 0 ? adpcmBMemLen : 0;
 }
 
+bool DivPlatformYM2608::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformYM2608::renderSamples() {
   memset(adpcmBMem,0,getSampleMemCapacity(0));
   memset(sampleOffB,0,256*sizeof(unsigned int));
diff --git a/src/engine/platform/ym2608.h b/src/engine/platform/ym2608.h
index f4c101c20..81a6844d4 100644
--- a/src/engine/platform/ym2608.h
+++ b/src/engine/platform/ym2608.h
@@ -100,6 +100,7 @@ class DivPlatformYM2608: public DivPlatformOPN {
     size_t adpcmBMemLen;
     DivYM2608Interface iface;
     unsigned int sampleOffB[256];
+    bool sampleLoaded[256];
   
     DivPlatformAY8910* ay;
     unsigned char sampleBank;
@@ -137,6 +138,7 @@ class DivPlatformYM2608: public DivPlatformOPN {
     const void* getSampleMem(int index);
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     void setFlags(const DivConfig& flags);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
diff --git a/src/engine/platform/ym2610shared.h b/src/engine/platform/ym2610shared.h
index 4b69920c9..6dd3bbbac 100644
--- a/src/engine/platform/ym2610shared.h
+++ b/src/engine/platform/ym2610shared.h
@@ -142,6 +142,8 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
     unsigned char sampleBank;
   
     bool extMode, noExtMacros;
+
+    bool sampleLoaded[2][256];
   
     unsigned char writeADPCMAOff, writeADPCMAOn;
     int globalADPCMAVolume;
@@ -208,10 +210,17 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
       return index == 0 ? adpcmAMemLen : index == 1 ? adpcmBMemLen : 0;
     }
 
+    bool isSampleLoaded(int index, int sample) {
+      if (index<0 || index>1) return false;
+      if (sample<0 || sample>255) return false;
+      return sampleLoaded[index][sample];
+    }
+
     void renderSamples() {
       memset(adpcmAMem,0,getSampleMemCapacity(0));
       memset(sampleOffA,0,256*sizeof(unsigned int));
       memset(sampleOffB,0,256*sizeof(unsigned int));
+      memset(sampleLoaded,0,256*2*sizeof(bool));
 
       size_t memPos=0;
       for (int i=0; i<parent->song.sampleLen; i++) {
@@ -231,6 +240,7 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
           memcpy(adpcmAMem+memPos,s->dataA,paddedLen);
         }
         sampleOffA[i]=memPos;
+        sampleLoaded[0][i]=true;
         memPos+=paddedLen;
       }
       adpcmAMemLen=memPos+256;
@@ -255,6 +265,7 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
           memcpy(adpcmBMem+memPos,s->dataB,paddedLen);
         }
         sampleOffB[i]=memPos;
+        sampleLoaded[1][i]=true;
         memPos+=paddedLen;
       }
       adpcmBMemLen=memPos+256;
diff --git a/src/engine/platform/ymz280b.cpp b/src/engine/platform/ymz280b.cpp
index 5ad8a0ed5..91d63e3b5 100644
--- a/src/engine/platform/ymz280b.cpp
+++ b/src/engine/platform/ymz280b.cpp
@@ -420,6 +420,12 @@ size_t DivPlatformYMZ280B::getSampleMemUsage(int index) {
   return index == 0 ? sampleMemLen : 0;
 }
 
+bool DivPlatformYMZ280B::isSampleLoaded(int index, int sample) {
+  if (index!=0) return false;
+  if (sample<0 || sample>255) return false;
+  return sampleLoaded[sample];
+}
+
 void DivPlatformYMZ280B::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOff,0,256*sizeof(unsigned int));
diff --git a/src/engine/platform/ymz280b.h b/src/engine/platform/ymz280b.h
index 3b4b60d5c..7e8ceb674 100644
--- a/src/engine/platform/ymz280b.h
+++ b/src/engine/platform/ymz280b.h
@@ -67,6 +67,7 @@ class DivPlatformYMZ280B: public DivDispatch {
   bool isMuted[8];
   int chipType;
   unsigned int sampleOff[256];
+  bool sampleLoaded[256];
 
   unsigned char* sampleMem;
   size_t sampleMemLen;
@@ -99,6 +100,7 @@ class DivPlatformYMZ280B: public DivDispatch {
     const void* getSampleMem(int index = 0);
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
+    bool isSampleLoaded(int index, int sample);
     void renderSamples();
     void setFlags(const DivConfig& flags);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 80e9909f6..a371789f7 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -227,6 +227,13 @@ enum FurnaceGUIColors {
   GUI_COLOR_SAMPLE_SEL,
   GUI_COLOR_SAMPLE_SEL_POINT,
   GUI_COLOR_SAMPLE_NEEDLE,
+  GUI_COLOR_SAMPLE_NEEDLE_PLAYING,
+  GUI_COLOR_SAMPLE_LOOP_POINT,
+  GUI_COLOR_SAMPLE_TIME_BG,
+  GUI_COLOR_SAMPLE_TIME_FG,
+  GUI_COLOR_SAMPLE_CHIP_DISABLED,
+  GUI_COLOR_SAMPLE_CHIP_ENABLED,
+  GUI_COLOR_SAMPLE_CHIP_WARNING,
 
   GUI_COLOR_PAT_MANAGER_NULL,
   GUI_COLOR_PAT_MANAGER_USED,
diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp
index b542b3f71..07716653b 100644
--- a/src/gui/guiConst.cpp
+++ b/src/gui/guiConst.cpp
@@ -860,6 +860,13 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
   D(GUI_COLOR_SAMPLE_SEL,"",ImVec4(0.26f,0.59f,0.98f,0.25f)),
   D(GUI_COLOR_SAMPLE_SEL_POINT,"",ImVec4(0.06f,0.53f,0.98f,0.5f)),
   D(GUI_COLOR_SAMPLE_NEEDLE,"",ImVec4(1.0f,0.8f,0.0f,1.0f)),
+  D(GUI_COLOR_SAMPLE_NEEDLE_PLAYING,"",ImVec4(0.2f,1.0f,0.0f,1.0f)),
+  D(GUI_COLOR_SAMPLE_LOOP_POINT,"",ImVec4(1.0f,0.0f,0.0f,1.0f)),
+  D(GUI_COLOR_SAMPLE_TIME_BG,"",ImVec4(0.1f,0.11f,0.12f,1.0f)),
+  D(GUI_COLOR_SAMPLE_TIME_FG,"",ImVec4(0.4f,0.4f,0.4f,1.0f)),
+  D(GUI_COLOR_SAMPLE_CHIP_DISABLED,"",ImVec4(0.6f,0.6f,0.6f,1.0f)),
+  D(GUI_COLOR_SAMPLE_CHIP_ENABLED,"",ImVec4(0.3f,1.0f,0.3f,1.0f)),
+  D(GUI_COLOR_SAMPLE_CHIP_WARNING,"",ImVec4(1.0f,0.75f,0.3f,1.0f)),
 
   D(GUI_COLOR_PAT_MANAGER_NULL,"",ImVec4(0.15f,0.15f,0.15f,1.0f)),
   D(GUI_COLOR_PAT_MANAGER_USED,"",ImVec4(0.15f,1.0f,0.15f,1.0f)),
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 9f692c776..676481f6e 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -277,6 +277,7 @@ void FurnaceGUI::drawSampleEdit() {
           bool isChipVisible[32];
           bool isTypeVisible[4];
           bool isMemVisible[4][32];
+          bool isMemWarning[4][32];
           memset(isChipVisible,0,32*sizeof(bool));
           memset(isTypeVisible,0,4*sizeof(bool));
           memset(isMemVisible,0,32*4*sizeof(bool));
@@ -289,6 +290,7 @@ void FurnaceGUI::drawSampleEdit() {
               isChipVisible[i]=true;
               isTypeVisible[j]=true;
               isMemVisible[j][i]=true;
+              if (!dispatch->isSampleLoaded(j,curSample)) isMemWarning[j][i]=true;
             }
           }
           int selColumns=1;
@@ -319,9 +321,41 @@ void FurnaceGUI::drawSampleEdit() {
 
                   if (!isMemVisible[i][j]) continue;
                   snprintf(id,1023,"##_SEC%d_%d",i,j);
+
+                  ImVec4 baseColor=sample->renderOn[i][j]?(isMemWarning[i][j]?uiColors[GUI_COLOR_SAMPLE_CHIP_WARNING]:uiColors[GUI_COLOR_SAMPLE_CHIP_ENABLED]):uiColors[GUI_COLOR_SAMPLE_CHIP_DISABLED];
+                  ImVec4 color=baseColor;
+                  ImVec4 colorHovered=baseColor;
+                  ImVec4 colorActive=baseColor;
+
+                  if (settings.guiColorsBase) {
+                    color.x*=0.8f;
+                    color.y*=0.8f;
+                    color.z*=0.8f;
+                    colorHovered.x*=0.65f;
+                    colorHovered.y*=0.65f;
+                    colorHovered.z*=0.65f;
+                    colorActive.x*=0.3f;
+                    colorActive.y*=0.3f;
+                    colorActive.z*=0.3f;
+                  } else {
+                    color.x*=0.2f;
+                    color.y*=0.2f;
+                    color.z*=0.2f;
+                    colorHovered.x*=0.4f;
+                    colorHovered.y*=0.4f;
+                    colorHovered.z*=0.4f;
+                  }
+
+                  ImGui::PushStyleColor(ImGuiCol_FrameBg,color);
+                  ImGui::PushStyleColor(ImGuiCol_FrameBgHovered,colorHovered);
+                  ImGui::PushStyleColor(ImGuiCol_FrameBgActive,colorActive);
+                  ImGui::PushStyleColor(ImGuiCol_CheckMark,baseColor);
+
                   if (ImGui::Checkbox(id,&sample->renderOn[i][j])) {
                     e->renderSamplesP();
                   }
+
+                  ImGui::PopStyleColor(4);
                 }
               }
               ImGui::EndTable();
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 1fae27922..90ce5bfff 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -1843,12 +1843,19 @@ void FurnaceGUI::drawSettings() {
             if (ImGui::TreeNode("Sample Editor")) {
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_BG,"Background");
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_FG,"Waveform");
+              UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_TIME_BG,"Time background");
+              UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_TIME_FG,"Time text");
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_LOOP,"Loop region");
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_CENTER,"Center guide");
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_GRID,"Grid");
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_SEL,"Selection");
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_SEL_POINT,"Selection points");
               UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_NEEDLE,"Preview needle");
+              UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_NEEDLE_PLAYING,"Playing needles");
+              UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_LOOP_POINT,"Loop markers");
+              UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_CHIP_DISABLED,"Chip select: disabled");
+              UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_CHIP_ENABLED,"Chip select: enabled");
+              UI_COLOR_CONFIG(GUI_COLOR_SAMPLE_CHIP_WARNING,"Chip select: enabled (failure)");
               ImGui::TreePop();
             }
             if (ImGui::TreeNode("Pattern Manager")) {

From 8af6acb55d205d6e81ee0bf4f035c29eaca776ef Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 18:49:47 -0500
Subject: [PATCH 67/86] load .opm as OPM instruments

---
 src/engine/fileOpsIns.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/engine/fileOpsIns.cpp b/src/engine/fileOpsIns.cpp
index 4920308b5..b83a6b48c 100644
--- a/src/engine/fileOpsIns.cpp
+++ b/src/engine/fileOpsIns.cpp
@@ -1341,7 +1341,7 @@ void DivEngine::loadOPM(SafeReader& reader, std::vector<DivInstrument*>& ret, St
       // At this point we know any other line would be associated with patch params
       if (newPatch == NULL) {
         newPatch = new DivInstrument;
-        newPatch->type = DIV_INS_FM;
+        newPatch->type = DIV_INS_OPM;
         newPatch->fm.ops = 4;
       }
 

From 3ba87562ea2d94e53d71a0414a7af057124670fe Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 21:06:31 -0500
Subject: [PATCH 68/86] load .dmp Arcade inses as OPM

---
 src/engine/fileOpsIns.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/engine/fileOpsIns.cpp b/src/engine/fileOpsIns.cpp
index b83a6b48c..42723c0d4 100644
--- a/src/engine/fileOpsIns.cpp
+++ b/src/engine/fileOpsIns.cpp
@@ -147,7 +147,7 @@ void DivEngine::loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, St
           logD("instrument type is C64");
           break;
         case 8: // Arcade
-          ins->type=DIV_INS_FM;
+          ins->type=DIV_INS_OPM;
           logD("instrument type is Arcade");
           break;
         case 9: // Neo Geo

From 3a9349d49a86e7e27aa833a3e666b6f1b17d686b Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 22:11:49 -0500
Subject: [PATCH 69/86] chip sample selection, part 3

---
 src/engine/dispatch.h              |  7 +++++++
 src/engine/platform/abstract.cpp   |  5 +++++
 src/engine/platform/msm6258.cpp    |  2 ++
 src/engine/platform/msm6295.cpp    |  2 ++
 src/engine/platform/nes.cpp        |  4 +++-
 src/engine/platform/opl.cpp        |  2 ++
 src/engine/platform/qsound.cpp     |  2 ++
 src/engine/platform/rf5c68.cpp     |  2 ++
 src/engine/platform/snes.cpp       |  2 ++
 src/engine/platform/su.cpp         |  2 ++
 src/engine/platform/x1_010.cpp     |  2 ++
 src/engine/platform/ym2608.cpp     |  2 ++
 src/engine/platform/ym2610shared.h |  8 ++++++--
 src/engine/platform/ymz280b.cpp    |  2 ++
 src/gui/sampleEdit.cpp             | 31 +++++++++++++++++++++++++++++-
 15 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h
index da52342fb..83c3f7ba5 100644
--- a/src/engine/dispatch.h
+++ b/src/engine/dispatch.h
@@ -532,6 +532,13 @@ class DivDispatch {
      */
     virtual size_t getSampleMemCapacity(int index = 0);
 
+    /**
+     * get sample memory name.
+     * @param index the memory index.
+     * @return a name, or NULL if it doesn't have any name in particular.
+     */
+    virtual const char* getSampleMemName(int index=0);
+
     /**
      * Get sample memory usage.
      * @param index the memory index.
diff --git a/src/engine/platform/abstract.cpp b/src/engine/platform/abstract.cpp
index 9b5c377cf..cc7663b8f 100644
--- a/src/engine/platform/abstract.cpp
+++ b/src/engine/platform/abstract.cpp
@@ -152,11 +152,16 @@ size_t DivDispatch::getSampleMemCapacity(int index) {
   return 0;
 }
 
+const char* DivDispatch::getSampleMemName(int index) {
+  return NULL;
+}
+
 size_t DivDispatch::getSampleMemUsage(int index) {
   return 0;
 }
 
 bool DivDispatch::isSampleLoaded(int index, int sample) {
+  printf("you are calling.\n");
   return false;
 }
 
diff --git a/src/engine/platform/msm6258.cpp b/src/engine/platform/msm6258.cpp
index a5e0192f8..0a84a2d09 100644
--- a/src/engine/platform/msm6258.cpp
+++ b/src/engine/platform/msm6258.cpp
@@ -370,6 +370,7 @@ bool DivPlatformMSM6258::isSampleLoaded(int index, int sample) {
 
 void DivPlatformMSM6258::renderSamples() {
   memset(adpcmMem,0,getSampleMemCapacity(0));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   // sample data
   size_t memPos=0;
@@ -387,6 +388,7 @@ void DivPlatformMSM6258::renderSamples() {
       logW("out of ADPCM memory for sample %d!",i);
     } else {
       memcpy(adpcmMem+memPos,s->dataVOX,paddedLen);
+      sampleLoaded[i]=true;
     }
     memPos+=paddedLen;
   }
diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp
index 3c590e1b4..67bf8dc5d 100644
--- a/src/engine/platform/msm6295.cpp
+++ b/src/engine/platform/msm6295.cpp
@@ -346,6 +346,7 @@ void DivPlatformMSM6295::renderSamples() {
 
   memset(adpcmMem,0,getSampleMemCapacity(0));
   memset(sampleOffVOX,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   // sample data
   size_t memPos=128*8;
@@ -363,6 +364,7 @@ void DivPlatformMSM6295::renderSamples() {
       logW("out of ADPCM memory for sample %d!",i);
     } else {
       memcpy(adpcmMem+memPos,s->dataVOX,paddedLen);
+      sampleLoaded[i]=true;
     }
     sampleOffVOX[i]=memPos;
     memPos+=paddedLen;
diff --git a/src/engine/platform/nes.cpp b/src/engine/platform/nes.cpp
index 4ed958f38..cafc16d8d 100644
--- a/src/engine/platform/nes.cpp
+++ b/src/engine/platform/nes.cpp
@@ -728,7 +728,8 @@ bool DivPlatformNES::isSampleLoaded(int index, int sample) {
 }
 
 void DivPlatformNES::renderSamples() {
-  memset(dpcmMem,0,getSampleMemCapacity(0));
+  memset(dpcmMem,0,getSampleMemCapacity(0));\
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -750,6 +751,7 @@ void DivPlatformNES::renderSamples() {
       logW("out of DPCM memory for sample %d!",i);
     } else {
       memcpy(dpcmMem+memPos,s->dataDPCM,MIN(s->lengthDPCM,paddedLen));
+      sampleLoaded[i]=true;
     }
     sampleOffDPCM[i]=memPos;
     memPos+=paddedLen;
diff --git a/src/engine/platform/opl.cpp b/src/engine/platform/opl.cpp
index b44466576..01cadfa74 100644
--- a/src/engine/platform/opl.cpp
+++ b/src/engine/platform/opl.cpp
@@ -1767,6 +1767,7 @@ void DivPlatformOPL::renderSamples() {
   if (adpcmChan<0) return;
   memset(adpcmBMem,0,getSampleMemCapacity(0));
   memset(sampleOffB,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -1784,6 +1785,7 @@ void DivPlatformOPL::renderSamples() {
       logW("out of ADPCM memory for sample %d!",i);
     } else {
       memcpy(adpcmBMem+memPos,s->dataB,paddedLen);
+      sampleLoaded[i]=true;
     }
     sampleOffB[i]=memPos;
     memPos+=paddedLen;
diff --git a/src/engine/platform/qsound.cpp b/src/engine/platform/qsound.cpp
index 97cf3f391..afede6421 100644
--- a/src/engine/platform/qsound.cpp
+++ b/src/engine/platform/qsound.cpp
@@ -653,6 +653,7 @@ bool DivPlatformQSound::isSampleLoaded(int index, int sample) {
 // TODO: ADPCM... come on...
 void DivPlatformQSound::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -677,6 +678,7 @@ void DivPlatformQSound::renderSamples() {
       for (int i=0; i<length; i++) {
         sampleMem[(memPos+i)^0x8000]=s->data8[i];
       }
+      sampleLoaded[i]=true;
     }
     offPCM[i]=memPos^0x8000;
     memPos+=length+16;
diff --git a/src/engine/platform/rf5c68.cpp b/src/engine/platform/rf5c68.cpp
index eec62f5b3..cde6127de 100644
--- a/src/engine/platform/rf5c68.cpp
+++ b/src/engine/platform/rf5c68.cpp
@@ -394,6 +394,7 @@ bool DivPlatformRF5C68::isSampleLoaded(int index, int sample) {
 void DivPlatformRF5C68::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOffRFC,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -418,6 +419,7 @@ void DivPlatformRF5C68::renderSamples() {
     }
     // align memPos to 256-byte boundary
     memPos=(memPos+0xff)&~0xff;
+    sampleLoaded[i]=true;
   }
   sampleMemLen=memPos;
 }
diff --git a/src/engine/platform/snes.cpp b/src/engine/platform/snes.cpp
index 8ab24dda7..cc37dfc54 100644
--- a/src/engine/platform/snes.cpp
+++ b/src/engine/platform/snes.cpp
@@ -806,6 +806,7 @@ bool DivPlatformSNES::isSampleLoaded(int index, int sample) {
 void DivPlatformSNES::renderSamples() {
   memset(copyOfSampleMem,0,getSampleMemCapacity());
   memset(sampleOff,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   // skip past sample table and wavetable buffer
   size_t memPos=sampleTableBase+8*4+8*9*16;
@@ -828,6 +829,7 @@ void DivPlatformSNES::renderSamples() {
       logW("out of BRR memory for sample %d!",i);
       break;
     }
+    sampleLoaded[i]=true;
   }
   sampleMemLen=memPos;
   memcpy(sampleMem,copyOfSampleMem,65536);
diff --git a/src/engine/platform/su.cpp b/src/engine/platform/su.cpp
index 6833eac1d..c1330cd2d 100644
--- a/src/engine/platform/su.cpp
+++ b/src/engine/platform/su.cpp
@@ -556,6 +556,7 @@ bool DivPlatformSoundUnit::isSampleLoaded(int index, int sample) {
 void DivPlatformSoundUnit::renderSamples() {
   memset(su->pcm,0,getSampleMemCapacity(0));
   memset(sampleOffSU,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -571,6 +572,7 @@ void DivPlatformSoundUnit::renderSamples() {
       logW("out of PCM memory for sample %d!",i);
     } else {
       memcpy(su->pcm+memPos,s->data8,paddedLen);
+      sampleLoaded[i]=true;
     }
     sampleOffSU[i]=memPos;
     memPos+=paddedLen;
diff --git a/src/engine/platform/x1_010.cpp b/src/engine/platform/x1_010.cpp
index f017d6c35..ea4177a96 100644
--- a/src/engine/platform/x1_010.cpp
+++ b/src/engine/platform/x1_010.cpp
@@ -958,6 +958,7 @@ bool DivPlatformX1_010::isSampleLoaded(int index, int sample) {
 void DivPlatformX1_010::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOffX1,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -981,6 +982,7 @@ void DivPlatformX1_010::renderSamples() {
       logW("out of X1-010 memory for sample %d!",i);
     } else {
       memcpy(sampleMem+memPos,s->data8,paddedLen);
+      sampleLoaded[i]=true;
     }
     sampleOffX1[i]=memPos;
     memPos+=paddedLen;
diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp
index 2995c6dad..09eb8ac32 100644
--- a/src/engine/platform/ym2608.cpp
+++ b/src/engine/platform/ym2608.cpp
@@ -1345,6 +1345,7 @@ bool DivPlatformYM2608::isSampleLoaded(int index, int sample) {
 void DivPlatformYM2608::renderSamples() {
   memset(adpcmBMem,0,getSampleMemCapacity(0));
   memset(sampleOffB,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -1362,6 +1363,7 @@ void DivPlatformYM2608::renderSamples() {
       logW("out of ADPCM memory for sample %d!",i);
     } else {
       memcpy(adpcmBMem+memPos,s->dataB,paddedLen);
+      sampleLoaded[i]=true;
     }
     sampleOffB[i]=memPos;
     memPos+=paddedLen;
diff --git a/src/engine/platform/ym2610shared.h b/src/engine/platform/ym2610shared.h
index 6dd3bbbac..b9f939b4f 100644
--- a/src/engine/platform/ym2610shared.h
+++ b/src/engine/platform/ym2610shared.h
@@ -206,6 +206,10 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
       return index == 0 ? 16777216 : index == 1 ? 16777216 : 0;
     }
 
+    const char* getSampleMemName(int index=0) {
+      return index == 0 ? "ADPCM-A" : index == 1 ? "ADPCM-B" : NULL;
+    }
+
     size_t getSampleMemUsage(int index) {
       return index == 0 ? adpcmAMemLen : index == 1 ? adpcmBMemLen : 0;
     }
@@ -238,9 +242,9 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
           logW("out of ADPCM-A memory for sample %d!",i);
         } else {
           memcpy(adpcmAMem+memPos,s->dataA,paddedLen);
+          sampleLoaded[0][i]=true;
         }
         sampleOffA[i]=memPos;
-        sampleLoaded[0][i]=true;
         memPos+=paddedLen;
       }
       adpcmAMemLen=memPos+256;
@@ -263,9 +267,9 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
           logW("out of ADPCM-B memory for sample %d!",i);
         } else {
           memcpy(adpcmBMem+memPos,s->dataB,paddedLen);
+          sampleLoaded[1][i]=true;
         }
         sampleOffB[i]=memPos;
-        sampleLoaded[1][i]=true;
         memPos+=paddedLen;
       }
       adpcmBMemLen=memPos+256;
diff --git a/src/engine/platform/ymz280b.cpp b/src/engine/platform/ymz280b.cpp
index 91d63e3b5..c91512b57 100644
--- a/src/engine/platform/ymz280b.cpp
+++ b/src/engine/platform/ymz280b.cpp
@@ -429,6 +429,7 @@ bool DivPlatformYMZ280B::isSampleLoaded(int index, int sample) {
 void DivPlatformYMZ280B::renderSamples() {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOff,0,256*sizeof(unsigned int));
+  memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
@@ -455,6 +456,7 @@ void DivPlatformYMZ280B::renderSamples() {
       logW("out of YMZ280B PCM memory for sample %d!",i);
       break;
     }
+    sampleLoaded[i]=true;
   }
   sampleMemLen=memPos;
 }
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 676481f6e..99670c366 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -281,6 +281,7 @@ void FurnaceGUI::drawSampleEdit() {
           memset(isChipVisible,0,32*sizeof(bool));
           memset(isTypeVisible,0,4*sizeof(bool));
           memset(isMemVisible,0,32*4*sizeof(bool));
+          memset(isMemWarning,0,32*4*sizeof(bool));
           for (int i=0; i<e->song.systemLen; i++) {
             DivDispatch* dispatch=e->getDispatch(i);
             if (dispatch==NULL) continue;
@@ -300,7 +301,7 @@ void FurnaceGUI::drawSampleEdit() {
           if (selColumns<=1) {
             ImGui::Text("NO CHIPS LESS GOOO");
           } else {
-            if (ImGui::BeginTable("SEChipSel",selColumns,ImGuiTableFlags_SizingFixedSame|ImGuiTableFlags_ScrollX)) {
+            if (ImGui::BeginTable("SEChipSel",selColumns,ImGuiTableFlags_SizingFixedSame)) {
               ImGui::TableNextRow();
               ImGui::TableNextColumn();
               for (int i=0; i<e->song.systemLen; i++) {
@@ -356,6 +357,34 @@ void FurnaceGUI::drawSampleEdit() {
                   }
 
                   ImGui::PopStyleColor(4);
+
+                  if (ImGui::IsItemHovered()) {
+                    const char* memName=NULL;
+                    size_t capacity=0;
+                    size_t usage=0;
+                    int totalFree=0;
+                    DivDispatch* dispatch=e->getDispatch(j);
+                    if (dispatch!=NULL) {
+                      memName=dispatch->getSampleMemName(i);
+                      capacity=dispatch->getSampleMemCapacity(i);
+                      usage=dispatch->getSampleMemUsage(i);
+                      if (usage<capacity) {
+                        totalFree=capacity-usage;
+                      }
+                    }
+                    String toolText;
+                    if (memName==NULL) {
+                      toolText=fmt::sprintf("%s\n%d bytes free",e->getSystemName(e->song.system[j]),totalFree);
+                    } else {
+                      toolText=fmt::sprintf("%s (%s)\n%d bytes free",e->getSystemName(e->song.system[j]),memName,totalFree);
+                    }
+
+                    if (isMemWarning[i][j]) {
+                      toolText+="\n\nnot enough memory for this sample!";
+                    }
+
+                    ImGui::SetTooltip("%s",toolText.c_str());
+                  }
                 }
               }
               ImGui::EndTable();

From cf38680072fc18a6a216abf9e8fff495f6c34e17 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sat, 26 Nov 2022 23:50:20 -0500
Subject: [PATCH 70/86] chip sample selection, part 4

partially works
---
 src/engine/dispatch.h              |  3 ++-
 src/engine/engine.cpp              |  2 +-
 src/engine/platform/abstract.cpp   |  2 +-
 src/engine/platform/msm6258.cpp    |  4 +++-
 src/engine/platform/msm6258.h      |  2 +-
 src/engine/platform/msm6295.cpp    |  7 ++++++-
 src/engine/platform/msm6295.h      |  2 +-
 src/engine/platform/nes.cpp        |  7 ++++++-
 src/engine/platform/nes.h          |  2 +-
 src/engine/platform/opl.cpp        |  7 ++++++-
 src/engine/platform/opl.h          |  2 +-
 src/engine/platform/qsound.cpp     |  7 ++++++-
 src/engine/platform/qsound.h       |  2 +-
 src/engine/platform/rf5c68.cpp     |  7 ++++++-
 src/engine/platform/rf5c68.h       |  2 +-
 src/engine/platform/segapcm.cpp    |  2 +-
 src/engine/platform/segapcm.h      |  2 +-
 src/engine/platform/snes.cpp       |  7 ++++++-
 src/engine/platform/snes.h         |  2 +-
 src/engine/platform/su.cpp         | 11 ++++++++---
 src/engine/platform/su.h           |  4 ++--
 src/engine/platform/x1_010.cpp     |  7 ++++++-
 src/engine/platform/x1_010.h       |  2 +-
 src/engine/platform/ym2608.cpp     |  7 ++++++-
 src/engine/platform/ym2608.h       |  2 +-
 src/engine/platform/ym2610shared.h | 12 +++++++++++-
 src/engine/platform/ymz280b.cpp    |  7 ++++++-
 src/engine/platform/ymz280b.h      |  2 +-
 28 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h
index 83c3f7ba5..4ea92e107 100644
--- a/src/engine/dispatch.h
+++ b/src/engine/dispatch.h
@@ -557,8 +557,9 @@ class DivDispatch {
 
     /**
      * Render samples into sample memory.
+     * @param sysID the chip's index in the chip list.
      */
-    virtual void renderSamples();
+    virtual void renderSamples(int sysID);
 
     /**
      * initialize this DivDispatch.
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index d9e236016..da571eaa3 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -1315,7 +1315,7 @@ void DivEngine::renderSamples() {
   // step 2: render samples to dispatch
   for (int i=0; i<song.systemLen; i++) {
     if (disCont[i].dispatch!=NULL) {
-      disCont[i].dispatch->renderSamples();
+      disCont[i].dispatch->renderSamples(i);
     }
   }
 }
diff --git a/src/engine/platform/abstract.cpp b/src/engine/platform/abstract.cpp
index cc7663b8f..33dd3c172 100644
--- a/src/engine/platform/abstract.cpp
+++ b/src/engine/platform/abstract.cpp
@@ -165,7 +165,7 @@ bool DivDispatch::isSampleLoaded(int index, int sample) {
   return false;
 }
 
-void DivDispatch::renderSamples() {
+void DivDispatch::renderSamples(int sysID) {
   
 }
 
diff --git a/src/engine/platform/msm6258.cpp b/src/engine/platform/msm6258.cpp
index 0a84a2d09..7111c84cb 100644
--- a/src/engine/platform/msm6258.cpp
+++ b/src/engine/platform/msm6258.cpp
@@ -368,7 +368,7 @@ bool DivPlatformMSM6258::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformMSM6258::renderSamples() {
+void DivPlatformMSM6258::renderSamples(int sysID) {
   memset(adpcmMem,0,getSampleMemCapacity(0));
   memset(sampleLoaded,0,256*sizeof(bool));
 
@@ -378,6 +378,8 @@ void DivPlatformMSM6258::renderSamples() {
   if (sampleCount>128) sampleCount=128;
   for (int i=0; i<sampleCount; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) continue;
+
     int paddedLen=s->lengthVOX;
     if (memPos>=getSampleMemCapacity(0)) {
       logW("out of ADPCM memory for sample %d!",i);
diff --git a/src/engine/platform/msm6258.h b/src/engine/platform/msm6258.h
index d4d10cf02..9a5cd7d76 100644
--- a/src/engine/platform/msm6258.h
+++ b/src/engine/platform/msm6258.h
@@ -115,7 +115,7 @@ class DivPlatformMSM6258: public DivDispatch {
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp
index 67bf8dc5d..71b8d7cf7 100644
--- a/src/engine/platform/msm6295.cpp
+++ b/src/engine/platform/msm6295.cpp
@@ -341,7 +341,7 @@ bool DivPlatformMSM6295::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformMSM6295::renderSamples() {
+void DivPlatformMSM6295::renderSamples(int sysID) {
   unsigned int sampleOffVOX[256];
 
   memset(adpcmMem,0,getSampleMemCapacity(0));
@@ -354,6 +354,11 @@ void DivPlatformMSM6295::renderSamples() {
   if (sampleCount>128) sampleCount=128;
   for (int i=0; i<sampleCount; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOffVOX[i]=0;
+      continue;
+    }
+
     int paddedLen=s->lengthVOX;
     if (memPos>=getSampleMemCapacity(0)) {
       logW("out of ADPCM memory for sample %d!",i);
diff --git a/src/engine/platform/msm6295.h b/src/engine/platform/msm6295.h
index c9aecbb25..9d47824a6 100644
--- a/src/engine/platform/msm6295.h
+++ b/src/engine/platform/msm6295.h
@@ -103,7 +103,7 @@ class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
     virtual size_t getSampleMemCapacity(int index) override;
     virtual size_t getSampleMemUsage(int index) override;
     virtual bool isSampleLoaded(int index, int sample) override;
-    virtual void renderSamples() override;
+    virtual void renderSamples(int chipID) override;
 
     virtual int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) override;
     virtual void quit() override;
diff --git a/src/engine/platform/nes.cpp b/src/engine/platform/nes.cpp
index cafc16d8d..c971d4bf6 100644
--- a/src/engine/platform/nes.cpp
+++ b/src/engine/platform/nes.cpp
@@ -727,13 +727,18 @@ bool DivPlatformNES::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformNES::renderSamples() {
+void DivPlatformNES::renderSamples(int sysID) {
   memset(dpcmMem,0,getSampleMemCapacity(0));\
   memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOffDPCM[i]=0;
+      continue;
+    }
+
     unsigned int paddedLen=(s->lengthDPCM+63)&(~0x3f);
     logV("%d padded length: %d",i,paddedLen);
     if ((memPos&(~0x3fff))!=((memPos+paddedLen)&(~0x3fff))) {
diff --git a/src/engine/platform/nes.h b/src/engine/platform/nes.h
index d3965a1e9..4dbfcec37 100644
--- a/src/engine/platform/nes.h
+++ b/src/engine/platform/nes.h
@@ -117,7 +117,7 @@ class DivPlatformNES: public DivDispatch {
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
     ~DivPlatformNES();
diff --git a/src/engine/platform/opl.cpp b/src/engine/platform/opl.cpp
index 01cadfa74..5353fa6cd 100644
--- a/src/engine/platform/opl.cpp
+++ b/src/engine/platform/opl.cpp
@@ -1763,7 +1763,7 @@ bool DivPlatformOPL::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformOPL::renderSamples() {
+void DivPlatformOPL::renderSamples(int sysID) {
   if (adpcmChan<0) return;
   memset(adpcmBMem,0,getSampleMemCapacity(0));
   memset(sampleOffB,0,256*sizeof(unsigned int));
@@ -1772,6 +1772,11 @@ void DivPlatformOPL::renderSamples() {
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOffB[i]=0;
+      continue;
+    }
+
     int paddedLen=(s->lengthB+255)&(~0xff);
     if ((memPos&0xf00000)!=((memPos+paddedLen)&0xf00000)) {
       memPos=(memPos+0xfffff)&0xf00000;
diff --git a/src/engine/platform/opl.h b/src/engine/platform/opl.h
index 3eb1da77d..b8dee3945 100644
--- a/src/engine/platform/opl.h
+++ b/src/engine/platform/opl.h
@@ -154,7 +154,7 @@ class DivPlatformOPL: public DivDispatch {
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
     ~DivPlatformOPL();
diff --git a/src/engine/platform/qsound.cpp b/src/engine/platform/qsound.cpp
index afede6421..fce9f783c 100644
--- a/src/engine/platform/qsound.cpp
+++ b/src/engine/platform/qsound.cpp
@@ -651,13 +651,18 @@ bool DivPlatformQSound::isSampleLoaded(int index, int sample) {
 }
 
 // TODO: ADPCM... come on...
-void DivPlatformQSound::renderSamples() {
+void DivPlatformQSound::renderSamples(int sysID) {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleLoaded,0,256*sizeof(bool));
 
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      offPCM[i]=0;
+      continue;
+    }
+
     int length=s->length8;
     if (length>65536-16) {
       length=65536-16;
diff --git a/src/engine/platform/qsound.h b/src/engine/platform/qsound.h
index d092d4d99..1f911a832 100644
--- a/src/engine/platform/qsound.h
+++ b/src/engine/platform/qsound.h
@@ -105,7 +105,7 @@ class DivPlatformQSound: public DivDispatch {
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
 };
diff --git a/src/engine/platform/rf5c68.cpp b/src/engine/platform/rf5c68.cpp
index cde6127de..e33cfbf39 100644
--- a/src/engine/platform/rf5c68.cpp
+++ b/src/engine/platform/rf5c68.cpp
@@ -391,7 +391,7 @@ bool DivPlatformRF5C68::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformRF5C68::renderSamples() {
+void DivPlatformRF5C68::renderSamples(int sysID) {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOffRFC,0,256*sizeof(unsigned int));
   memset(sampleLoaded,0,256*sizeof(bool));
@@ -399,6 +399,11 @@ void DivPlatformRF5C68::renderSamples() {
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOffRFC[i]=0;
+      continue;
+    }
+
     int length=s->getLoopEndPosition(DIV_SAMPLE_DEPTH_8BIT);
     int actualLength=MIN((int)(getSampleMemCapacity()-memPos)-31,length);
     if (actualLength>0) {
diff --git a/src/engine/platform/rf5c68.h b/src/engine/platform/rf5c68.h
index 84cb68672..5af36c035 100644
--- a/src/engine/platform/rf5c68.h
+++ b/src/engine/platform/rf5c68.h
@@ -101,7 +101,7 @@ class DivPlatformRF5C68: public DivDispatch {
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
   private:
diff --git a/src/engine/platform/segapcm.cpp b/src/engine/platform/segapcm.cpp
index fc389a81d..860f99264 100644
--- a/src/engine/platform/segapcm.cpp
+++ b/src/engine/platform/segapcm.cpp
@@ -451,7 +451,7 @@ void DivPlatformSegaPCM::reset() {
   }
 }
 
- void DivPlatformSegaPCM::renderSamples() {
+ void DivPlatformSegaPCM::renderSamples(int sysID) {
   size_t memPos=0;
   
   for (int i=0; i<parent->song.sampleLen; i++) {
diff --git a/src/engine/platform/segapcm.h b/src/engine/platform/segapcm.h
index 222f4bd9f..2ed15eae8 100644
--- a/src/engine/platform/segapcm.h
+++ b/src/engine/platform/segapcm.h
@@ -110,7 +110,7 @@ class DivPlatformSegaPCM: public DivDispatch {
     void tick(bool sysTick=true);
     void muteChannel(int ch, bool mute);
     void notifyInsChange(int ins);
-    void renderSamples();
+    void renderSamples(int chipID);
     void setFlags(const DivConfig& flags);
     bool isStereo();
     void poke(unsigned int addr, unsigned short val);
diff --git a/src/engine/platform/snes.cpp b/src/engine/platform/snes.cpp
index cc37dfc54..2dd64de3a 100644
--- a/src/engine/platform/snes.cpp
+++ b/src/engine/platform/snes.cpp
@@ -803,7 +803,7 @@ bool DivPlatformSNES::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformSNES::renderSamples() {
+void DivPlatformSNES::renderSamples(int sysID) {
   memset(copyOfSampleMem,0,getSampleMemCapacity());
   memset(sampleOff,0,256*sizeof(unsigned int));
   memset(sampleLoaded,0,256*sizeof(bool));
@@ -812,6 +812,11 @@ void DivPlatformSNES::renderSamples() {
   size_t memPos=sampleTableBase+8*4+8*9*16;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOff[i]=0;
+      continue;
+    }
+
     int length=s->lengthBRR;
     int actualLength=MIN((int)(getSampleMemCapacity()-memPos)/9*9,length);
     if (actualLength>0) {
diff --git a/src/engine/platform/snes.h b/src/engine/platform/snes.h
index ad3b0ab2e..ed8bfbf32 100644
--- a/src/engine/platform/snes.h
+++ b/src/engine/platform/snes.h
@@ -138,7 +138,7 @@ class DivPlatformSNES: public DivDispatch {
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
   private:
diff --git a/src/engine/platform/su.cpp b/src/engine/platform/su.cpp
index c1330cd2d..116e0cde0 100644
--- a/src/engine/platform/su.cpp
+++ b/src/engine/platform/su.cpp
@@ -524,7 +524,7 @@ void DivPlatformSoundUnit::setFlags(const DivConfig& flags) {
   sampleMemSize=flags.getInt("sampleMemSize",0);
 
   su->Init(sampleMemSize?65536:8192,flags.getBool("pdm",false));
-  renderSamples();
+  renderSamples(sysIDCache);
 }
 
 void DivPlatformSoundUnit::poke(unsigned int addr, unsigned short val) {
@@ -553,7 +553,7 @@ bool DivPlatformSoundUnit::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformSoundUnit::renderSamples() {
+void DivPlatformSoundUnit::renderSamples(int sysID) {
   memset(su->pcm,0,getSampleMemCapacity(0));
   memset(sampleOffSU,0,256*sizeof(unsigned int));
   memset(sampleLoaded,0,256*sizeof(bool));
@@ -562,6 +562,11 @@ void DivPlatformSoundUnit::renderSamples() {
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
     if (s->data8==NULL) continue;
+    if (!s->renderOn[0][sysID]) {
+      sampleOffSU[i]=0;
+      continue;
+    }
+    
     int paddedLen=s->length8;
     if (memPos>=getSampleMemCapacity(0)) {
       logW("out of PCM memory for sample %d!",i);
@@ -578,7 +583,7 @@ void DivPlatformSoundUnit::renderSamples() {
     memPos+=paddedLen;
   }
   sampleMemLen=memPos;
-
+  sysIDCache=sysID;
 }
 
 int DivPlatformSoundUnit::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) {
diff --git a/src/engine/platform/su.h b/src/engine/platform/su.h
index e7eff8d44..bacdbc013 100644
--- a/src/engine/platform/su.h
+++ b/src/engine/platform/su.h
@@ -104,7 +104,7 @@ class DivPlatformSoundUnit: public DivDispatch {
   unsigned int sampleOffSU[256];
   bool sampleLoaded[256];
 
-  int cycles, curChan, delay;
+  int cycles, curChan, delay, sysIDCache;
   short tempL;
   short tempR;
   unsigned char sampleBank, lfoMode, lfoSpeed;
@@ -140,7 +140,7 @@ class DivPlatformSoundUnit: public DivDispatch {
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
     ~DivPlatformSoundUnit();
diff --git a/src/engine/platform/x1_010.cpp b/src/engine/platform/x1_010.cpp
index ea4177a96..683b36a6e 100644
--- a/src/engine/platform/x1_010.cpp
+++ b/src/engine/platform/x1_010.cpp
@@ -955,7 +955,7 @@ bool DivPlatformX1_010::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformX1_010::renderSamples() {
+void DivPlatformX1_010::renderSamples(int sysID) {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOffX1,0,256*sizeof(unsigned int));
   memset(sampleLoaded,0,256*sizeof(bool));
@@ -963,6 +963,11 @@ void DivPlatformX1_010::renderSamples() {
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOffX1[i]=0;
+      continue;
+    }
+    
     int paddedLen=(s->length8+4095)&(~0xfff);
     if (isBanked) {
     // fit sample bank size to 128KB for Seta 2 external bankswitching logic (not emulated yet!)
diff --git a/src/engine/platform/x1_010.h b/src/engine/platform/x1_010.h
index e54a3e896..d588d9446 100644
--- a/src/engine/platform/x1_010.h
+++ b/src/engine/platform/x1_010.h
@@ -148,7 +148,7 @@ class DivPlatformX1_010: public DivDispatch, public vgsound_emu_mem_intf {
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     const char** getRegisterSheet();
     void setBanked(bool banked);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp
index 09eb8ac32..63c84ad55 100644
--- a/src/engine/platform/ym2608.cpp
+++ b/src/engine/platform/ym2608.cpp
@@ -1342,7 +1342,7 @@ bool DivPlatformYM2608::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformYM2608::renderSamples() {
+void DivPlatformYM2608::renderSamples(int sysID) {
   memset(adpcmBMem,0,getSampleMemCapacity(0));
   memset(sampleOffB,0,256*sizeof(unsigned int));
   memset(sampleLoaded,0,256*sizeof(bool));
@@ -1350,6 +1350,11 @@ void DivPlatformYM2608::renderSamples() {
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOffB[i]=0;
+      continue;
+    }
+
     int paddedLen=(s->lengthB+255)&(~0xff);
     if ((memPos&0xf00000)!=((memPos+paddedLen)&0xf00000)) {
       memPos=(memPos+0xfffff)&0xf00000;
diff --git a/src/engine/platform/ym2608.h b/src/engine/platform/ym2608.h
index 81a6844d4..ef63fe634 100644
--- a/src/engine/platform/ym2608.h
+++ b/src/engine/platform/ym2608.h
@@ -139,7 +139,7 @@ class DivPlatformYM2608: public DivPlatformOPN {
     size_t getSampleMemCapacity(int index);
     size_t getSampleMemUsage(int index);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     void setFlags(const DivConfig& flags);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();
diff --git a/src/engine/platform/ym2610shared.h b/src/engine/platform/ym2610shared.h
index b9f939b4f..065eb5f35 100644
--- a/src/engine/platform/ym2610shared.h
+++ b/src/engine/platform/ym2610shared.h
@@ -220,7 +220,7 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
       return sampleLoaded[index][sample];
     }
 
-    void renderSamples() {
+    void renderSamples(int sysID) {
       memset(adpcmAMem,0,getSampleMemCapacity(0));
       memset(sampleOffA,0,256*sizeof(unsigned int));
       memset(sampleOffB,0,256*sizeof(unsigned int));
@@ -229,6 +229,11 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
       size_t memPos=0;
       for (int i=0; i<parent->song.sampleLen; i++) {
         DivSample* s=parent->song.sample[i];
+        if (!s->renderOn[0][sysID]) {
+          sampleOffA[i]=0;
+          continue;
+        }
+
         int paddedLen=(s->lengthA+255)&(~0xff);
         if ((memPos&0xf00000)!=((memPos+paddedLen)&0xf00000)) {
           memPos=(memPos+0xfffff)&0xf00000;
@@ -254,6 +259,11 @@ template<int ChanNum> class DivPlatformYM2610Base: public DivPlatformOPN {
       memPos=0;
       for (int i=0; i<parent->song.sampleLen; i++) {
         DivSample* s=parent->song.sample[i];
+        if (!s->renderOn[1][sysID]) {
+          sampleOffB[i]=0;
+          continue;
+        }
+
         int paddedLen=(s->lengthB+255)&(~0xff);
         if ((memPos&0xf00000)!=((memPos+paddedLen)&0xf00000)) {
           memPos=(memPos+0xfffff)&0xf00000;
diff --git a/src/engine/platform/ymz280b.cpp b/src/engine/platform/ymz280b.cpp
index c91512b57..8a903ef00 100644
--- a/src/engine/platform/ymz280b.cpp
+++ b/src/engine/platform/ymz280b.cpp
@@ -426,7 +426,7 @@ bool DivPlatformYMZ280B::isSampleLoaded(int index, int sample) {
   return sampleLoaded[sample];
 }
 
-void DivPlatformYMZ280B::renderSamples() {
+void DivPlatformYMZ280B::renderSamples(int sysID) {
   memset(sampleMem,0,getSampleMemCapacity());
   memset(sampleOff,0,256*sizeof(unsigned int));
   memset(sampleLoaded,0,256*sizeof(bool));
@@ -434,6 +434,11 @@ void DivPlatformYMZ280B::renderSamples() {
   size_t memPos=0;
   for (int i=0; i<parent->song.sampleLen; i++) {
     DivSample* s=parent->song.sample[i];
+    if (!s->renderOn[0][sysID]) {
+      sampleOff[i]=0;
+      continue;
+    }
+
     int length=s->getCurBufLen();
     unsigned char* src=(unsigned char*)s->getCurBuf();
     int actualLength=MIN((int)(getSampleMemCapacity()-memPos),length);
diff --git a/src/engine/platform/ymz280b.h b/src/engine/platform/ymz280b.h
index 7e8ceb674..9477d003d 100644
--- a/src/engine/platform/ymz280b.h
+++ b/src/engine/platform/ymz280b.h
@@ -101,7 +101,7 @@ class DivPlatformYMZ280B: public DivDispatch {
     size_t getSampleMemCapacity(int index = 0);
     size_t getSampleMemUsage(int index = 0);
     bool isSampleLoaded(int index, int sample);
-    void renderSamples();
+    void renderSamples(int chipID);
     void setFlags(const DivConfig& flags);
     int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
     void quit();

From f088c9ec495e62eabe7496ef9921fb56df356668 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 27 Nov 2022 00:30:41 -0500
Subject: [PATCH 71/86] Uninitialized Trash

---
 TODO.md                    | 1 -
 src/engine/platform/su.cpp | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index e8d551ab1..89a31eecf 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,5 +5,4 @@
 - (maybe) YM2612 CSM (no DualPCM)
 - port presets to new format
 - bug fixes
-- (maybe) ExtCh FM macros?
 - (maybe) advanced linear arpeggio? (run arp+slide simultaneously)
diff --git a/src/engine/platform/su.cpp b/src/engine/platform/su.cpp
index 116e0cde0..931225b49 100644
--- a/src/engine/platform/su.cpp
+++ b/src/engine/platform/su.cpp
@@ -595,6 +595,7 @@ int DivPlatformSoundUnit::init(DivEngine* p, int channels, int sugRate, const Di
     oscBuf[i]=new DivDispatchOscBuffer;
   }
   su=new SoundUnit();
+  sysIDCache=0;
   setFlags(flags);
   reset();
   return 8;

From 0fce35fa88d8f1705997f88f99c5ee283f2d1a96 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 27 Nov 2022 00:31:39 -0500
Subject: [PATCH 72/86] kill this false positive

---
 src/gui/sampleEdit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 99670c366..fb50fd567 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -379,7 +379,7 @@ void FurnaceGUI::drawSampleEdit() {
                       toolText=fmt::sprintf("%s (%s)\n%d bytes free",e->getSystemName(e->song.system[j]),memName,totalFree);
                     }
 
-                    if (isMemWarning[i][j]) {
+                    if (isMemWarning[i][j] && sample->renderOn[i][j]) {
                       toolText+="\n\nnot enough memory for this sample!";
                     }
 

From c20bd38898456c952990c832d58ecd70f363453b Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 27 Nov 2022 15:57:50 -0500
Subject: [PATCH 73/86] really fix Arcade .dmp loading

---
 src/engine/fileOpsIns.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/engine/fileOpsIns.cpp b/src/engine/fileOpsIns.cpp
index b83a6b48c..9f20f2948 100644
--- a/src/engine/fileOpsIns.cpp
+++ b/src/engine/fileOpsIns.cpp
@@ -147,7 +147,7 @@ void DivEngine::loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, St
           logD("instrument type is C64");
           break;
         case 8: // Arcade
-          ins->type=DIV_INS_FM;
+          ins->type=DIV_INS_OPM;
           logD("instrument type is Arcade");
           break;
         case 9: // Neo Geo
@@ -187,6 +187,8 @@ void DivEngine::loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, St
           ins->type=DIV_INS_OPLL;
         } else if (sys==1) {
           ins->type=DIV_INS_OPL;
+        } else if (sys==8) {
+          ins->type=DIV_INS_OPM;
         } else {
           ins->type=DIV_INS_FM;
         }

From a7dfe6534d0930ba0f014ad1bff243ce06939d23 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 01:27:58 -0500
Subject: [PATCH 74/86] SN: address easy noise feedback, part 1

---
 src/engine/platform/sms.cpp | 5 +++--
 src/engine/platform/sms.h   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index d3085c19b..7a9d53bc7 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -126,14 +126,14 @@ double DivPlatformSMS::NOTE_SN(int ch, int note) {
     return NOTE_PERIODIC(note);
   }
   if (note>easyThreshold) {
-    return MAX(0,8-easyThreshold);
+    return MAX(0,easyStartingPeriod-easyThreshold);
   }
   return NOTE_PERIODIC(note);
 }
 
 int DivPlatformSMS::snCalcFreq(int ch) {
   if (parent->song.linearPitch==2 && easyNoise && chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2>(easyThreshold<<7)) {
-    int ret=(0x440-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(easyThreshold<<7)))>>7;
+    int ret=(((easyStartingPeriod<<7)+0x40)-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(easyThreshold<<7)))>>7;
     if (ret<0) ret=0;
     return ret;
   }
@@ -489,6 +489,7 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
     default:
       chipClock=COLOR_NTSC;
       easyThreshold=92;
+      easyStartingPeriod=8;
       break;
   }
   resetPhase=!flags.getBool("noPhaseReset",false);
diff --git a/src/engine/platform/sms.h b/src/engine/platform/sms.h
index 32c181933..ce3ee5e72 100644
--- a/src/engine/platform/sms.h
+++ b/src/engine/platform/sms.h
@@ -66,6 +66,7 @@ class DivPlatformSMS: public DivDispatch {
   double toneDivider=64.0;
   double noiseDivider=64.0;
   int easyThreshold;
+  int easyStartingPeriod;
   bool updateSNMode;
   bool resetPhase;
   bool isRealSN;

From cbff29deb6b6a20bc73daed4b9351eb1b357ffb7 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 02:48:47 -0500
Subject: [PATCH 75/86] SN: address easy noise feedback, part 2

---
 src/engine/platform/sms.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index 7a9d53bc7..eb680b6d8 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -464,32 +464,38 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
   switch (flags.getInt("clockSel",0)) {
     case 1:
       chipClock=COLOR_PAL*4.0/5.0;
-      easyThreshold=92;
+      easyThreshold=84;
+      easyStartingPeriod=13;
       break;
     case 2:
       chipClock=4000000;
-      easyThreshold=95;
+      easyThreshold=86;
+      easyStartingPeriod=13;
       break;
     case 3:
       chipClock=COLOR_NTSC/2.0;
-      easyThreshold=80;
+      easyThreshold=72;
+      easyStartingPeriod=13;
       break;
     case 4:
       chipClock=3000000;
-      easyThreshold=89;
+      easyThreshold=81;
+      easyStartingPeriod=13;
       break;
     case 5:
       chipClock=2000000;
-      easyThreshold=82;
+      easyThreshold=74;
+      easyStartingPeriod=13;
       break;
     case 6:
       chipClock=COLOR_NTSC/8.0;
-      easyThreshold=57;
+      easyThreshold=48;
+      easyStartingPeriod=13;
       break;
     default:
       chipClock=COLOR_NTSC;
-      easyThreshold=92;
-      easyStartingPeriod=8;
+      easyThreshold=84;
+      easyStartingPeriod=13;
       break;
   }
   resetPhase=!flags.getBool("noPhaseReset",false);

From 965725327beba17914b52601ca6cd471a5ca8be9 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 03:05:14 -0500
Subject: [PATCH 76/86] T6W28: now implement easy noise here

---
 src/engine/platform/sms.cpp   |  2 +-
 src/engine/platform/t6w28.cpp | 39 +++++++++++++++++++++++++----------
 src/engine/platform/t6w28.h   |  4 ++++
 src/gui/sysConf.cpp           | 15 +++++++++++++-
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index eb680b6d8..24c4a3301 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -137,7 +137,7 @@ int DivPlatformSMS::snCalcFreq(int ch) {
     if (ret<0) ret=0;
     return ret;
   }
-  return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,toneDivider);
+  return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,ch==3?noiseDivider:toneDivider);
 }
 
 void DivPlatformSMS::tick(bool sysTick) {
diff --git a/src/engine/platform/t6w28.cpp b/src/engine/platform/t6w28.cpp
index 033bf10af..75daa6e44 100644
--- a/src/engine/platform/t6w28.cpp
+++ b/src/engine/platform/t6w28.cpp
@@ -81,10 +81,29 @@ void DivPlatformT6W28::writeOutVol(int ch) {
   }
 }
 
+double DivPlatformT6W28::NOTE_SN(int ch, int note) {
+  double CHIP_DIVIDER=16;
+  if (ch==3) CHIP_DIVIDER=15;
+  if (parent->song.linearPitch==2 || !easyNoise) {
+    return NOTE_PERIODIC(note);
+  }
+  if (note>107) {
+    return MAX(0,13-107);
+  }
+  return NOTE_PERIODIC(note);
+}
+
+int DivPlatformT6W28::snCalcFreq(int ch) {
+  if (parent->song.linearPitch==2 && easyNoise && chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2>(107<<7)) {
+    int ret=(((13<<7)+0x40)-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(107<<7)))>>7;
+    if (ret<0) ret=0;
+    return ret;
+  }
+  return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,ch==3?15:16);
+}
+
 void DivPlatformT6W28::tick(bool sysTick) {
   for (int i=0; i<4; i++) {
-    double CHIP_DIVIDER=16;
-    if (i==3) CHIP_DIVIDER=15;
     chan[i].std.next();
     if (chan[i].std.vol.had) {
       chan[i].outVol=VOL_SCALE_LOG_BROKEN(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15);
@@ -92,7 +111,7 @@ void DivPlatformT6W28::tick(bool sysTick) {
     if (chan[i].std.arp.had) {
       if (!chan[i].inPorta) {
         int noiseSeek=parent->calcArp(chan[i].note,chan[i].std.arp.val);
-        chan[i].baseFreq=NOTE_PERIODIC(noiseSeek);
+        chan[i].baseFreq=NOTE_SN(i,noiseSeek);
       }
       chan[i].freqChanged=true;
     }
@@ -124,7 +143,7 @@ void DivPlatformT6W28::tick(bool sysTick) {
       rWrite(1,0xe0+chan[i].duty);
     }
     if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
-      chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER);
+      chan[i].freq=snCalcFreq(i);
       if (chan[i].freq>1023) chan[i].freq=1023;
       if (i==3) {
         rWrite(1,0x80|(2<<5)|(chan[3].freq&15));
@@ -141,13 +160,11 @@ void DivPlatformT6W28::tick(bool sysTick) {
 }
 
 int DivPlatformT6W28::dispatch(DivCommand c) {
-  double CHIP_DIVIDER=16;
-  if (c.chan==3) CHIP_DIVIDER=15;
   switch (c.cmd) {
     case DIV_CMD_NOTE_ON: {
       DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_PCE);
       if (c.value!=DIV_NOTE_NULL) {
-        chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);
+        chan[c.chan].baseFreq=NOTE_SN(c.chan,c.value);
         chan[c.chan].freqChanged=true;
         chan[c.chan].note=c.value;
       }
@@ -197,7 +214,7 @@ int DivPlatformT6W28::dispatch(DivCommand c) {
       chan[c.chan].freqChanged=true;
       break;
     case DIV_CMD_NOTE_PORTA: {
-      int destFreq=NOTE_PERIODIC(c.value2);
+      int destFreq=NOTE_SN(c.chan,c.value2);
       bool return2=false;
       if (destFreq>chan[c.chan].baseFreq) {
         chan[c.chan].baseFreq+=c.value;
@@ -231,15 +248,15 @@ int DivPlatformT6W28::dispatch(DivCommand c) {
       break;
     }
     case DIV_CMD_LEGATO:
-      chan[c.chan].baseFreq=NOTE_PERIODIC(c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val):(0)));
+      chan[c.chan].baseFreq=NOTE_SN(c.chan,c.value+((chan[c.chan].std.arp.will && !chan[c.chan].std.arp.mode)?(chan[c.chan].std.arp.val):(0)));
       chan[c.chan].freqChanged=true;
       chan[c.chan].note=c.value;
       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_PCE));
+        if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_T6W28));
       }
-      if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will) chan[c.chan].baseFreq=NOTE_PERIODIC(chan[c.chan].note);
+      if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will) chan[c.chan].baseFreq=NOTE_SN(c.chan,chan[c.chan].note);
       chan[c.chan].inPorta=c.value;
       break;
     case DIV_CMD_GET_VOLMAX:
diff --git a/src/engine/platform/t6w28.h b/src/engine/platform/t6w28.h
index c95850d04..2cd66f9fd 100644
--- a/src/engine/platform/t6w28.h
+++ b/src/engine/platform/t6w28.h
@@ -76,6 +76,10 @@ class DivPlatformT6W28: public DivDispatch {
   unsigned char regPool[128];
   friend void putDispatchChip(void*,int);
   friend void putDispatchChan(void*,int,int);
+
+  double NOTE_SN(int ch, int note);
+  int snCalcFreq(int ch);
+  
   void writeOutVol(int ch);
   public:
     void acquire(short* bufL, short* bufR, size_t start, size_t len);
diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp
index eb4f06544..326c39a99 100644
--- a/src/gui/sysConf.cpp
+++ b/src/gui/sysConf.cpp
@@ -1527,12 +1527,25 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
       }
       break;
     }
+    case DIV_SYSTEM_T6W28: {
+      bool noEasyNoise=flags.getBool("noEasyNoise",false);
+
+      if (ImGui::Checkbox("Disable easy period to note mapping on upper octaves",&noEasyNoise)) {
+        altered=true;
+      }
+
+      if (altered) {
+        e->lockSave([&]() {
+          flags.set("noEasyNoise",noEasyNoise);
+        });
+      }
+      break;
+    }
     case DIV_SYSTEM_SWAN:
     case DIV_SYSTEM_VERA:
     case DIV_SYSTEM_BUBSYS_WSG:
     case DIV_SYSTEM_YMU759:
     case DIV_SYSTEM_PET:
-    case DIV_SYSTEM_T6W28:
     case DIV_SYSTEM_VBOY:
       ImGui::Text("nothing to configure");
       break;

From 4748b406a4e22e87da1f029df6df7a9c4c0599b8 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 03:08:06 -0500
Subject: [PATCH 77/86] update demo song rules

---
 CONTRIBUTING.md | 2 +-
 demos/README.md | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e4599d9c..311655117 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -86,7 +86,7 @@ just put your demo song in `demos/`! be noted there are some guidelines:
 
 - avoid Nintendo song covers.
 - avoid big label song covers.
-- avoid poor quality songs.
+- low effort compositions/covers may not be accepted at all.
 
 # Finishing
 
diff --git a/demos/README.md b/demos/README.md
index d07738e58..49d5cb37d 100644
--- a/demos/README.md
+++ b/demos/README.md
@@ -6,10 +6,11 @@ these demo songs are not under the GPL. all rights are reserved to the original
 
 # submit demo songs!
 
-contact me or send a pull request if you want your song to be added to this collection. be noted we have two rules:
+contact me or send a pull request if you want your song to be added to this collection. be noted we have three rules:
 
 - Nintendo covers are frowned upon
 - big label music covers also are discouraged
+- low effort compositions/covers may not be accepted at all.
 
 tildearrow also accepts demo songs in the .dmf format as well as the .fur format.
 

From e0de9040cdc75baf4ca7586d82b02517fc53f6e9 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 03:20:45 -0500
Subject: [PATCH 78/86] add a demo song

pull request #757
---
 demos/ice-cap-nc30.fur | Bin 0 -> 1464 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 demos/ice-cap-nc30.fur

diff --git a/demos/ice-cap-nc30.fur b/demos/ice-cap-nc30.fur
new file mode 100644
index 0000000000000000000000000000000000000000..815d7323fc601072ac58b3f3a5048896c2092171
GIT binary patch
literal 1464
zcmV;p1xNaLob6j%ZyQAv{&sy?XXAEDTA&bGuT&5z!lF_oF5=QAZd@gzNt6UC@#Z>~
z5^&?zi4jGrxV&%?c|zg|i9f(=B_uB5f!_cxJkY%L1q4D!2#GM`o$;>i9q+E!YrM`J
z=V*`5oH=LqoSpf0cH?}pQQt0=E9UjuMx$EE-v(g9riG>A@}5eBbXoy!%$d-UJf<N@
zRQD798olYF2YGb=-)VuQrck<JzE<0=m@{j&?X9wT{w(I|r44hg@m8h&q*<uFS*e@X
zZkdavH)_|+wOwLLdj4F1sw&inqHu4Da);#7(1F+Q1AaIOJYWJpJ`T)01$_H7pg#kA
zLHHZO_XxlJ95DGj@c9cs{w3hM3&8R$@XH)<^AeyIfln_3k1har7J=f+z)x3z&1K;4
z72xAlV0s<+@)h94tH1#vDD=aRRI+up-0Nf8byAO1zIy>Y8}u*96QeedpOKG6OQq}O
znprr1&YXERU*0TjZ&#}3&Tge%shwp-Sz23P)qvZ`p|Dx2Z<vMrr89Ywh9q@ID3?hk
zj3<DU9bQo#W632IW%68)c3nvtQ*Fa<Z=X;m3{}`}K)py$5*fzrlxyopIMHR&-cIR2
zz*anqs2|P6M`xd&b@Cw5IC_oGJ_{KuY^<Pt<IaQ5Wl;Yzj#nHrwUYW?v7p85wUiC_
z1l_6Ugf$F{ds3o#qAhpt7@F3Ng90cVbvufzYi-CndqzU*zog(2TE{<D*p(@6Jm_2o
z^)KUi#gWiD@{kz>T35TEHD5gR$V!Kh>hjRtM<Q!{V})Iq;>Lr{Wl;Yzj#nIstRs(@
zL6CKkA?sXeXD613>ZGKL&hG`rk=ZR%oqd#kp}@y@+{ZWGC^yVlVHc#h@t|`V)W3}5
z6(<&ms&MYLn~;b~5cMmDs8=f0+QzL|Vyf4wOxwLKF}KU0(@yS8;~OjNG88u+bS{JX
zmvOw}bl@mmfV{9M%mDb}#WxOg-KH<PCJ0XwKEmQ3Vc#cMdkXeO!>hfQ-~LGAw-<i%
z9dWTyt(t2$8>M<Bo;zc;tGS*0%q$wh*V|i<SYgKDKI6w5U56Pf><Sz=9&|2)`j>IM
z;tY95+~1U=<DyHfL{u+C-D8M4U#*mP>sw{>a${?^RF5U7cG6VGcfS|;U!>%J68?km
zZ-jqk$KRR$ANH?P^sY}QoF#k|*4>{QAiKrp&usdk{wD8u1LZJdg<aF)#)HmfQ2#QH
zSDaWprf$8#Qxx%}J@lY_b@tWyc`6)biX1FtIY#&d;gf`?37;Z-nzf&1-=|so31&~7
z?NKMD!x=?a`Zkurm%)r5WE~%JFxAnA8pl~bgAIy5^qB1E|1jZ4*kGoa?l`kCSlcN!
zDEc$I)+RXTIMT+)=$Euh;}kn`-OB9x>PO8iT35pcl^8+F!<X%XSd?u}`se~u|4PLE
zqaME+p?^m~l(8vDqzQ{!<^@sYk~JE#T@Z`tW-j4!g=GU@sqV5auovk?vM!J_0(+5O
zBxeM&Ca@RjMY1O9YZrtsS<x26Ua;EjMS79!w0Fu;7kp6uJ!gn2m#oo{?Sg>KkOaA*
zKR8ITCthxyCYu%(WgW7=D=(ORP+9fiKjFhBC9u(3>qq1TvG20@P{y?&BQ5iSB;=Ac
z8nRswv}Q<}G~dN1@Z*5b5Wn_O&k!!}<3rE!+{Jr7Y~FXZ*~bUI&NoCs>?P~46r>+H
z%P?fW<9vA@I`z6hpAzU>1>wJw$dbaOJTN4TtOvZk4Jv0M_8;~59R=YtB;EyyJYiAG
zydeBdGkp>iWkI5rvk@0WZ9OTAydcV06eRM54Qqz*cPCoR3ljBhdumuSB+X_>+zS$U
z!iF_NG`TSx4cRV;Mf83;38QJCwdM*1OIvQ&Ck1+M`;5Ro6T)6~$a<STEzl3fUK9EW
SX74D7A`3DC_V^Ece@mik``p3+

literal 0
HcmV?d00001


From 790d26cdb6c6fddafcb06833c02a6992b54ba92d Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 03:21:18 -0500
Subject: [PATCH 79/86] kill the Linux ARM build (for now)

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2d5aef2d..149d234c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
           - { name: 'macOS x86_64', os: macos-latest, arch: x86_64 }
           - { name: 'macOS ARM', os: macos-latest, arch: arm64 }
           - { name: 'Linux x86_64', os: ubuntu-18.04, arch: x86_64 }
-          - { name: 'Linux ARM', os: ubuntu-18.04, arch: armhf }
+          #- { name: 'Linux ARM', os: ubuntu-18.04, arch: armhf }
       fail-fast: false
 
     name: ${{ matrix.config.name }}

From 816a87e652c98c8806ea8cf5a78c90c93310773e Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 03:24:35 -0500
Subject: [PATCH 80/86] GUI: update credits

---
 src/gui/about.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 75578106d..37c8ee7b9 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -76,6 +76,7 @@ const char* aboutLine[]={
   "Fragmare",
   "freq-mod",
   "iyatemu",
+  "JayBOB18",
   "kleeder",
   "jaezu",
   "Laggy",

From e296b30172bd1fd69143d7f6e996fba39dc77688 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 13:35:55 -0500
Subject: [PATCH 81/86] it didn't happen

---
 src/engine/sysDef.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp
index b23ed7130..9cd0b33ff 100644
--- a/src/engine/sysDef.cpp
+++ b/src/engine/sysDef.cpp
@@ -1672,8 +1672,7 @@ void DivEngine::registerSystems() {
   );
 
   sysDefs[DIV_SYSTEM_T6W28]=new DivSysDef(
-    // 0x0a = wild guess. it may as well be 0x83
-    "T6W28", NULL, 0xbf, 0x0a, 4, false, true, 0x160, false, 0,
+    "T6W28", NULL, 0xbf, 0, 4, false, true, 0x160, false, 0,
     "an SN76489 derivative used in Neo Geo Pocket, has independent stereo volume and noise channel frequency.",
     {"Square 1", "Square 2", "Square 3", "Noise"},
     {"S1", "S2", "S3", "NO"},

From a637806e28ca419dc21acf468a6a61889b83e327 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 28 Nov 2022 16:46:25 -0500
Subject: [PATCH 82/86] SN: address more easy noise issues, part 1

---
 src/engine/platform/sms.cpp   | 2 +-
 src/engine/platform/t6w28.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/engine/platform/sms.cpp b/src/engine/platform/sms.cpp
index 24c4a3301..9f65a9534 100644
--- a/src/engine/platform/sms.cpp
+++ b/src/engine/platform/sms.cpp
@@ -126,7 +126,7 @@ double DivPlatformSMS::NOTE_SN(int ch, int note) {
     return NOTE_PERIODIC(note);
   }
   if (note>easyThreshold) {
-    return MAX(0,easyStartingPeriod-easyThreshold);
+    return MAX(0,easyStartingPeriod-(note-easyThreshold));
   }
   return NOTE_PERIODIC(note);
 }
diff --git a/src/engine/platform/t6w28.cpp b/src/engine/platform/t6w28.cpp
index 75daa6e44..c6317e119 100644
--- a/src/engine/platform/t6w28.cpp
+++ b/src/engine/platform/t6w28.cpp
@@ -88,7 +88,7 @@ double DivPlatformT6W28::NOTE_SN(int ch, int note) {
     return NOTE_PERIODIC(note);
   }
   if (note>107) {
-    return MAX(0,13-107);
+    return MAX(0,13-(note-107));
   }
   return NOTE_PERIODIC(note);
 }

From a09ccb9b30fc83504e726ae003854e86d455c06d Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 29 Nov 2022 00:09:08 -0500
Subject: [PATCH 83/86] prevent accidental loading of .brr as DMP

---
 src/engine/fileOpsIns.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/engine/fileOpsIns.cpp b/src/engine/fileOpsIns.cpp
index 9f20f2948..359a7ae39 100644
--- a/src/engine/fileOpsIns.cpp
+++ b/src/engine/fileOpsIns.cpp
@@ -1980,7 +1980,12 @@ std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path, bool
         format=DIV_INSFORMAT_WOPL;
       } else if (extS==".wopn") {
         format=DIV_INSFORMAT_WOPN;
-      } 
+      } else {
+        // unknown format
+        lastError="unknown instrument format";
+        delete[] buf;
+        return ret;
+      }
     }
 
     switch (format) {

From b41a015c4b893013c33f59eb613c3d3feda0de65 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 29 Nov 2022 00:17:38 -0500
Subject: [PATCH 84/86] sample preview now defaults to C-4 rate

---
 src/engine/engine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index da571eaa3..f85b62b3d 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -2476,10 +2476,10 @@ void DivEngine::previewSampleNoLock(int sample, int note, int pStart, int pEnd)
     return;
   }
   blip_clear(samp_bb);
-  double rate=song.sample[sample]->rate;
+  double rate=song.sample[sample]->centerRate;
   if (note>=0) {
     rate=(pow(2.0,(double)(note)/12.0)*((double)song.sample[sample]->centerRate)*0.0625);
-    if (rate<=0) rate=song.sample[sample]->rate;
+    if (rate<=0) rate=song.sample[sample]->centerRate;
   }
   if (rate<100) rate=100;
   blip_set_rates(samp_bb,rate,got.rate);

From 2fdce8512a56a3070038be2bd2abef206bc6d273 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 29 Nov 2022 16:09:50 -0500
Subject: [PATCH 85/86] GUI: mobile chips view

---
 src/gui/gui.cpp        | 5 +++++
 src/gui/sysManager.cpp | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index eb93d3d05..9cce27f20 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -3764,6 +3764,11 @@ bool FurnaceGUI::loop() {
           drawSampleEdit();
           drawPiano();
           break;
+        case GUI_SCENE_CHIPS:
+          sysManagerOpen=true;
+          curWindow=GUI_WINDOW_SYS_MANAGER;
+          drawSysManager();
+          break;
         default:
           patternOpen=true;
           curWindow=GUI_WINDOW_PATTERN;
diff --git a/src/gui/sysManager.cpp b/src/gui/sysManager.cpp
index cd82b84ca..1de5ac1f8 100644
--- a/src/gui/sysManager.cpp
+++ b/src/gui/sysManager.cpp
@@ -30,6 +30,14 @@ void FurnaceGUI::drawSysManager() {
     nextWindow=GUI_WINDOW_NOTHING;
   }
   if (!sysManagerOpen) return;
+  if (mobileUI) {
+    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f));
+    patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)):ImVec2(canvasW-(0.16*canvasH),canvasH));
+    ImGui::SetNextWindowPos(patWindowPos);
+    ImGui::SetNextWindowSize(patWindowSize);
+  } else {
+    //ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH));
+  }
   if (ImGui::Begin("Chip Manager",&sysManagerOpen,globalWinFlags)) {
     ImGui::Checkbox("Preserve channel order",&preserveChanPos);
     if (ImGui::BeginTable("SystemList",3)) {

From 884588e46b96b1e3178ee178ceb2858633648c3d Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 29 Nov 2022 18:30:48 -0500
Subject: [PATCH 86/86] GUI: mobile portrait order bar

---
 src/gui/editControls.cpp |  2 +-
 src/gui/gui.cpp          |  1 +
 src/gui/gui.h            |  3 ++-
 src/gui/orders.cpp       | 39 ++++++++++++++++++++++++++++++++++++++-
 src/gui/pattern.cpp      |  4 ++--
 src/gui/piano.cpp        |  4 ++--
 src/gui/songInfo.cpp     | 15 ++++++++++-----
 7 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp
index 6bfde0107..a7582ff38 100644
--- a/src/gui/editControls.cpp
+++ b/src/gui/editControls.cpp
@@ -212,7 +212,7 @@ void FurnaceGUI::drawMobileControls() {
 
           ImGui::Separator();
 
-          ImGui::Text("Song info here...");
+          drawSongInfo(true);
           break;
         }
         case GUI_SCENE_CHANNELS:
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 9cce27f20..ebd7dafa0 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -3774,6 +3774,7 @@ bool FurnaceGUI::loop() {
           curWindow=GUI_WINDOW_PATTERN;
           drawPattern();
           drawPiano();
+          drawMobileOrderSel();
           break;
       }
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index a371789f7..23da50710 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -1730,8 +1730,9 @@ class FurnaceGUI {
   void popToggleColors();
 
   void drawMobileControls();
+  void drawMobileOrderSel();
   void drawEditControls();
-  void drawSongInfo();
+  void drawSongInfo(bool asChild=false);
   void drawOrders();
   void drawPattern();
   void drawInsList(bool asChild=false);
diff --git a/src/gui/orders.cpp b/src/gui/orders.cpp
index 5f822078f..73fcb9147 100644
--- a/src/gui/orders.cpp
+++ b/src/gui/orders.cpp
@@ -18,8 +18,45 @@
  */
 
 #include "gui.h"
+#include <fmt/printf.h>
 #include "IconsFontAwesome4.h"
-#include <imgui.h>
+#include "imgui_internal.h"
+
+void FurnaceGUI::drawMobileOrderSel() {
+  if (!portrait) return;
+
+  ImGui::SetNextWindowPos(ImVec2(0.0f,mobileMenuPos*-0.65*canvasH));
+  ImGui::SetNextWindowSize(ImVec2(canvasW,0.12*canvasW));
+  if (ImGui::Begin("OrderSel",NULL,globalWinFlags)) {
+    ImDrawList* dl=ImGui::GetWindowDrawList();
+    ImGuiWindow* window=ImGui::GetCurrentWindow();
+    ImGuiStyle& style=ImGui::GetStyle();
+
+    ImVec2 size=ImGui::GetContentRegionAvail();
+
+    ImVec2 minArea=window->DC.CursorPos;
+    ImVec2 maxArea=ImVec2(
+      minArea.x+size.x,
+      minArea.y+size.y
+    );
+    ImRect rect=ImRect(minArea,maxArea);
+    ImGui::ItemSize(size,style.FramePadding.y);
+    ImU32 col=ImGui::GetColorU32(ImGuiCol_Text);
+    if (ImGui::ItemAdd(rect,ImGui::GetID("OrderSelW"))) {
+      String text=fmt::sprintf("%.2X",curOrder);
+
+      ImVec2 pos=ImLerp(minArea,maxArea,ImVec2(0.5,0.0));
+      ImGui::PushFont(bigFont);
+      ImVec2 textSize=ImGui::CalcTextSize(text.c_str());
+      ImGui::PopFont();
+
+      pos.x-=textSize.x*0.5*(size.y/textSize.y);
+
+      dl->AddText(bigFont,size.y,pos,col,text.c_str());
+    }
+  }
+  ImGui::End();
+}
 
 void FurnaceGUI::drawOrders() {
   static char selID[4096];
diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index ec158d650..483d66b53 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -376,8 +376,8 @@ void FurnaceGUI::drawPattern() {
   }
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,ImVec2(0.0f,0.0f));
   if (mobileUI) {
-    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f));
-    patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)-(pianoOpen?(0.4*canvasW):0.0f)):ImVec2(canvasW-(0.16*canvasH),canvasH-(pianoOpen?(0.3*canvasH):0.0f)));
+    patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)+(0.12*canvasW)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f));
+    patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)-(0.12*canvasW)-(pianoOpen?(0.4*canvasW):0.0f)):ImVec2(canvasW-(0.16*canvasH),canvasH-(pianoOpen?(0.3*canvasH):0.0f)));
     ImGui::SetNextWindowPos(patWindowPos);
     ImGui::SetNextWindowSize(patWindowSize);
   }
diff --git a/src/gui/piano.cpp b/src/gui/piano.cpp
index b135114f8..98e83f351 100644
--- a/src/gui/piano.cpp
+++ b/src/gui/piano.cpp
@@ -158,7 +158,7 @@ void FurnaceGUI::drawPiano() {
       }
 
       ImGui::TableNextColumn();
-      if (pianoInputPadMode==1 && cursor.xFine>0) {
+      if (pianoInputPadMode==1 && cursor.xFine>0 && curWindow==GUI_WINDOW_PATTERN) {
         ImVec2 buttonSize=ImGui::GetContentRegionAvail();
         if (ImGui::BeginTable("InputPadP",8,ImGuiTableFlags_SizingFixedSame)) {
           ImGui::TableNextRow();
@@ -430,7 +430,7 @@ void FurnaceGUI::drawPiano() {
   ImGui::End();
 
   // draw input pad if necessary
-  if ((pianoInputPadMode==2 && cursor.xFine>0) || pianoInputPadMode==3) {
+  if (curWindow==GUI_WINDOW_PATTERN && ((pianoInputPadMode==2 && cursor.xFine>0) || pianoInputPadMode==3)) {
     if (ImGui::Begin("Input Pad",NULL,ImGuiWindowFlags_NoTitleBar)) {
       ImGui::BeginDisabled(cursor.xFine==0);
       if (ImGui::BeginTable("InputPad",3,ImGuiTableFlags_Borders)) {
diff --git a/src/gui/songInfo.cpp b/src/gui/songInfo.cpp
index 24ed67c0b..151991871 100644
--- a/src/gui/songInfo.cpp
+++ b/src/gui/songInfo.cpp
@@ -22,14 +22,15 @@
 #include "misc/cpp/imgui_stdlib.h"
 #include "intConst.h"
 
-void FurnaceGUI::drawSongInfo() {
+void FurnaceGUI::drawSongInfo(bool asChild) {
   if (nextWindow==GUI_WINDOW_SONG_INFO) {
     songInfoOpen=true;
     ImGui::SetNextWindowFocus();
     nextWindow=GUI_WINDOW_NOTHING;
   }
-  if (!songInfoOpen) return;
-  if (ImGui::Begin("Song Information",&songInfoOpen,globalWinFlags)) {
+  if (!songInfoOpen && !asChild) return;
+  bool began=asChild?ImGui::BeginChild("Song Information"):ImGui::Begin("Song Information",&songInfoOpen,globalWinFlags);
+  if (began) {
     if (ImGui::BeginTable("NameAuthor",2,ImGuiTableFlags_SizingStretchProp)) {
       ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed,0.0);
       ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,0.0);
@@ -240,6 +241,10 @@ void FurnaceGUI::drawSongInfo() {
       ImGui::EndTable();
     }
   }
-  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SONG_INFO;
-  ImGui::End();
+  if (!asChild && ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SONG_INFO;
+  if (asChild) {
+    ImGui::EndChild();
+  } else {
+    ImGui::End();
+  }
 }