1 files changed, 34 insertions, 27 deletions

diff --git a/utils/gen_adldata/file_formats/load_bnk2.h b/utils/gen_adldata/file_formats/load_bnk2.h
index 072712c..46ba604 100644
--- a/utils/gen_adldata/file_formats/load_bnk2.h
+++ b/utils/gen_adldata/file_formats/load_bnk2.h
@@ -8,9 +8,10 @@ inline int stdstoi(const std::string& str)
     return std::atoi(str.c_str());
 }
 
-static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
-                     const std::string &melo_filter,
-                     const std::string &perc_filter)
+bool BankFormats::LoadBNK2(BanksDump &db, const char *fn, unsigned bank,
+                           const std::string &bankTitle, const char *prefix,
+                           const std::string &melo_filter,
+                           const std::string &perc_filter)
 {
     #ifdef HARD_BANKS
     writeIni("AdLibGold", fn, prefix, bank, INI_Both, melo_filter.c_str(), perc_filter.c_str());
@@ -28,6 +29,10 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
     }
     std::fclose(fp);
 
+    size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Generic);
+    BanksDump::MidiBank bnkMelodic;
+    BanksDump::MidiBank bnkPercussion;
+
     unsigned short ins_entries = *(unsigned short *)&data[28 + 2 + 10];
     unsigned char *records = &data[48];
 
@@ -47,13 +52,24 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
         }
 
         int gmno = 0;
+        int patchId = 0;
+        bool isPercussion = false;
         if(name.substr(0, melo_filter.size()) == melo_filter)
-            gmno = stdstoi(name.substr(melo_filter.size()));
+        {
+            gmno = patchId = stdstoi(name.substr(melo_filter.size()));
+            isPercussion = false;
+        }
         else if(name.substr(0, perc_filter.size()) == perc_filter)
-            gmno = stdstoi(name.substr(perc_filter.size())) + 128;
+        {
+            patchId = stdstoi(name.substr(perc_filter.size()));
+            gmno = patchId + 128;
+            isPercussion = true;
+        }
         else
             continue;
 
+        BanksDump::MidiBank &bnk = isPercussion ? bnkPercussion : bnkMelodic;
+
         const unsigned char *insdata = &data[size_t(offset2)];
         const unsigned char *ops[4] = { insdata + 0, insdata + 6, insdata + 12, insdata + 18 };
         unsigned char C4xxxFFFC = insdata[24];
@@ -64,7 +80,10 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
         char name2[512];
         sprintf(name2, "%s%c%u", prefix, (gmno & 128) ? 'P' : 'M', gmno & 127);
 
-        struct insdata tmp[2];
+        BanksDump::InstrumentEntry inst;
+        BanksDump::Operator opsD[5];
+
+        InstBuffer tmp[2];
         for(unsigned a = 0; a < 2; ++a)
         {
             tmp[a].data[0] = ops[a * 2 + 0][0];
@@ -77,42 +96,30 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
             tmp[a].data[7] = ops[a * 2 + 1][4] & 0x07;
             tmp[a].data[8] = ops[a * 2 + 0][1];
             tmp[a].data[9] = ops[a * 2 + 1][1];
-            tmp[a].finetune = (int8_t)TTTTTTTT;
-            tmp[a].diff = false;
+            db.toOps(tmp[a].d, opsD, a * 2);
         }
         tmp[0].data[10] = C4xxxFFFC & 0x0F;
         tmp[1].data[10] = (tmp[0].data[10] & 0x0E) | (C4xxxFFFC >> 7);
 
-        ins tmp2;
-        tmp2.notenum = (gmno & 128) ? 35 : 0;
-        tmp2.pseudo4op = false;
-        tmp2.real4op = false;
-        tmp2.voice2_fine_tune = 0.0;
-        tmp2.midi_velocity_offset = 0;
-        tmp2.rhythmModeDrum = 0;
+        inst.setFbConn(C4xxxFFFC & 0x0F, (tmp[0].data[10] & 0x0E) | (C4xxxFFFC >> 7));
+        inst.noteOffset1 = (int8_t)TTTTTTTT;
+        inst.percussionKeyNumber = (gmno & 128) ? 35 : 0;
 
         if(xxP24NNN & 8)
         {
             // dual-op
-            tmp2.real4op = true;
-            tmp[1].diff = true;
-            size_t resno = InsertIns(tmp[0], tmp[1], tmp2, std::string(1, '\377') + name, name2);
-            SetBank(bank, (unsigned int)gmno, resno);
+            inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_4op;
+            db.addInstrument(bnk, patchId, inst, opsD, fn);
         }
         else
         {
             // single-op
-            size_t resno = InsertIns(tmp[0], tmp2, std::string(1, '\377') + name, name2);
-            SetBank(bank, (unsigned int)gmno, resno);
+            db.addInstrument(bnk, patchId, inst, opsD, fn);
         }
     }
 
-    AdlBankSetup setup;
-    setup.volumeModel = VOLUME_Generic;
-    setup.deepTremolo = false;
-    setup.deepVibrato = false;
-    setup.scaleModulators = false;
-    SetBankSetup(bank, setup);
+    db.addMidiBank(bankDb, false, bnkMelodic);
+    db.addMidiBank(bankDb, true, bnkPercussion);
 
     return true;
 }