From 42ecd9fd47fe44c999bfd7f4f051179806735b0a Mon Sep 17 00:00:00 2001 From: terminator356 Date: Mon, 6 Jan 2014 01:06:11 -0500 Subject: Add and fix Roland SD-50 .idf by Patrick. Add GM2 .idf file created by Tim. Fixed couple of improper "&apos" xml substitutions in xml.cpp --- muse2/muse/xml.cpp | 6 +- muse2/share/instruments/Roland SD-50.idf | 510 +++++++++++++-------------- muse2/share/instruments/gm2.idf | 576 +++++++++++++++++++++++++++++++ 3 files changed, 834 insertions(+), 258 deletions(-) create mode 100644 muse2/share/instruments/gm2.idf diff --git a/muse2/muse/xml.cpp b/muse2/muse/xml.cpp index 6f79c3e6..c09a1da5 100644 --- a/muse2/muse/xml.cpp +++ b/muse2/muse/xml.cpp @@ -165,7 +165,7 @@ void Xml::stoken() else if (strcmp(entity, "gt") == 0) c = '>'; else if (strcmp(entity, "apos") == 0) - c = '\\'; + c = '\''; else entity[k] = c; break; @@ -400,7 +400,7 @@ Xml::Token Xml::parse() else if (strcmp(name, "gt") == 0) c = '>'; else if (strcmp(name, "apos") == 0) - c = '\\'; + c = '\''; else if (strcmp(name, "quot") == 0) c = '"'; else if (strcmp(name, "amp") == 0) @@ -660,7 +660,7 @@ void Xml::strTag(int level, const char* name, const char* val) case '&': fprintf(f, "&"); break; case '<': fprintf(f, "<"); break; case '>': fprintf(f, ">"); break; - case '\\': fprintf(f, "'"); break; + case '\'': fprintf(f, "'"); break; case '"': fprintf(f, """); break; default: fputc(*val, f); break; } diff --git a/muse2/share/instruments/Roland SD-50.idf b/muse2/share/instruments/Roland SD-50.idf index 63f9306e..e23e01ae 100644 --- a/muse2/share/instruments/Roland SD-50.idf +++ b/muse2/share/instruments/Roland SD-50.idf @@ -8,261 +8,261 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/muse2/share/instruments/gm2.idf b/muse2/share/instruments/gm2.idf new file mode 100644 index 00000000..e35fadd6 --- /dev/null +++ b/muse2/share/instruments/gm2.idf @@ -0,0 +1,576 @@ + + + + + Switch General Midi Level 2 mode on + 7e 7f 09 03 + + + + 7e 7f 09 03 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + High Q + Slap + Scratch Push [EXC7] + Scratch Pull [EXC7] + Sticks + Square Click + Metronome Click + Metronome Bell + Acoustic Bass Drum + Bass Drum 1 + Side Stick + Acoustic Snare + Hand Clap + Electric Snare + Low Floor Tom + Closed Hi-hat [EXC1] + High Floor Tom + Pedal Hi-hat [EXC1] + Low Tom + Open Hi-hat [EXC1] + Low-Mid Tom + High Mid Tom + Crash Cymbal 1 + High Tom + Ride Cymbal 1 + Chinese Cymbal + Ride Bell + Tambourine + Splash Cymbal + Cowbell + Crash Cymbal 2 + Vibra-slap + Ride Cymbal 2 + High Bongo + Low Bongo + Mute Hi Conga + Open Hi Conga + Low Conga + High Timbale + Low Timbale + High Agogo + Low Agogo + Cabasa + Maracas + Short Whistle [EXC2] + Long Whistle [EXC2] + Short Guiro [EXC3] + Long Guiro [EXC3] + Claves + Hi Wood Block + Low Wood Block + Mute Cuica [EXC4] + Open Cuica [EXC4] + Mute Triangle [EXC5] + Open Triangle [EXC5] + Shaker + Jingle Bell + Bell Tree + Castanets + Mute Surdo [EXC6] + Open Surdo [EXC6] + + + + + + Room Low Tom 2 + Room Low Tom 1 + Room Mid Tom 2 + Room Mid Tom 1 + Room Hi Tom 2 + Room Hi Tom 1 + + + + + + Power Kick Drum + Power Snare Drum + Power Low Tom 2 + Power Low Tom 1 + Power Mid Tom 2 + Power Mid Tom 1 + Power Hi Tom 2 + Power Hi Tom 1 + + + + + + Electric Bass Drum + Electric Snare 1 + Electric Snare 2 + Electric Low Tom 2 + Electric Low Tom 1 + Electric Mid Tom 2 + Electric Mid Tom 1 + Electric Hi Tom 2 + Electric Hi Tom 1 + Reverse Cymbal + + + + + + Analog Bass Drum + Analog Rim Shot + Analog Snare 1 + Analog Low Tom 2 + Analog CHH 1 [EXC1] + Analog Low Tom 1 + Analog CHH 2 [EXC1] + Analog Mid Tom 2 + Analog OHH [EXC1] + Analog Mid Tom 1 + Analog Hi Tom 2 + Analog Cymbal + Analog Hi Tom 1 + Analog Cowbell + Analog High Conga + Analog Mid Conga + Analog Low Conga + Analog Maracas + Analog Claves + + + + + + Jazz Kick 2 + Jazz Kick 1 + + + + + + JazzKick 2 + JazzKick 1 + Brush Tap + Brush Slap + Brush Swirl + + + + + + Closed Hi-hat 2 [EXC1] + Pedal Hi-hat [EXC1] + Open Hi-hat 2 [EXC1] + Ride Cymbal 1 + Concert BD 2 + Concert BD 1 + Concert SD + Castanets + Concert SD + Timpani F + Timpani F# + Timpani G + Timpani G# + Timpani A + Timpani A# + Timpani B + Timpani c + Timpani c# + Timpani d + Timpani d# + Timpani e + Timpani f + Concert Cymbal 2 + Concert Cymbal 1 + Applause + + + + + + High Q + Slap + Scratch Push [EXC7] + Scratch Pull [EXC7] + Sticks + Square Click + Metronome Click + Metronome Bell + Guitar Fret + Guitar Cutting Noise Up + Guitar Cutting Noise Down + String Slap of Double Bass + Fl. Key Click + Laughing + Scream + Punch + Heart Beat + Footsteps 1 + Footsteps 2 + Applause + Door Creaking + Door + Scratch + Wind Chimes + Car-Engine + Car-Stop + Car-Pass + Car-Crash + Siren + Train + Jetplane + Helicopter + Starship + Gun Shot + Machine Gun + Lasergun + Explosion + Dog + Horse-Gallop + Birds + Rain + Thunder + Wind + Seashore + Stream + Bubble + + + + + -- cgit v1.2.1