1 files changed, 8 insertions, 181 deletions
diff --git a/src/gen_adldata/gen_adldata.cc b/src/gen_adldata/gen_adldata.cc
index f48532a..245bb38 100644
--- a/src/gen_adldata/gen_adldata.cc
+++ b/src/gen_adldata/gen_adldata.cc
@@ -10,191 +10,13 @@
 #include <map>
 #include <set>
 
+#include "midi_inst_list.h"
+
 std::map<unsigned,
     std::map<unsigned, unsigned>
         > Correlate;
 unsigned maxvalues[30] = { 0 };
 
-static const char *const MidiInsName[] = {
-"AcouGrandPiano",
-"BrightAcouGrand",
-"ElecGrandPiano",
-"Honky-tonkPiano",
-"Rhodes Piano",
-"Chorused Piano",
-"Harpsichord",
-"Clavinet",
-"Celesta",
-"Glockenspiel",
-"Music box",
-"Vibraphone",
-"Marimba",
-"Xylophone",
-"Tubular Bells",
-"Dulcimer",
-"Hammond Organ",
-"Percussive Organ",
-"Rock Organ",
-"Church Organ",
-"Reed Organ",
-"Accordion",
-"Harmonica",
-"Tango Accordion",
-"Acoustic Guitar1",
-"Acoustic Guitar2",
-"Electric Guitar1",
-"Electric Guitar2",
-"Electric Guitar3",
-"Overdrive Guitar",
-"Distorton Guitar",
-"Guitar Harmonics",
-"Acoustic Bass",
-"Electric Bass 1",
-"Electric Bass 2",
-"Fretless Bass",
-"Slap Bass 1",
-"Slap Bass 2",
-"Synth Bass 1",
-"Synth Bass 2",
-"Violin",
-"Viola",
-"Cello",
-"Contrabass",
-"Tremulo Strings",
-"Pizzicato String",
-"Orchestral Harp",
-"Timpany",
-"String Ensemble1",
-"String Ensemble2",
-"Synth Strings 1",
-"SynthStrings 2",
-"Choir Aahs",
-"Voice Oohs",
-"Synth Voice",
-"Orchestra Hit",
-"Trumpet",
-"Trombone",
-"Tuba",
-"Muted Trumpet",
-"French Horn",
-"Brass Section",
-"Synth Brass 1",
-"Synth Brass 2",
-"Soprano Sax",
-"Alto Sax",
-"Tenor Sax",
-"Baritone Sax",
-"Oboe",
-"English Horn",
-"Bassoon",
-"Clarinet",
-"Piccolo",
-"Flute",
-"Recorder",
-"Pan Flute",
-"Bottle Blow",
-"Shakuhachi",
-"Whistle",
-"Ocarina",
-"Lead 1 squareea",
-"Lead 2 sawtooth",
-"Lead 3 calliope",
-"Lead 4 chiff",
-"Lead 5 charang",
-"Lead 6 voice",
-"Lead 7 fifths",
-"Lead 8 brass",
-"Pad 1 new age",
-"Pad 2 warm",
-"Pad 3 polysynth",
-"Pad 4 choir",
-"Pad 5 bowedpad",
-"Pad 6 metallic",
-"Pad 7 halo",
-"Pad 8 sweep",
-"FX 1 rain",
-"FX 2 soundtrack",
-"FX 3 crystal",
-"FX 4 atmosphere",
-"FX 5 brightness",
-"FX 6 goblins",
-"FX 7 echoes",
-"FX 8 sci-fi",
-"Sitar",
-"Banjo",
-"Shamisen",
-"Koto",
-"Kalimba",
-"Bagpipe",
-"Fiddle",
-"Shanai",
-"Tinkle Bell",
-"Agogo Bells",
-"Steel Drums",
-"Woodblock",
-"Taiko Drum",
-"Melodic Tom",
-"Synth Drum",
-"Reverse Cymbal",
-"Guitar FretNoise",
-"Breath Noise",
-"Seashore",
-"Bird Tweet",
-"Telephone",
-"Helicopter",
-"Applause/Noise",
-"Gunshot",
-// 27..34:  High Q; Slap; Scratch Push; Scratch Pull; Sticks;
-//          Square Click; Metronome Click; Metronome Bell
-"Ac Bass Drum",
-"Bass Drum 1",
-"Side Stick",
-"Acoustic Snare",
-"Hand Clap",
-"Electric Snare",
-"Low Floor Tom",
-"Closed High Hat",
-"High Floor Tom",
-"Pedal High Hat",
-"Low Tom",
-"Open High Hat",
-"Low-Mid Tom",
-"High-Mid Tom",
-"Crash Cymbal 1",
-"High Tom",
-"Ride Cymbal 1",
-"Chinese Cymbal",
-"Ride Bell",
-"Tambourine",
-"Splash Cymbal",
-"Cow Bell",
-"Crash Cymbal 2",
-"Vibraslap",
-"Ride Cymbal 2",
-"High Bongo",
-"Low Bongo",
-"Mute High Conga",
-"Open High Conga",
-"Low Conga",
-"High Timbale",
-"Low Timbale",
-"High Agogo",
-"Low Agogo",
-"Cabasa",
-"Maracas",
-"Short Whistle",
-"Long Whistle",
-"Short Guiro",
-"Long Guiro",
-"Claves",
-"High Wood Block",
-"Low Wood Block",
-"Mute Cuica",
-"Open Cuica",
-"Mute Triangle",
-"Open Triangle",
-"Shaker","Jingle Bell","Bell Tree","Castanets","Mute Surdu","Open Surdu",""};
-
 struct insdata
 {
     unsigned char data[11];
@@ -1278,6 +1100,10 @@ int main()
     LoadTMB("fm_banks/tmb_files/swtimbr.tmb",  63, "sw");
 
     LoadDoom("fm_banks/raptor/genmidi.op2", 64, "rapt");
+	
+	LoadIBK("fm_banks/ibk_files/my-gmopl.ibk", 		65, "b65M", false);
+    LoadIBK("fm_banks/ibk_files/my-gmopldrums.IBK", 65, "b65P", true);
+	
     //LoadBNK("bnk_files/grassman1.bnk", 63, "b63", false);
     //LoadBNK("bnk_files/grassman2.bnk", 64, "b64", false);
 
@@ -1355,7 +1181,8 @@ int main()
      "OP3 (Wallace 2op set, Nitemare 3D :: melodic only)",
      "TMB (Duke Nukem 3D)",
      "TMB (Shadow Warrior)",
-     "DMX (Raptor)"
+     "DMX (Raptor)",
+	 "SB (Modded GMOPL by Wohlstand)"
     };
 
 #if 0