From bda0ca5d95d7795abee196535beffbabde301299 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 14 Nov 2022 19:07:17 -0500
Subject: [PATCH] convert presets to new format, part 5

---
 src/gui/presets.cpp | 924 +++++++++++++++-----------------------------
 1 file changed, 305 insertions(+), 619 deletions(-)

diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index a596ceebc..8b0e5fcc2 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -57,192 +57,161 @@ void FurnaceGUI::initSystemPresets() {
   );
   ENTRY(
     "Sega Genesis (DualPCM)", {
-      DIV_SYSTEM_YM2612_FRAC, 64, 0, 0,
-      DIV_SYSTEM_SMS, 32, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612_FRAC, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, "")
     }
   );
   ENTRY(
     "Sega Genesis (DualPCM, extended channel 3)", {
-      DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, 0,
-      DIV_SYSTEM_SMS, 32, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, "")
     }
   );
   ENTRY(
     "Sega Genesis (with Sega CD)", {
-      DIV_SYSTEM_YM2612, 64, 0, 0,
-      DIV_SYSTEM_SMS, 32, 0, 0,
-      DIV_SYSTEM_RF5C68, 64, 0, 18,
-      0
+      CH(DIV_SYSTEM_YM2612, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, ""),
+      CH(DIV_SYSTEM_RF5C68, 64, 0,
+        "clockSel=2\n"
+        "chipType=1\n"
+      )
     }
   );
   ENTRY(
     "Sega Genesis (extended channel 3 with Sega CD)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 0,
-      DIV_SYSTEM_SMS, 32, 0, 0,
-      DIV_SYSTEM_RF5C68, 64, 0, 18,
-      0
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, ""),
+      CH(DIV_SYSTEM_RF5C68, 64, 0,
+        "clockSel=2\n"
+        "chipType=1\n"
+      )
     }
   );
   ENTRY(
     "Sega Master System", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, "")
     }
   );
   ENTRY(
     "Sega Master System (with FM expansion)", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_OPLL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL, 64, 0, "")
     }
   );
   ENTRY(
     "Sega Master System (with FM expansion in drums mode)", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Sega Game Gear", {
-      DIV_SYSTEM_SMS, 64, 0, 0xc,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, "chipType=3")
     }
   );
   ENTRY(
     "Game Boy", {
-      DIV_SYSTEM_GB, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_GB, 64, 0, "")
     }
   );
   ENTRY(
     "NEC PC Engine/TurboGrafx-16", {
-      DIV_SYSTEM_PCE, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCE, 64, 0, "")
     }
   );
   ENTRY(
     "NES", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, "")
     }
   );
   ENTRY(
     "Famicom with Konami VRC6", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_VRC6, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_VRC6, 64, 0, "")
     }
   );
   ENTRY(
     "Famicom with Konami VRC7", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_VRC7, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_VRC7, 64, 0, "")
     }
   );
   ENTRY(
     "Famicom with MMC5", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_MMC5, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_MMC5, 64, 0, "")
     }
   );
   ENTRY(
     "Famicom with Sunsoft 5B", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_AY8910, 64, 0, 32,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=2")
     }
   );
   ENTRY(
     "Famicom with Namco 163", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_N163, 64, 0, 112,
-      0
-    }
-  );
-  ENTRY(
-    "Comboy with Family Noraebang", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_OPLL, 64, 0, 0,
-      0
-    }
-  );
-  ENTRY(
-    "Comboy with Family Noraebang (drums mode)", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_N163, 64, 0, "channels=7")
     }
   );
   ENTRY(
     "Famicom Disk System", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_FDS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_FDS, 64, 0, "")
     }
   );
   ENTRY(
     "SNES", {
-      DIV_SYSTEM_SNES, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SNES, 64, 0, "")
     }
   );
   ENTRY(
     "Mattel Intellivision", {
-      DIV_SYSTEM_AY8910, 64, 0, 48,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=3")
     }
   );
   ENTRY(
     "Vectrex", {
-      DIV_SYSTEM_AY8910, 64, 0, 4,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=4")
     }
   );
   ENTRY(
     "Neo Geo AES", {
-      DIV_SYSTEM_YM2610_FULL, 64, 0, 1,
-      0
+      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Neo Geo AES (extended channel 2)", {
-      DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, 1,
-      0
+      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Atari 2600/7800", {
-      DIV_SYSTEM_TIA, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_TIA, 64, 0, "")
     }
   );
   ENTRY(
     "Atari Lynx", {
-      DIV_SYSTEM_LYNX, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_LYNX, 64, 0, "")
     }
   );
   ENTRY(
     "WonderSwan", {
-      DIV_SYSTEM_SWAN, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SWAN, 64, 0, "")
     }
   );
   ENTRY(
     "Virtual Boy", {
-      DIV_SYSTEM_VBOY, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_VBOY, 64, 0, "")
     }
   );
   ENTRY(
     "Gamate", {
-      DIV_SYSTEM_AY8910, 64, 0, 73,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0,
+        "clockSel=9\n"
+        "chipType=0\n"
+        "stereo=true\n"
+      )
     }
   );
   CATEGORY_END;
@@ -250,274 +219,246 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Computers","let's get to work on chiptune today.");
   ENTRY(
     "Commodore PET", {
-      DIV_SYSTEM_PET, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PET, 64, 0, "")
     }
   );
   ENTRY(
     "Commodore VIC-20", {
-      DIV_SYSTEM_VIC20, 64, 0, 1,
-      0
+      CH(DIV_SYSTEM_VIC20, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Commodore 64 (6581 SID)", {
-      DIV_SYSTEM_C64_6581, 64, 0, 1,
-      0
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Commodore 64 (8580 SID)", {
-      DIV_SYSTEM_C64_8580, 64, 0, 1,
-      0
+      CH(DIV_SYSTEM_C64_8580, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "Commodore 64 (6581 SID + Sound Expander)", {
-      DIV_SYSTEM_C64_6581, 64, 0, 1,
-      DIV_SYSTEM_OPL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL, 64, 0, "")
     }
   );
   ENTRY(
     "Commodore 64 (6581 SID + Sound Expander in drums mode)", {
-      DIV_SYSTEM_C64_6581, 64, 0, 1,
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Commodore 64 (8580 SID + Sound Expander)", {
-      DIV_SYSTEM_C64_8580, 64, 0, 1,
-      DIV_SYSTEM_OPL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_8580, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL, 64, 0, "")
     }
   );
   ENTRY(
     "Commodore 64 (8580 SID + Sound Expander in drums mode)", {
-      DIV_SYSTEM_C64_8580, 64, 0, 1,
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_8580, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "")
     }
   );
-    ENTRY(
+  ENTRY(
     "Commodore 64 (6581 SID + FM-YAM)", {
-      DIV_SYSTEM_C64_6581, 64, 0, 1,
-      DIV_SYSTEM_OPL2, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL2, 64, 0, "")
     }
   );
-    ENTRY(
+  ENTRY(
     "Commodore 64 (6581 SID + FM-YAM in drums mode)", {
-      DIV_SYSTEM_C64_6581, 64, 0, 1,
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_6581, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "")
     }
   );
-    ENTRY(
+  ENTRY(
     "Commodore 64 (8580 SID + FM-YAM)", {
-      DIV_SYSTEM_C64_8580, 64, 0, 1,
-      DIV_SYSTEM_OPL2, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_8580, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL2, 64, 0, "")
     }
   );
-    ENTRY(
+  ENTRY(
     "Commodore 64 (8580 SID + FM-YAM in drums mode)", {
-      DIV_SYSTEM_C64_8580, 64, 0, 1,
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_C64_8580, 64, 0, "clockSel=1"),
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "Amiga", {
-      DIV_SYSTEM_AMIGA, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AMIGA, 64, 0, "")
     }
   );
   ENTRY(
     "MSX", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1")
     }
   );
   ENTRY(
     "MSX + SFG-01", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_YM2151, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_YM2151, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + MSX-AUDIO", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_Y8950, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_Y8950, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + MSX-AUDIO (drums mode)", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + MSX-MUSIC", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_OPLL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_OPLL, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + MSX-MUSIC (drums mode)", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + Darky", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_AY8930, 64, 0, 139, // 3.58MHz
-      DIV_SYSTEM_AY8930, 64, 0, 139, // 3.58MHz or 3.6MHz selectable via register
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_AY8930, 64, 0,
+        "clockSel=11\n"
+        "halfClock=true\n"
+      ), // 3.58MHz
+      CH(DIV_SYSTEM_AY8930, 64, 0,
+        "clockSel=11\n"
+        "halfClock=true\n"
+      ) // 3.58MHz or 3.6MHz selectable via register
       // per-channel mixer (soft panning, post processing) isn't emulated at all
-      0
     }
   );
     ENTRY(
     "MSX + Playsoniq", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_SMS, 64, 0, 0, // Sega VDP
-      DIV_SYSTEM_C64_8580, 64, 0, 0,
-      DIV_SYSTEM_SCC_PLUS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_SMS, 64, 0, ""), // Sega VDP
+      CH(DIV_SYSTEM_C64_8580, 64, 0, ""),
+      CH(DIV_SYSTEM_SCC_PLUS, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + SCC", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_SCC, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_SCC, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + SCC+", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_SCC_PLUS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_SCC_PLUS, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + Neotron", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_YM2610_FULL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + Neotron (extended channel 2)", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + Neotron (with YM2610B)", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_YM2610B, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_YM2610B, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + Neotron (with YM2610B; extended channel 3)", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_YM2610B_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, "")
     }
   );
   ENTRY(
     "MSX + SIMPL", {
-      DIV_SYSTEM_AY8910, 64, 0, 16,
-      DIV_SYSTEM_PCM_DAC, 64, 0, 55929|(7<<16), // variable rate, Mono DAC
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, "chipType=1"),
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0,
+        "rate=55930\n"
+        "outDepth=8\n"
+      ) // variable rate, Mono DAC
     }
   );
   ENTRY(
     "NEC PC-98 (with PC-9801-26/K)", {
-      DIV_SYSTEM_OPN, 64, 0, 4, // 3.9936MHz but some compatible card has 4MHz
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=4"), // 3.9936MHz but some compatible card has 4MHz
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1")
     }
   );
   ENTRY(
     "NEC PC-98 (with PC-9801-26/K; extended channel 3)", {
-      DIV_SYSTEM_OPN_EXT, 64, 0, 4, // 3.9936MHz but some compatible card has 4MHz
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPN_EXT, 64, 0, "clockSel=4"), // 3.9936MHz but some compatible card has 4MHz
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
     }
   );
   ENTRY(
@@ -525,8 +466,7 @@ void FurnaceGUI::initSystemPresets() {
       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),
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
     }
   );
   ENTRY(
@@ -534,40 +474,35 @@ void FurnaceGUI::initSystemPresets() {
       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),
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
     }
   );
     ENTRY(
     "NEC PC-98 (with PC-9801-73)", {
       DIV_SYSTEM_PC98, 64, 0, 1,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
     }
   );
     ENTRY(
     "NEC PC-98 (with PC-9801-73; extended channel 3)", {
       DIV_SYSTEM_PC98_EXT, 64, 0, 1,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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),
-      DIV_SYSTEM_OPL3, 64, 0, 0,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
+      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),
-      DIV_SYSTEM_OPL3, 64, 0, 0,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
     }
   );
   ENTRY(
@@ -575,8 +510,7 @@ void FurnaceGUI::initSystemPresets() {
       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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
     }
   );
   ENTRY(
@@ -584,20 +518,17 @@ void FurnaceGUI::initSystemPresets() {
       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,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, "clockSel=1"),
     }
   );
   ENTRY(
     "ZX Spectrum (48K)", {
-      DIV_SYSTEM_SFX_BEEPER, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SFX_BEEPER, 64, 0, ""),
     }
   );
   ENTRY(
     "ZX Spectrum (128K)", {
       DIV_SYSTEM_AY8910, 64, 0, 1, //beeper was also included
-      0
     }
   );
   ENTRY(
@@ -605,7 +536,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 1,
       DIV_SYSTEM_OPN, 64, 0, 1,
       DIV_SYSTEM_OPN, 64, 0, 1,
-      0
     }
   );
   ENTRY(
@@ -613,7 +543,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 1,
       DIV_SYSTEM_OPN_EXT, 64, 0, 1,
       DIV_SYSTEM_OPN, 64, 0, 1,
-      0
     }
   );
   ENTRY(
@@ -621,7 +550,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 1,
       DIV_SYSTEM_OPN, 64, 0, 1,
       DIV_SYSTEM_OPN_EXT, 64, 0, 1,
-      0
     }
   );
   ENTRY(
@@ -629,7 +557,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 1,
       DIV_SYSTEM_OPN_EXT, 64, 0, 1,
       DIV_SYSTEM_OPN_EXT, 64, 0, 1,
-      0
     }
   );
   ENTRY(
@@ -637,19 +564,16 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 1,
       DIV_SYSTEM_AY8910, 64, 0, 1, // or YM2149
       DIV_SYSTEM_AY8910, 64, 0, 1, // or YM2149
-      0
     }
   );
   ENTRY(
     "Amstrad CPC", {
       DIV_SYSTEM_AY8910, 64, 0, 5,
-      0
     }
   );
   ENTRY(
     "Atari ST", {
       DIV_SYSTEM_AY8910, 64, 0, 19,
-      0
     }
   );
     ENTRY(
@@ -657,111 +581,96 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 19,
       DIV_SYSTEM_PCM_DAC, 64, 0, 50667|(7<<16),
       DIV_SYSTEM_PCM_DAC, 64, 0, 50667|(7<<16),
-      0
     }
   );
   ENTRY(
     "SAM Coupé", {
-      DIV_SYSTEM_SAA1099, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SAA1099, 64, 0, ""),
     }
   );
   ENTRY(
     "BBC Micro", {
       DIV_SYSTEM_SMS, 64, 0, 0x42, // SN76489A 4MHz
-      0
     }
   );
   ENTRY(
     "PC (barebones)", {
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      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
-      0
     }
   );
   ENTRY(
     "Tandy 1000", {
       DIV_SYSTEM_SMS, 64, 0, 0x44, // NCR 8496 or SN76496 or Tandy PSSJ(with 8 bit DAC)
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "PC + Covox Sound Master", {
       DIV_SYSTEM_AY8930, 64, 0, 3,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "PC + SSI 2001", {
       DIV_SYSTEM_C64_6581, 64, 0, 2,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "PC + Game Blaster", {
       DIV_SYSTEM_SAA1099, 64, 0, 1,
       DIV_SYSTEM_SAA1099, 64, 0, 1,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
     ENTRY(
     "PC + AdLib", {
-      DIV_SYSTEM_OPL2, 64, 0, 0,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL2, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
       ENTRY(
     "PC + AdLib (drums mode)", {
-      DIV_SYSTEM_OPL2, 64, 0, 0,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL2, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "PC + Sound Blaster", {
-      DIV_SYSTEM_OPL2, 64, 0, 0,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
+      CH(DIV_SYSTEM_OPL2, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
       DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16),
-      0
     }
   );
   ENTRY(
     "PC + AdLib/Sound Blaster (drums mode)", {
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0,
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
       DIV_SYSTEM_PCM_DAC, 64, 0, 22049|(7<<16),
-      0
     }
   );
   ENTRY(
     "PC + Sound Blaster w/Game Blaster Compatible", {
-      DIV_SYSTEM_OPL2, 64, 0, 0,
+      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),
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "PC + Sound Blaster w/Game Blaster Compatible (drums mode)", {
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0,
+      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),
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
@@ -769,8 +678,7 @@ void FurnaceGUI::initSystemPresets() {
       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
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
@@ -778,31 +686,27 @@ void FurnaceGUI::initSystemPresets() {
       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
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "PC + Sound Blaster Pro 2", {
-      DIV_SYSTEM_OPL3, 64, 0, 0,
+      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
       DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "PC + Sound Blaster Pro 2 (drums mode)", {
-      DIV_SYSTEM_OPL3_DRUMS, 64, 0, 0,
+      CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, ""),
       DIV_SYSTEM_PCM_DAC, 64, 0, 44099|(15<<16)|(1<<20),
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      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)
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
@@ -810,225 +714,192 @@ void FurnaceGUI::initSystemPresets() {
       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, // ""
-      DIV_SYSTEM_PCSPKR, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 64, 0, ""),
     }
   );
   ENTRY(
     "Sharp X1", {
       DIV_SYSTEM_AY8910, 64, 0, 3,
-      0
     }
   );
   ENTRY(
     "Sharp X1 + FM Addon", {
       DIV_SYSTEM_AY8910, 64, 0, 3,
       DIV_SYSTEM_YM2151, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "Sharp X68000", {
       DIV_SYSTEM_YM2151, 64, 0, 2,
-      DIV_SYSTEM_MSM6258, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_MSM6258, 64, 0, ""),
     }
   );
   ENTRY(
     "FM Towns", {
       DIV_SYSTEM_YM2612, 64, 0, 2, // YM3438
-      DIV_SYSTEM_RF5C68, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_RF5C68, 64, 0, ""),
     }
   );
   ENTRY(
     "Commander X16", {
-      DIV_SYSTEM_VERA, 64, 0, 0,
-      DIV_SYSTEM_YM2151, 32, 0, 0,
-      0
+      CH(DIV_SYSTEM_VERA, 64, 0, ""),
+      CH(DIV_SYSTEM_YM2151, 32, 0, ""),
     }
   );
   ENTRY(
     "TI-99/4A", {
       DIV_SYSTEM_SMS, 64, 0, 0x182, // SN94624 447KHz
-      0
     }
   );
+  */
   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)", {
-      DIV_SYSTEM_YM2151, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2203 (OPN)", {
       DIV_SYSTEM_OPN, 64, 0, 3,
-      0
     }
   );
   ENTRY(
     "Yamaha YM2203 (extended channel 3)", {
       DIV_SYSTEM_OPN_EXT, 64, 0, 3,
-      0
     }
   );
   ENTRY(
     "Yamaha YM2608 (OPNA)", {
-      DIV_SYSTEM_PC98, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PC98, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2608 (extended channel 3)", {
-      DIV_SYSTEM_PC98_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PC98_EXT, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2610 (OPNB)", {
-      DIV_SYSTEM_YM2610_FULL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2610 (extended channel 2)", {
-      DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2610B (OPNB2)", {
-      DIV_SYSTEM_YM2610B, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610B, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2610B (extended channel 3)", {
-      DIV_SYSTEM_YM2610B_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2612 (OPN2)", {
       DIV_SYSTEM_YM2612, 64, 0, (int)0x80000000,
-      0
     }
   );
   ENTRY(
     "Yamaha YM2612 (extended channel 3)", {
       DIV_SYSTEM_YM2612_EXT, 64, 0, (int)0x80000000,
-      0
     }
   );
   ENTRY(
     "Yamaha YM2612 (OPN2) with DualPCM", {
       DIV_SYSTEM_YM2612_FRAC, 64, 0, (int)0x80000000,
-      0
     }
   );
   ENTRY(
     "Yamaha YM2612 (extended channel 3) with DualPCM", {
       DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, (int)0x80000000,
-      0
     }
   );
   ENTRY(
     "Yamaha YM2413 (OPLL)", {
-      DIV_SYSTEM_OPLL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2413 (drums mode)", {
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM2414 (OPZ)", {
-      DIV_SYSTEM_OPZ, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPZ, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3438 (OPN2C)", {
-      DIV_SYSTEM_YM2612, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3438 (extended channel 3)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3438 (OPN2C) with DualPCM", {
-      DIV_SYSTEM_YM2612_FRAC, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612_FRAC, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3438 (extended channel 3) with DualPCM", {
-      DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3526 (OPL)", {
-      DIV_SYSTEM_OPL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3526 (drums mode)", {
-      DIV_SYSTEM_OPL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha Y8950", {
-      DIV_SYSTEM_Y8950, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_Y8950, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha Y8950 (drums mode)", {
-      DIV_SYSTEM_Y8950_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3812 (OPL2)", {
-      DIV_SYSTEM_OPL2, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL2, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YM3812 (drums mode)", {
-      DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YMF262 (OPL3)", {
-      DIV_SYSTEM_OPL3, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YMF262 (drums mode)", {
-      DIV_SYSTEM_OPL3_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, ""),
     }
   );
   if (settings.hiddenSystems) {
     ENTRY(
       "Yamaha YMU759 (MA-2)", {
-        DIV_SYSTEM_YMU759, 64, 0, 0,
+        CH(DIV_SYSTEM_YMU759, 64, 0, ""),
         0
       }
     );
@@ -1039,110 +910,92 @@ void FurnaceGUI::initSystemPresets() {
   ENTRY(
     "TI SN76489", {
       DIV_SYSTEM_SMS, 64, 0, 4,
-      0
     }
   );
   ENTRY(
     "TI SN76489A", {
       DIV_SYSTEM_SMS, 64, 0, 0x40,
-      0
     }
   );
   ENTRY(
     "TI SN76496", {
       DIV_SYSTEM_SMS, 64, 0, 0x44,
-      0
     }
   );
   ENTRY(
     "NCR 8496", {
       DIV_SYSTEM_SMS, 64, 0, 0x48,
-      0
     }
   );
   ENTRY(
     "Tandy PSSJ 3-voice sound", {
       DIV_SYSTEM_SMS, 64, 0, 0x4c,
       // 8 bit DAC
-      0
     }
   );
   ENTRY(
     "Sega PSG (SN76489-like)", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
     }
   );
   ENTRY(
     "Sega PSG (SN76489-like, Stereo)", {
       DIV_SYSTEM_SMS, 64, 0, 0xc,
-      0
     }
   );
   ENTRY(
     "TI SN94624", {
       DIV_SYSTEM_SMS, 64, 0, 0x182,
-      0
     }
   );
   ENTRY(
     "TI SN76494", {
       DIV_SYSTEM_SMS, 64, 0, 0x186,
-      0
     }
   );
   ENTRY(
     "Toshiba T6W28", {
-      DIV_SYSTEM_T6W28, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_T6W28, 64, 0, ""),
     }
   );
   ENTRY(
     "AY-3-8910", {
-      DIV_SYSTEM_AY8910, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8910, 64, 0, ""),
     }
   );
   ENTRY(
     "AY-3-8914", {
       DIV_SYSTEM_AY8910, 64, 0, 48,
-      0
     }
   );
   ENTRY(
     "Yamaha YM2149(F)", {
       DIV_SYSTEM_AY8910, 64, 0, 16,
-      0
     }
   );
   ENTRY(
     "Philips SAA1099", {
-      DIV_SYSTEM_SAA1099, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SAA1099, 64, 0, ""),
     }
   );
   ENTRY(
     "PC Speaker", {
-      DIV_SYSTEM_PCSPKR, 32, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCSPKR, 32, 0, ""),
     }
   );
   ENTRY(
     "Commodore VIC", {
       DIV_SYSTEM_VIC20, 64, 0, 1,
-      0
     }
   );
   ENTRY(
     "OKI MSM5232", {
-      DIV_SYSTEM_MSM5232, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_MSM5232, 64, 0, ""),
     }
   );
   ENTRY(
     "Pong", {
-      DIV_SYSTEM_PONG, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PONG, 64, 0, ""),
     }
   );
   CATEGORY_END;
@@ -1150,62 +1003,52 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Sample","chips/systems which use PCM or ADPCM samples for sound synthesis.");
   ENTRY(
     "Amiga", {
-      DIV_SYSTEM_AMIGA, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AMIGA, 64, 0, ""),
     }
   );
   ENTRY(
     "SegaPCM", {
-      DIV_SYSTEM_SEGAPCM, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SEGAPCM, 64, 0, ""),
     }
   );
   ENTRY(
     "Capcom QSound", {
-      DIV_SYSTEM_QSOUND, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_QSOUND, 64, 0, ""),
     }
   );
   ENTRY(
     "Seta/Allumer X1-010", {
-      DIV_SYSTEM_X1_010, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
     }
   );
   ENTRY(
     "Yamaha YMZ280B (PCMD8)", {
-      DIV_SYSTEM_YMZ280B, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
     }
   );
   ENTRY(
     "Ricoh RF5C68", {
-      DIV_SYSTEM_RF5C68, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_RF5C68, 64, 0, ""),
     }
   ); 
   ENTRY(
     "OKI MSM6258", {
-      DIV_SYSTEM_MSM6258, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_MSM6258, 64, 0, ""),
     }
   );
   ENTRY(
     "OKI MSM6295", {
-      DIV_SYSTEM_MSM6295, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_MSM6295, 64, 0, ""),
     }
   );
   ENTRY(
     "SNES", {
-      DIV_SYSTEM_SNES, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SNES, 64, 0, ""),
     }
   );
   ENTRY(
     "Generic PCM DAC", {
-      DIV_SYSTEM_PCM_DAC, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCM_DAC, 64, 0, ""),
     }
   );
   CATEGORY_END;
@@ -1213,80 +1056,67 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Wavetable","chips which use user-specified waveforms to generate sound.");
   ENTRY(
     "PC Engine", {
-      DIV_SYSTEM_PCE, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCE, 64, 0, ""),
     }
   );
   ENTRY(
     "Commodore PET (pseudo-wavetable)", {
-      DIV_SYSTEM_PET, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PET, 64, 0, ""),
     }
   );
   ENTRY(
     "Konami Bubble System WSG", {
-      DIV_SYSTEM_BUBSYS_WSG, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_BUBSYS_WSG, 64, 0, ""),
     }
   );
   ENTRY(
     "Konami SCC", {
-      DIV_SYSTEM_SCC, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SCC, 64, 0, ""),
     }
   );
   ENTRY(
     "Konami SCC+", {
-      DIV_SYSTEM_SCC_PLUS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SCC_PLUS, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco WSG", {
-      DIV_SYSTEM_NAMCO, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NAMCO, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco C15 (8-channel mono)", {
-      DIV_SYSTEM_NAMCO_15XX, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NAMCO_15XX, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco C30 (8-channel stereo)", {
-      DIV_SYSTEM_NAMCO_CUS30, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco 163", {
-      DIV_SYSTEM_N163, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_N163, 64, 0, ""),
     }
   );
   ENTRY(
     "Famicom Disk System (chip)", {
-      DIV_SYSTEM_FDS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_FDS, 64, 0, ""),
     }
   );
   ENTRY(
     "WonderSwan", {
-      DIV_SYSTEM_SWAN, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SWAN, 64, 0, ""),
     }
   );
   ENTRY(
     "Virtual Boy", {
-      DIV_SYSTEM_VBOY, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_VBOY, 64, 0, ""),
     }
   );
   ENTRY(
     "Seta/Allumer X1-010", {
-      DIV_SYSTEM_X1_010, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
     }
   );
   CATEGORY_END;
@@ -1295,69 +1125,59 @@ void FurnaceGUI::initSystemPresets() {
   ENTRY(
     "MOS Technology SID (6581)", {
       DIV_SYSTEM_C64_6581, 64, 0, 1,
-      0
     }
   );
   ENTRY(
     "MOS Technology SID (8580)", {
       DIV_SYSTEM_C64_8580, 64, 0, 1,
-      0
     }
   );
   ENTRY(
     "Microchip AY8930", {
-      DIV_SYSTEM_AY8930, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_AY8930, 64, 0, ""),
     }
   );
   ENTRY(
     "Game Boy", {
-      DIV_SYSTEM_GB, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_GB, 64, 0, ""),
     }
   );
   ENTRY(
     "Atari Lynx", {
-      DIV_SYSTEM_LYNX, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_LYNX, 64, 0, ""),
     }
   );
   ENTRY(
     "Atari TIA", {
-      DIV_SYSTEM_TIA, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_TIA, 64, 0, ""),
     }
   );
   ENTRY(
     "NES (Ricoh 2A03)", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
     }
   );
   ENTRY(
     "Commander X16 (VERA only)", {
-      DIV_SYSTEM_VERA, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_VERA, 64, 0, ""),
     }
   );
   ENTRY(
     "ZX Spectrum (beeper only)", {
-      DIV_SYSTEM_SFX_BEEPER, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SFX_BEEPER, 64, 0, ""),
     }
   );
   if (settings.hiddenSystems) {
     ENTRY(
       "Dummy System", {
-        DIV_SYSTEM_DUMMY, 64, 0, 0,
+        CH(DIV_SYSTEM_DUMMY, 64, 0, ""),
         0
       }
     );
   }
   ENTRY(
     "tildearrow Sound Unit", {
-      DIV_SYSTEM_SOUND_UNIT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SOUND_UNIT, 64, 0, ""),
     }
   );
   CATEGORY_END;
@@ -1365,8 +1185,7 @@ void FurnaceGUI::initSystemPresets() {
   CATEGORY_BEGIN("Arcade systems","INSERT COIN");
   ENTRY(
     "Pong", {
-      DIV_SYSTEM_PONG, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PONG, 64, 0, ""),
     }
   );
   ENTRY(
@@ -1375,136 +1194,118 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 3, // 2MHz
       DIV_SYSTEM_AY8910, 64, 0, 3, // 2MHz
       // additional sound boards, mostly software controlled DAC
-      0
     }
   );
   ENTRY(
     "Williams/Midway Y/T unit w/ADPCM sound board", {
       // ADPCM sound board
-      DIV_SYSTEM_YM2151, 64, 0, 0,
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""),
       DIV_SYSTEM_PCM_DAC, 64, 0, 15624|(7<<16), // variable via OPM timer?
-      DIV_SYSTEM_MSM6295, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_MSM6295, 64, 0, ""),
     }
   );
   ENTRY(
     "Konami Gyruss", {
-      DIV_SYSTEM_AY8910, 64, 0, 0,
-      DIV_SYSTEM_AY8910, 64, 0, 0,
-      DIV_SYSTEM_AY8910, 64, 0, 0,
-      DIV_SYSTEM_AY8910, 64, 0, 0,
-      DIV_SYSTEM_AY8910, 64, 0, 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, ""),
+      CH(DIV_SYSTEM_AY8910, 64, 0, ""),
       // additional discrete sound logics
-      0
     }
   );
   ENTRY(
     "Konami Bubble System", {
-      DIV_SYSTEM_AY8910, 64, 0, 0,
-      DIV_SYSTEM_AY8910, 64, 0, 0,
-      DIV_SYSTEM_BUBSYS_WSG, 64, 0, 0,
+      CH(DIV_SYSTEM_AY8910, 64, 0, ""),
+      CH(DIV_SYSTEM_AY8910, 64, 0, ""),
+      CH(DIV_SYSTEM_BUBSYS_WSG, 64, 0, ""),
       // VLM5030 exists but not used for music at all
-      0
     }
   );
   ENTRY(
     "Konami Battlantis", {
       DIV_SYSTEM_OPL2, 64, 0, 3, // 3MHz
       DIV_SYSTEM_OPL2, 64, 0, 3, // ""
-      0
     }
   );
   ENTRY(
     "Konami Battlantis (drums mode on first OPL2)", {
       DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // 3MHz
       DIV_SYSTEM_OPL2, 64, 0, 3, // ""
-      0
     }
   );
   ENTRY(
     "Konami Battlantis (drums mode on second OPL2)", {
       DIV_SYSTEM_OPL2, 64, 0, 3, // 3MHz
       DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // ""
-      0
     }
   );
   ENTRY(
     "Konami Battlantis (drums mode on both OPL2s)", {
       DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // 3MHz
       DIV_SYSTEM_OPL2_DRUMS, 64, 0, 3, // ""
-      0
     }
   );
   ENTRY(
     "Konami Hexion", {
       DIV_SYSTEM_SCC, 64, 0, 2, // 1.5MHz (3MHz input)
       DIV_SYSTEM_MSM6295, 64, 0, 1,
-      0
     }
   );
   ENTRY(
     "Sega Kyugo", {
       DIV_SYSTEM_AY8910, 64, 0, 14,
       DIV_SYSTEM_AY8910, 64, 0, 14,
-      0
     }
   );
   ENTRY(
     "Sega System 1", {
       DIV_SYSTEM_SMS, 64, 0, 0x42, // SN76489A 4MHz
       DIV_SYSTEM_SMS, 64, 0, 0x0141, // SN76489A 2MHz
-      0
     }
   );
   ENTRY(
     "Sega System E", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
     }
   );
   ENTRY(
     "Sega System E (with FM expansion)", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_OPLL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
     }
   );
   ENTRY(
     "Sega System E (with FM expansion in drums mode)", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 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
-      0
     }
   );
   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
-      0
     }
   );
   ENTRY(
     "Sega OutRun/X Board", {
       DIV_SYSTEM_YM2151, 64, 0, 2, // 4MHz
       DIV_SYSTEM_SEGAPCM, 64, 0, 0, // ASIC, 31.25KHz output rate
-      0
     }
   );
   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
-      0
     }
   );
   ENTRY(
@@ -1512,7 +1313,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_YM2612, 64, 0, 2, // discrete 8MHz YM3438
       DIV_SYSTEM_YM2612, 64, 0, 2, // ^^
       DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
-      0
     }
   );
   ENTRY(
@@ -1520,7 +1320,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // discrete 8MHz YM3438
       DIV_SYSTEM_YM2612, 64, 0, 2, // ^^
       DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
-      0
     }
   );
   ENTRY(
@@ -1528,7 +1327,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_YM2612, 64, 0, 2, // discrete 8MHz YM3438
       DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // ^^
       DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
-      0
     }
   );
   ENTRY(
@@ -1536,7 +1334,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // discrete 8MHz YM3438
       DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // ^^
       DIV_SYSTEM_RF5C68, 64, 0, 1, // 10MHz
-      0
     }
   );
   ENTRY(
@@ -1544,7 +1341,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_YM2612, 64, 0, 4, // discrete 8.05MHz YM3438
       DIV_SYSTEM_YM2612, 64, 0, 4, // ^^
       DIV_SYSTEM_RF5C68, 64, 0, 2, // 12.5MHz
-      0
     }
   );
   ENTRY(
@@ -1552,7 +1348,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -1560,7 +1355,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -1568,7 +1362,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -1576,62 +1369,53 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 4, // 1.5MHz
       DIV_SYSTEM_SMS, 64, 0, 0x0104, // SN76489 3MHz
       DIV_SYSTEM_SMS, 64, 0, 0x0104, // SN76489 3MHz
-      0
     }
   );
   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,
-      0
     }
   );
   ENTRY(
     "Capcom Arcade (extended channel 3 on first OPN)", {
       DIV_SYSTEM_OPN_EXT, 64, 0, 5,
       DIV_SYSTEM_OPN, 64, 0, 5,
-      0
     }
   );
   ENTRY(
     "Capcom Arcade (extended channel 3 on second OPN)", {
       DIV_SYSTEM_OPN, 64, 0, 5,
       DIV_SYSTEM_OPN_EXT, 64, 0, 5,
-      0
     }
   );
   ENTRY(
     "Capcom Arcade (extended channel 3 on both OPNs)", {
       DIV_SYSTEM_OPN_EXT, 64, 0, 5,
       DIV_SYSTEM_OPN_EXT, 64, 0, 5,
-      0
     }
   );
   ENTRY(
     "Capcom CPS-1", { 
       DIV_SYSTEM_YM2151, 64, 0, 0, // 3.58MHz
-      DIV_SYSTEM_MSM6295, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_MSM6295, 64, 0, ""),
     }
   );
   ENTRY(
     "Capcom CPS-2 (QSound)", {
-      DIV_SYSTEM_QSOUND, 64, 0, 0,
-      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
-      0
     }
   );
   ENTRY(
     "Jaleco Ginga NinkyouDen (drums mode)", {
       DIV_SYSTEM_AY8910, 64, 0, 16, // 1.79MHz
       DIV_SYSTEM_Y8950_DRUMS, 64, 0, 0, // 3.58MHz
-      0
     }
   );
   ENTRY(
@@ -1639,7 +1423,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_YM2151, 64, 0, 1, // 3.5MHz (7MHz / 2)
       DIV_SYSTEM_MSM6295, 64, 0, 2, // 4MHz
       DIV_SYSTEM_MSM6295, 64, 0, 2, // 4MHz
-      0
     }
   );
   ENTRY(
@@ -1647,7 +1430,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz; optional
       DIV_SYSTEM_MSM6295, 64, 0, 130, // 4MHz
       DIV_SYSTEM_MSM6295, 64, 0, 130, // ^^
-      0
     }
   );
   ENTRY(
@@ -1655,7 +1437,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz; optional
       DIV_SYSTEM_MSM6295, 64, 0, 130, // 4MHz
       DIV_SYSTEM_MSM6295, 64, 0, 130, // ^^
-      0
     }
   );
   ENTRY(
@@ -1663,7 +1444,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -1671,21 +1451,18 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
     "Kaneko Air Buster", {
       DIV_SYSTEM_OPN, 64, 0, 3, // 3MHz
       DIV_SYSTEM_MSM6295, 64, 0, 141, // 3MHz
-      0
     }
   );
   ENTRY(
     "Kaneko Air Buster (extended channel 3)", {
       DIV_SYSTEM_OPN_EXT, 64, 0, 3, // 3MHz
       DIV_SYSTEM_MSM6295, 64, 0, 141, // 3MHz
-      0
     }
   );
   ENTRY(
@@ -1693,19 +1470,16 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 19, // YM2149 2MHz
       DIV_SYSTEM_AY8910, 64, 0, 19, // ^^
       DIV_SYSTEM_MSM6295, 64, 0, 8, // 2MHz
-      0
     }
   );
   ENTRY(
     "Kaneko Jackie Chan", {
       DIV_SYSTEM_YMZ280B, 64, 0, 3, // 16MHz
-      0
     }
   );
   ENTRY(
     "Super Kaneko Nova System", {
       DIV_SYSTEM_YMZ280B, 64, 0, 4, // 16.67MHz (33.33MHz / 2)
-      0
     }
   );
   ENTRY(
@@ -1713,7 +1487,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
       DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
       DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
-      0
     }
   );
   ENTRY(
@@ -1721,7 +1494,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
       DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
       DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
-      0
     }
   );
   ENTRY(
@@ -1729,7 +1501,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_OPN, 64, 0, 2, // 4MHz
       DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
       DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
-      0
     }
   );
   ENTRY(
@@ -1737,78 +1508,67 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
       DIV_SYSTEM_OPN_EXT, 64, 0, 2, // 4MHz
       DIV_SYSTEM_MSM6295, 64, 0, 0, // 1MHz
-      0
     }
   );
   ENTRY(
     "Tecmo System", {
-      DIV_SYSTEM_OPL3, 64, 0, 0,
-      DIV_SYSTEM_YMZ280B, 64, 0, 0,
+      CH(DIV_SYSTEM_OPL3, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
       DIV_SYSTEM_MSM6295, 64, 0, 8, // 2MHz
-      0
     }
   );
   ENTRY(
     "Tecmo System (drums mode)", {
-      DIV_SYSTEM_OPL3_DRUMS, 64, 0, 0,
-      DIV_SYSTEM_YMZ280B, 64, 0, 0,
+      CH(DIV_SYSTEM_OPL3_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
       DIV_SYSTEM_MSM6295, 64, 0, 8, // 2MHz
-      0
     }
   );
   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
-      0
     }
   );
   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
-      0
     }
   );
   ENTRY(
     "Sunsoft Shanghai 3", {
       DIV_SYSTEM_AY8910, 64, 0, 20, // YM2149 1.5MHz
       DIV_SYSTEM_MSM6295, 64, 0, 1, // 1.056MHz
-      0
     }
   );
   ENTRY(
     "Sunsoft Arcade", {
       DIV_SYSTEM_YM2612, 64, 0, 2, // discrete YM3438 8MHz
       DIV_SYSTEM_MSM6295, 64, 0, 1, // 1.056MHz
-      0
     }
   );
   ENTRY(
     "Sunsoft Arcade (extended channel 3)", {
       DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // discrete YM3438 8MHz
       DIV_SYSTEM_MSM6295, 64, 0, 1, // 1.056MHz
-      0
     }
   );
   ENTRY(
     "Atari Klax", { 
       DIV_SYSTEM_MSM6295, 64, 0, 7, // 0.895MHz (3.579545MHz / 4)
-      0
     }
   );
   ENTRY(
     "Atari Rampart", { 
       DIV_SYSTEM_OPLL, 64, 0, 0, // 3.579545MHz
       DIV_SYSTEM_MSM6295, 64, 0, 14, // 1.193MHz (3.579545MHz / 3)
-      0
     }
   );
   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)
-      0
     }
   );
   ENTRY(
@@ -1816,35 +1576,30 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
     "Data East Karnov", {
       DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
       DIV_SYSTEM_OPL, 64, 0, 3, // 3MHz
-      0
     }
   );
   ENTRY(
     "Data East Karnov (extended channel 3)", {
       DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz
       DIV_SYSTEM_OPL, 64, 0, 3, // 3MHz
-      0
     }
   );
   ENTRY(
     "Data East Karnov (drums mode)", {
       DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 3, // 3MHz
-      0
     }
   );
   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
-      0
     }
   );
   ENTRY(
@@ -1852,7 +1607,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -1860,7 +1614,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -1868,7 +1621,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -1876,23 +1628,20 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
     "Data East PCX", {
       DIV_SYSTEM_OPN, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_PCE, 64, 0, 0,
+      CH(DIV_SYSTEM_PCE, 64, 0, ""),
       // software controlled MSM5205
-      0
     }
   );
   ENTRY(
     "Data East PCX (extended channel 3)", {
       DIV_SYSTEM_OPN_EXT, 64, 0, 5, // 1.5MHz
-      DIV_SYSTEM_PCE, 64, 0, 0,
+      CH(DIV_SYSTEM_PCE, 64, 0, ""),
       // software controlled MSM5205
-      0
     }
   );
   ENTRY(
@@ -1902,7 +1651,6 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_MSM6295, 64, 0, 0, // 1.007MHz (32.22MHz / 32)
       DIV_SYSTEM_MSM6295, 64, 0, 8, // 2.014MHz (32.22MHz / 16); optional
       // HuC6280 is for control them, internal sound isn't used
-      0
     }
   );
   ENTRY(
@@ -1912,132 +1660,113 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_MSM6295, 64, 0, 0, // 1.007MHz (32.22MHz / 32)
       DIV_SYSTEM_MSM6295, 64, 0, 8, // 2.014MHz (32.22MHz / 16); optional
       // HuC6280 is for control them, internal sound isn't used
-      0
     }
   );
   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
-      0
     }
   );
   ENTRY(
     "Data East MLC", {
       DIV_SYSTEM_YMZ280B, 64, 0, 5, // 14MHz
-      0
     }
   );
   ENTRY(
     "SNK Ikari Warriors", {
       DIV_SYSTEM_OPL, 64, 0, 2,
       DIV_SYSTEM_OPL, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Ikari Warriors (drums mode on first OPL)", {
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
       DIV_SYSTEM_OPL, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Ikari Warriors (drums mode on second OPL)", {
       DIV_SYSTEM_OPL, 64, 0, 2,
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Ikari Warriors (drums mode on both OPLs)", {
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Triple Z80", {
       DIV_SYSTEM_Y8950, 64, 0, 2,
       DIV_SYSTEM_OPL, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Triple Z80 (drums mode on Y8950)", {
       DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
       DIV_SYSTEM_OPL, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Triple Z80 (drums mode on OPL)", {
       DIV_SYSTEM_Y8950, 64, 0, 2,
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Triple Z80 (drums mode on Y8950 and OPL)", {
       DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Chopper I", {
       DIV_SYSTEM_Y8950, 64, 0, 2,
       DIV_SYSTEM_OPL2, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Chopper I (drums mode on Y8950)", {
       DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
       DIV_SYSTEM_OPL2, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Chopper I (drums mode on OPL2)", {
       DIV_SYSTEM_Y8950, 64, 0, 2,
       DIV_SYSTEM_OPL2_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Chopper I (drums mode on Y8950 and OPL2)", {
       DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
       DIV_SYSTEM_OPL2_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Touchdown Fever", {
       DIV_SYSTEM_OPL, 64, 0, 2,
       DIV_SYSTEM_Y8950, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Touchdown Fever (drums mode on OPL)", {
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
       DIV_SYSTEM_Y8950, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Touchdown Fever (drums mode on Y8950)", {
       DIV_SYSTEM_OPL, 64, 0, 2,
       DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
     "SNK Touchdown Fever (drums mode on OPL and Y8950)", {
       DIV_SYSTEM_OPL_DRUMS, 64, 0, 2,
       DIV_SYSTEM_Y8950_DRUMS, 64, 0, 2,
-      0
     }
   );
   ENTRY(
@@ -2045,7 +1774,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -2053,7 +1781,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -2061,7 +1788,6 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
@@ -2069,19 +1795,16 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
     "Neo Geo MVS", {
-      DIV_SYSTEM_YM2610_FULL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610_FULL, 64, 0, ""),
     }
   );
   ENTRY(
     "Neo Geo MVS (extended channel 2)", {
-      DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610_FULL_EXT, 64, 0, ""),
     }
   );
   ENTRY(
@@ -2089,107 +1812,91 @@ void FurnaceGUI::initSystemPresets() {
       DIV_SYSTEM_AY8910, 64, 0, 13,
       DIV_SYSTEM_AY8910, 64, 0, 13,
       DIV_SYSTEM_AY8910, 64, 0, 13,
-      0
     }
   );
   ENTRY(
     "Namco (3-channel WSG)", { // Pac-Man, Galaga, Xevious, etc
-      DIV_SYSTEM_NAMCO, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NAMCO, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco Mappy", { // Mappy, Super Pac-Man, Libble Rabble, etc
-      DIV_SYSTEM_NAMCO_15XX, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NAMCO_15XX, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco Pac-Land", { // Pac-Land, Baraduke, Sky kid, etc
-      DIV_SYSTEM_NAMCO_CUS30, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco System 86", { // without expansion board case; Hopping Mappy, etc
-      DIV_SYSTEM_YM2151, 64, 0, 0,
-      DIV_SYSTEM_NAMCO_CUS30, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""),
+      CH(DIV_SYSTEM_NAMCO_CUS30, 64, 0, ""),
     }
   );
   ENTRY(
     "Namco Thunder Ceptor", {
-      DIV_SYSTEM_YM2151, 64, 0, 0,
-      DIV_SYSTEM_NAMCO_CUS30, 64, 0, 0,
+      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?
-      0
     }
   );
   ENTRY(
     "Namco System 1", {
-      DIV_SYSTEM_YM2151, 64, 0, 0,
-      DIV_SYSTEM_NAMCO_CUS30, 64, 0, 0,
+      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), // ""
-      0
     }
   );
   ENTRY(
     "Taito Arcade", {
-      DIV_SYSTEM_YM2610B, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610B, 64, 0, ""),
     }
   );
   ENTRY(
     "Taito Arcade (extended channel 3)", {
-      DIV_SYSTEM_YM2610B_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, ""),
     }
   );
   ENTRY(
     "Seta 1", {
-      DIV_SYSTEM_X1_010, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
     }
   );
   ENTRY(
     "Seta 1 + FM addon", {
-      DIV_SYSTEM_X1_010, 64, 0, 0,
+      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
       DIV_SYSTEM_YM2612, 64, 0, 2, // Discrete YM3438
-      0
     }
   );
   ENTRY(
     "Seta 1 + FM addon (extended channel 3)", {
-      DIV_SYSTEM_X1_010, 64, 0, 0,
+      CH(DIV_SYSTEM_X1_010, 64, 0, ""),
       DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // Discrete YM3438
-      0
     }
   );
   ENTRY(
     "Seta 2", {
       DIV_SYSTEM_X1_010, 64, 0, 1,
-      0
     }
   );
   ENTRY(
     "Cave 68000", {
-      DIV_SYSTEM_YMZ280B, 64, 0, 0,
-      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
-      0
     }
   );
   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
-      0
     }
   );
   ENTRY(
@@ -2198,56 +1905,48 @@ void FurnaceGUI::initSystemPresets() {
       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
-      0
     }
   );
   ENTRY(
     "Toaplan 1", {
       DIV_SYSTEM_OPL2, 64, 0, 5, // 3.5MHz
-      0
     }
   );
   ENTRY(
     "Toaplan 1 (drums mode)", {
       DIV_SYSTEM_OPL2_DRUMS, 64, 0, 5, // 3.5MHz
-      0
     }
   );
   ENTRY(
     "Dynax/Nakanihon 3rd generation hardware", {
       DIV_SYSTEM_AY8910, 64, 0, 0, // AY or YM, optional - 1.79MHz or 3.58MHz; various per game
-      DIV_SYSTEM_OPLL, 64, 0, 0,
+      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
       DIV_SYSTEM_MSM6295, 64, 0, 6, // 1.023MHz mostly
-      0
     }
   );
   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
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""),
       DIV_SYSTEM_MSM6295, 64, 0, 6, // 1.023MHz mostly
-      0
     }
   );
   ENTRY(
     "Dynax/Nakanihon Real Break", {
-      DIV_SYSTEM_OPLL, 64, 0, 0,
-      DIV_SYSTEM_YMZ280B, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
     }
   );
   ENTRY(
     "Dynax/Nakanihon Real Break (drums mode)", {
-      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
-      DIV_SYSTEM_YMZ280B, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_OPLL_DRUMS, 64, 0, ""),
+      CH(DIV_SYSTEM_YMZ280B, 64, 0, ""),
     }
   );
   ENTRY(
     "Irem M72", {
-      DIV_SYSTEM_YM2151, 64, 0, 0,
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""),
       DIV_SYSTEM_PCM_DAC, 64, 0, 7811|(7<<16),
-      0
     }
   );
   CATEGORY_END;
@@ -2255,95 +1954,82 @@ void FurnaceGUI::initSystemPresets() {
   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", {
-      DIV_SYSTEM_YM2612, 64, 0, 0,
-      DIV_SYSTEM_SMS, 32, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, ""),
     }
   );
   ENTRY(
     "Sega Genesis (extended channel 3)", {
-      DIV_SYSTEM_YM2612_EXT, 64, 0, 0,
-      DIV_SYSTEM_SMS, 32, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2612_EXT, 64, 0, ""),
+      CH(DIV_SYSTEM_SMS, 32, 0, ""),
     }
   );
   ENTRY(
     "Sega Master System", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
     }
   );
   ENTRY(
     "Sega Master System (with FM expansion)", {
-      DIV_SYSTEM_SMS, 64, 0, 0,
-      DIV_SYSTEM_OPLL, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_SMS, 64, 0, ""),
+      CH(DIV_SYSTEM_OPLL, 64, 0, ""),
     }
   );
   ENTRY(
     "Game Boy", {
-      DIV_SYSTEM_GB, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_GB, 64, 0, ""),
     }
   );
   ENTRY(
     "NEC PC Engine/TurboGrafx-16", {
-      DIV_SYSTEM_PCE, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_PCE, 64, 0, ""),
     }
   );
   ENTRY(
     "NES", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
     }
   );
   ENTRY(
     "Famicom with Konami VRC7", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_VRC7, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_VRC7, 64, 0, ""),
     }
   );
   ENTRY(
     "Famicom Disk System", {
-      DIV_SYSTEM_NES, 64, 0, 0,
-      DIV_SYSTEM_FDS, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_NES, 64, 0, ""),
+      CH(DIV_SYSTEM_FDS, 64, 0, ""),
     }
   );
   ENTRY(
     "Commodore 64 (6581 SID)", {
       DIV_SYSTEM_C64_6581, 64, 0, 1,
-      0
     }
   );
   ENTRY(
     "Commodore 64 (8580 SID)", {
       DIV_SYSTEM_C64_8580, 64, 0, 1,
-      0
     }
   );
   ENTRY(
     "Arcade (YM2151 and SegaPCM)", {
-      DIV_SYSTEM_YM2151, 64, 0, 0,
-      DIV_SYSTEM_SEGAPCM_COMPAT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2151, 64, 0, ""),
+      CH(DIV_SYSTEM_SEGAPCM_COMPAT, 64, 0, ""),
     }
   );
   ENTRY(
     "Neo Geo CD", {
-      DIV_SYSTEM_YM2610, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610, 64, 0, ""),
     }
   );
   ENTRY(
     "Neo Geo CD (extended channel 2)", {
-      DIV_SYSTEM_YM2610_EXT, 64, 0, 0,
-      0
+      CH(DIV_SYSTEM_YM2610_EXT, 64, 0, ""),
     }
   );
   CATEGORY_END;
+  */
 }
 
 FurnaceGUISysDef::FurnaceGUISysDef(const char* n, std::initializer_list<int> def):