From db2ebc49307bcc9762456209594ec2f95540425d Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Fri, 13 May 2022 03:18:14 -0500
Subject: [PATCH] OPNA: improvements

---
 src/engine/engine.cpp          | 8 +++++---
 src/engine/platform/ym2608.cpp | 2 --
 src/engine/sysDef.cpp          | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 99e41313..320425c7 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -1612,7 +1612,9 @@ int DivEngine::addInstrument(int refChan) {
     *ins=song.nullInsQSound;
   }
   ins->name=fmt::sprintf("Instrument %d",insCount);
-  ins->type=prefType;
+  if (prefType!=DIV_INS_NULL) {
+    ins->type=prefType;
+  }
   saveLock.lock();
   song.ins.push_back(ins);
   song.insLen=insCount+1;
@@ -2310,9 +2312,9 @@ void DivEngine::autoNoteOn(int ch, int ins, int note, int vol) {
 
   // 1. check which channels are viable for this instrument
   DivInstrument* insInst=getIns(ins);
-  if (getPreferInsType(finalChan)!=insInst->type && getPreferInsSecondType(finalChan)!=insInst->type) notInViableChannel=true;
+  if (getPreferInsType(finalChan)!=insInst->type && getPreferInsSecondType(finalChan)!=insInst->type && getPreferInsType(finalChan)!=DIV_INS_NULL) notInViableChannel=true;
   for (int i=0; i<chans; i++) {
-    if (ins==-1 || ins>=song.insLen || getPreferInsType(i)==insInst->type || getPreferInsSecondType(i)==insInst->type) {
+    if (ins==-1 || ins>=song.insLen || getPreferInsType(i)==insInst->type || (getPreferInsType(i)==DIV_INS_NULL && finalChanType==DIV_CH_NOISE) || getPreferInsSecondType(i)==insInst->type) {
       if (insInst->type==DIV_INS_OPL) {
         if (insInst->fm.ops==2 || getChannelType(i)==DIV_CH_OP) {
           isViable[i]=true;
diff --git a/src/engine/platform/ym2608.cpp b/src/engine/platform/ym2608.cpp
index ae32c0eb..31ecba9c 100644
--- a/src/engine/platform/ym2608.cpp
+++ b/src/engine/platform/ym2608.cpp
@@ -762,7 +762,6 @@ int DivPlatformYM2608::dispatch(DivCommand c) {
             int end=s->offB+s->lengthB-1;
             immWrite(0x104,(end>>5)&0xff);
             immWrite(0x105,(end>>13)&0xff);
-            printf("sample want\n");
             immWrite(0x101,(isMuted[c.chan]?0:(chan[c.chan].pan<<6))|2);
             immWrite(0x100,(s->loopStart>=0)?0xb0:0xa0); // start/repeat
             if (c.value!=DIV_NOTE_NULL) {
@@ -1442,7 +1441,6 @@ int DivPlatformYM2608::init(DivEngine* p, int channels, int sugRate, unsigned in
   fm=new ymfm::ym2608(iface);
   fm->set_fidelity(ymfm::OPN_FIDELITY_MIN);
   rate=fm->sample_rate(chipClock);
-  printf("rate: %d\n",rate);
   for (int i=0; i<16; i++) {
     oscBuf[i]->rate=rate;
   }
diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp
index 93478989..3621c77e 100644
--- a/src/engine/sysDef.cpp
+++ b/src/engine/sysDef.cpp
@@ -1274,7 +1274,10 @@ void DivEngine::registerSystems() {
     {"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "Square 1", "Square 2", "Square 3", "Kick", "Snare", "Top", "HiHat", "Tom", "Rim", "ADPCM"},
     {"F1", "F2", "F3", "F4", "F5", "F6", "S1", "S2", "S3", "BD", "SD", "TP", "HH", "TM", "RM", "P"},
     {DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_FM, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_NOISE, DIV_CH_PCM},
-    {DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_AY, DIV_INS_AY, DIV_INS_AY, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA, DIV_INS_AMIGA}
+    {DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_FM, DIV_INS_AY, DIV_INS_AY, DIV_INS_AY, DIV_INS_NULL, DIV_INS_NULL, DIV_INS_NULL, DIV_INS_NULL, DIV_INS_NULL, DIV_INS_NULL, DIV_INS_AMIGA},
+    {},
+    fmHardResetEffectHandler,
+    fmPostEffectHandler
   );
 
   sysDefs[DIV_SYSTEM_OPL]=new DivSysDef(