From 3377ade9e6ae78ecc680dd9d0c9641a98bd3db96 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 14 Nov 2022 13:35:11 -0500
Subject: [PATCH] convert presets to new format, part 3

---
 papers/doc/7-systems/ym2612.md |  2 --
 src/gui/about.cpp              |  1 -
 src/gui/presets.cpp            | 22 +++++++++++-----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/papers/doc/7-systems/ym2612.md b/papers/doc/7-systems/ym2612.md
index 56b1a3b1..ac17cedc 100644
--- a/papers/doc/7-systems/ym2612.md
+++ b/papers/doc/7-systems/ym2612.md
@@ -2,8 +2,6 @@
 
 one of two chips that powered the Sega Genesis. It is a six-channel, four-operator FM synthesizer. Channel #6 can be turned into 8-bit PCM player.
 
-For 0.6pre1, Furnace can now support advanced YM2612 features that  [Fractal](https://gitlab.com/Natsumi/Fractal-Sound) sound driver adds: two software-mixed PCM channels (variable pitch, sample offsets, max 13.7 khz rate) and CSM - ch3 special mode feature that can be abused to produce rudimentary speech synthesis.
-
 # effects
 
 - `10xy`: set LFO parameters.
diff --git a/src/gui/about.cpp b/src/gui/about.cpp
index 6d8aeaee..924f2c0c 100644
--- a/src/gui/about.cpp
+++ b/src/gui/about.cpp
@@ -155,7 +155,6 @@ const char* aboutLine[]={
   "MSM6295 emulator by cam900",
   "",
   "greetings to:",
-  "Fractal Sound team",
   "NEOART Costa Rica",
   "all members of Deflers of Noice!",
   "",
diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index 4566c568..7a11ceef 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -25,12 +25,14 @@
 // every entry is written in the following format:
 //   cat.systems.push_back(FurnaceGUISysDef(
 //     "System Name", {
-//      DIV_SYSTEM_???, Volume, Panning, Flags,
-//      DIV_SYSTEM_???, Volume, Panning, Flags,
+//      CH(DIV_SYSTEM_???, Volume, Panning, Flags),
+//      CH(DIV_SYSTEM_???, Volume, Panning, Flags),
 //      ...
-//      0
 //    }
 //  ));
+// flags are a string of new line-separated values.
+
+#define CH FurnaceGUISysDefChip
 
 void FurnaceGUI::initSystemPresets() {
   sysCategories.clear();
@@ -40,27 +42,25 @@ void FurnaceGUI::initSystemPresets() {
   cat=FurnaceGUISysCategory("Game consoles","let's play some chiptune making games!");
   cat.systems.push_back(FurnaceGUISysDef(
     "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, "")
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
     "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, "")
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "Sega Genesis (Fractal Sound template)", {
+    "Sega Genesis (DualPCM)", {
       DIV_SYSTEM_YM2612_FRAC, 64, 0, 0,
       DIV_SYSTEM_SMS, 32, 0, 0,
       0
     }
   ));
   cat.systems.push_back(FurnaceGUISysDef(
-    "Sega Genesis (Fractal Sound template, extended channel 3)", {
+    "Sega Genesis (DualPCM, extended channel 3)", {
       DIV_SYSTEM_YM2612_FRAC_EXT, 64, 0, 0,
       DIV_SYSTEM_SMS, 32, 0, 0,
       0