Update libOPNMIDI: Fixed bank switching logic

Author: Wohlstand

OPNMIDI-Player/src/main/cpp/src/opnmidi_opn2.cpp

@@ -557,10 +557,22 @@ void OPN2::setPan(size_t c, uint8_t value)
 
 void OPN2::silenceAll() // Silence all OPL channels.
 {
+    size_t      chip;
+    uint8_t     port;
+    uint32_t    cc;
+
     for(size_t c = 0; c < m_numChannels; ++c)
     {
+        getOpnChannel(c, chip, port, cc);
+
         noteOff(c);
         touchNote(c, 0);
+
+        for(uint8_t op = 0; op < 4; op++)
+        {
+            writeRegI(chip, port, 0x30 + (0x10 * 1) + (op * 4) + cc, 0x7F);
+            writeRegI(chip, port, 0x30 + (0x10 * 5) + (op * 4) + cc, 0xFF);
+        }
     }
 }
 
@@ -629,7 +641,7 @@ void OPN2::clearChips()
 
 void OPN2::reset(int emulator, unsigned long PCM_RATE, OPNFamily family, void *audioTickHandler)
 {
-    bool rebuild_needed = m_curState.cmp(emulator, m_numChips);
+    bool rebuild_needed = m_curState.cmp(emulator, m_numChips, family);
 
     if(rebuild_needed)
         clearChips();
@@ -646,10 +658,10 @@ void OPN2::reset(int emulator, unsigned long PCM_RATE, OPNFamily family, void *a
     const struct OpnTimbre defaultInsCache =
     {
         {
-            {0, 0, 0, 0, 0, 0, 0},
-            {0, 0, 0, 0, 0, 0, 0},
-            {0, 0, 0, 0, 0, 0, 0},
-            {0, 0, 0, 0, 0, 0, 0}
+            {0, 0x7F, 0, 0, 0, 0xFF, 0},
+            {0, 0x7F, 0, 0, 0, 0xFF, 0},
+            {0, 0x7F, 0, 0, 0, 0xFF, 0},
+            {0, 0x7F, 0, 0, 0, 0xFF, 0}
         }, 0, 0, 0
     };
 

OPNMIDI-Player/src/main/cpp/src/opnmidi_opn2.hpp

@@ -74,6 +74,7 @@ class OPN2
         int         emulator;
         uint32_t    numChips;
         unsigned long pcm_rate;
+        OPNFamily   familyType;
 
         State()
         {
@@ -85,6 +86,7 @@ class OPN2
             emulator = -2;
             numChips = 0;
             pcm_rate = 0;
+            familyType = OPNChip_OPN2;
         }
 
         bool cmp_rate(unsigned long rate)
@@ -97,14 +99,15 @@ class OPN2
             return ret;
         }
 
-        bool cmp(int emu, uint32_t chips)
+        bool cmp(int emu, uint32_t chips, OPNFamily family)
         {
-            bool ret = emu != emulator || chips != numChips;
+            bool ret = emu != emulator || chips != numChips || family != familyType;
 
             if(ret)
             {
                 emulator = emu;
                 numChips = chips;
+                familyType = family;
             }
 
             return ret;