From 6f35a1b2b84ab6cfc5d77fd46d5e31887a1590e1 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Fri, 30 Dec 2011 17:55:58 +0000
Subject: instruments can load their patch'es drummaps automatic setting of
 drummap according to patch this is turned off when the user manually changes
 the drummap TODO: let him turn it on again moved
 MidiTrack::read/writeOurDrummap out to helper.cpp extended xg.idf and gs.idf
 to ship the drummaps

still work in progress, but should be usable and stable, though incomplete
---
 muse2/share/instruments/gs.idf | 367 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 367 insertions(+)

(limited to 'muse2/share/instruments/gs.idf')

diff --git a/muse2/share/instruments/gs.idf b/muse2/share/instruments/gs.idf
index 3368b7c9..1e8a54c0 100644
--- a/muse2/share/instruments/gs.idf
+++ b/muse2/share/instruments/gs.idf
@@ -214,5 +214,372 @@
     <Controller name="DrumChorusSend" type="NRPN" h="30" l="pitch" />
     <Controller name="Pitch" type="Pitch" />
     <Controller name="Program" type="Program" />
+    <Drummaps>
+      <entry>
+        <patch_collection hbank="127" prog="0-7" />
+        <drummap>
+          <entry pitch="27"> <name>High Q</name> </entry>
+          <entry pitch="28"> <name>Slap</name> </entry>
+          <entry pitch="29"> <name>Scratch Push</name> </entry>
+          <entry pitch="30"> <name>Scratch Pull</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Kick Drum 2</name> </entry>
+          <entry pitch="36"> <name>Kick Drum 1</name> </entry>
+          <entry pitch="38"> <name>Snare Drum 1</name> </entry>
+          <entry pitch="40"> <name>Snare Drum 2</name> </entry>
+          <entry pitch="41"> <name>Low Tom 2</name> </entry>
+          <entry pitch="43"> <name>Low Tom 1</name> </entry>
+          <entry pitch="45"> <name>Mid Tom 2</name> </entry>
+          <entry pitch="47"> <name>Mid Tom 1</name> </entry>
+          <entry pitch="48"> <name>High Tom 2</name> </entry>
+          <entry pitch="50"> <name>High Tom 1</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="8-15" />
+        <drummap>
+          <entry pitch="27"> <name>High Q</name> </entry>
+          <entry pitch="28"> <name>Slap</name> </entry>
+          <entry pitch="29"> <name>Scratch Push</name> </entry>
+          <entry pitch="30"> <name>Scratch Pull</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Kick Drum 2</name> </entry>
+          <entry pitch="36"> <name>Kick Drum 1</name> </entry>
+          <entry pitch="38"> <name>Snare Drum 1</name> </entry>
+          <entry pitch="40"> <name>Snare Drum 2</name> </entry>
+          <entry pitch="41"> <name>Room Low Tom 2</name> </entry>
+          <entry pitch="43"> <name>Room Low Tom 1</name> </entry>
+          <entry pitch="45"> <name>Room Mid Tom 2</name> </entry>
+          <entry pitch="47"> <name>Room Mid Tom 1</name> </entry>
+          <entry pitch="48"> <name>Room High Tom 2</name> </entry>
+          <entry pitch="50"> <name>Room High Tom 1</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="16-23" />
+        <drummap>
+          <entry pitch="27"> <name>High Q</name> </entry>
+          <entry pitch="28"> <name>Slap</name> </entry>
+          <entry pitch="29"> <name>Scratch Push</name> </entry>
+          <entry pitch="30"> <name>Scratch Pull</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Kick Drum 2</name> </entry>
+          <entry pitch="36"> <name>Mondo Kick</name> </entry>
+          <entry pitch="38"> <name>Gated Snare</name> </entry>
+          <entry pitch="40"> <name>Snare Drum 2</name> </entry>
+          <entry pitch="41"> <name>Room Low Tom 2</name> </entry>
+          <entry pitch="43"> <name>Room Low Tom 1</name> </entry>
+          <entry pitch="45"> <name>Room Mid Tom 2</name> </entry>
+          <entry pitch="47"> <name>Room Mid Tom 1</name> </entry>
+          <entry pitch="48"> <name>Room High Tom 2</name> </entry>
+          <entry pitch="50"> <name>Room High Tom 1</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="24" />
+        <drummap>
+          <entry pitch="27"> <name>High Q</name> </entry>
+          <entry pitch="28"> <name>Slap</name> </entry>
+          <entry pitch="29"> <name>Scratch Push</name> </entry>
+          <entry pitch="30"> <name>Scratch Pull</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Kick Drum 2</name> </entry>
+          <entry pitch="36"> <name>Elec. Bass Drum</name> </entry>
+          <entry pitch="38"> <name>Elec. Snare</name> </entry>
+          <entry pitch="40"> <name>Gated Snare</name> </entry>
+          <entry pitch="41"> <name>Elec. Low Tom 2</name> </entry>
+          <entry pitch="43"> <name>Elec. Low Tom 1</name> </entry>
+          <entry pitch="45"> <name>Elec. Mid Tom 2</name> </entry>
+          <entry pitch="47"> <name>Elec. Mid Tom 1</name> </entry>
+          <entry pitch="48"> <name>Elec. High Tom 2</name> </entry>
+          <entry pitch="50"> <name>Elec. High Tom 1</name> </entry>
+          <entry pitch="52"> <name>Reverse Cymbal</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="25-31" />
+        <drummap>
+          <entry pitch="27"> <name>High Q</name> </entry>
+          <entry pitch="28"> <name>Slap</name> </entry>
+          <entry pitch="29"> <name>Scratch Push</name> </entry>
+          <entry pitch="30"> <name>Scratch Pull</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Kick Drum 2</name> </entry>
+          <entry pitch="36"> <name>808 Bass Drum</name> </entry>
+          <entry pitch="37"> <name>808 Rim Shot</name> </entry>
+          <entry pitch="38"> <name>808 Snare Drum</name> </entry>
+          <entry pitch="40"> <name>Snare Drum 2</name> </entry>
+          <entry pitch="41"> <name>808 Low Tom 2</name> </entry>
+          <entry pitch="42"> <name>808 Closed Hi-Hat</name> </entry>
+          <entry pitch="43"> <name>808 Low Tom 1</name> </entry>
+          <entry pitch="44"> <name>808 Pedal Hi-Hat</name> </entry>
+          <entry pitch="45"> <name>808 Tom 2</name> </entry>
+          <entry pitch="46"> <name>808 Open Hi-Hat</name> </entry>
+          <entry pitch="47"> <name>808 Mid Tom 1</name> </entry>
+          <entry pitch="48"> <name>808 High Tom 2</name> </entry>
+          <entry pitch="49"> <name>808 Cymbal</name> </entry>
+          <entry pitch="50"> <name>808 High Tom 1</name> </entry>
+          <entry pitch="52"> <name>Reverse Cymbal</name> </entry>
+          <entry pitch="56"> <name>808 Cowbell</name> </entry>
+          <entry pitch="62"> <name>808 High Conga</name> </entry>
+          <entry pitch="63"> <name>808 Mid Conga</name> </entry>
+          <entry pitch="64"> <name>808 Low Conga</name> </entry>
+          <entry pitch="70"> <name>808 Maracas</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="32-39" />
+        <drummap>
+          <entry pitch="27"> <name>High Q</name> </entry>
+          <entry pitch="28"> <name>Slap</name> </entry>
+          <entry pitch="29"> <name>Scratch Push</name> </entry>
+          <entry pitch="30"> <name>Scratch Pull</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Jazz Bass Drum 2</name> </entry>
+          <entry pitch="36"> <name>Jazz Bass Drum 1</name> </entry>
+          <entry pitch="38"> <name>Snare Drum 1</name> </entry>
+          <entry pitch="40"> <name>Snare Drum 2</name> </entry>
+          <entry pitch="41"> <name>Low Tom 2</name> </entry>
+          <entry pitch="43"> <name>Low Tom 1</name> </entry>
+          <entry pitch="45"> <name>Mid Tom 2</name> </entry>
+          <entry pitch="47"> <name>Mid Tom 1</name> </entry>
+          <entry pitch="48"> <name>High Tom 2</name> </entry>
+          <entry pitch="50"> <name>High Tom 1</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="40-47" />
+        <drummap>
+          <entry pitch="27"> <name>High Q</name> </entry>
+          <entry pitch="28"> <name>Slap</name> </entry>
+          <entry pitch="29"> <name>Scratch Push</name> </entry>
+          <entry pitch="30"> <name>Scratch Pull</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Jazz Bass Drum 2</name> </entry>
+          <entry pitch="36"> <name>Jazz Bass Drum 1</name> </entry>
+          <entry pitch="38"> <name>Brush Tap</name> </entry>
+          <entry pitch="39"> <name>Brush Slap</name> </entry>
+          <entry pitch="40"> <name>Brush Swirl</name> </entry>
+          <entry pitch="41"> <name>Low Tom 2</name> </entry>
+          <entry pitch="43"> <name>Low Tom 1</name> </entry>
+          <entry pitch="45"> <name>Mid Tom 2</name> </entry>
+          <entry pitch="47"> <name>Mid Tom 1</name> </entry>
+          <entry pitch="48"> <name>High Tom 2</name> </entry>
+          <entry pitch="50"> <name>High Tom 1</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="48-55" />
+        <drummap>
+          <entry pitch="27"> <name>Closed Hi-Hat</name> </entry>
+          <entry pitch="28"> <name>Pedal Hi-Hat</name> </entry>
+          <entry pitch="29"> <name>Open Hi-Hat</name> </entry>
+          <entry pitch="30"> <name>Ride Cymbal</name> </entry>
+          <entry pitch="31"> <name>Sticks</name> </entry>
+          <entry pitch="32"> <name>Square Click</name> </entry>
+          <entry pitch="33"> <name>Metronome Click</name> </entry>
+          <entry pitch="34"> <name>Metronome Bell</name> </entry>
+          <entry pitch="35"> <name>Concert Bass Drum 2</name> </entry>
+          <entry pitch="36"> <name>Concert Bass Drum 1</name> </entry>
+          <entry pitch="38"> <name>Concert Snare Drum</name> </entry>
+          <entry pitch="39"> <name>Castanets</name> </entry>
+          <entry pitch="40"> <name>Concert Snare Drum</name> </entry>
+          <entry pitch="41"> <name>Timpani F</name> </entry>
+          <entry pitch="42"> <name>Timpani F#</name> </entry>
+          <entry pitch="43"> <name>Timpani G</name> </entry>
+          <entry pitch="44"> <name>Timpani G#</name> </entry>
+          <entry pitch="45"> <name>Timpani A</name> </entry>
+          <entry pitch="46"> <name>Timpani A#</name> </entry>
+          <entry pitch="47"> <name>Timpani B</name> </entry>
+          <entry pitch="48"> <name>Timpani C</name> </entry>
+          <entry pitch="49"> <name>Timpani C#</name> </entry>
+          <entry pitch="50"> <name>Timpani D</name> </entry>
+          <entry pitch="51"> <name>Timpani D#</name> </entry>
+          <entry pitch="52"> <name>Timpani E</name> </entry>
+          <entry pitch="53"> <name>Timpani F</name> </entry>
+          <entry pitch="57"> <name>Concert Cymbal 2</name> </entry>
+          <entry pitch="59"> <name>Concert Cymbal 1</name> </entry>
+          <entry pitch="82"> <name>Shaker</name> </entry>
+          <entry pitch="83"> <name>Jingle Bell</name> </entry>
+          <entry pitch="84"> <name>Belltree</name> </entry>
+          <entry pitch="85"> <name>Castanets</name> </entry>
+          <entry pitch="86"> <name>Mute Surdo</name> </entry>
+          <entry pitch="87"> <name>Open Surdo</name> </entry>
+        </drummap>
+      </entry>
+
+      <entry>
+        <patch_collection hbank="127" prog="56-126" />
+        <drummap>
+          <entry pitch="35"> <name></name> </entry>
+          <entry pitch="36"> <name></name> </entry>
+          <entry pitch="37"> <name></name> </entry>
+          <entry pitch="38"> <name></name> </entry>
+          <entry pitch="39"> <name>High Q</name> </entry>
+          <entry pitch="40"> <name>Slap</name> </entry>
+          <entry pitch="41"> <name>Scratch Push</name> </entry>
+          <entry pitch="42"> <name>Scratch Pull</name> </entry>
+          <entry pitch="43"> <name>Sticks</name> </entry>
+          <entry pitch="44"> <name>Square Click</name> </entry>
+          <entry pitch="45"> <name>Metronome Click</name> </entry>
+          <entry pitch="46"> <name>Metronome Bell</name> </entry>
+          <entry pitch="47"> <name>Guitar Fret Noise</name> </entry>
+          <entry pitch="48"> <name>Guitar Cut Noise Up</name> </entry>
+          <entry pitch="49"> <name>Guitar Cut Noise Down</name> </entry>
+          <entry pitch="50"> <name>Double Bass String Slap</name> </entry>
+          <entry pitch="51"> <name>Flute Key Click</name> </entry>
+          <entry pitch="52"> <name>Laughing</name> </entry>
+          <entry pitch="53"> <name>Screaming</name> </entry>
+          <entry pitch="54"> <name>Punch</name> </entry>
+          <entry pitch="55"> <name>Heartbeat</name> </entry>
+          <entry pitch="56"> <name>Footsteps 1</name> </entry>
+          <entry pitch="57"> <name>Footsteps 2</name> </entry>
+          <entry pitch="58"> <name>Applause</name> </entry>
+          <entry pitch="59"> <name>Door Creaking</name> </entry>
+          <entry pitch="60"> <name>Door Closing</name> </entry>
+          <entry pitch="61"> <name>Scratch</name> </entry>
+          <entry pitch="62"> <name>Wind Chimes</name> </entry>
+          <entry pitch="63"> <name>Car Engine</name> </entry>
+          <entry pitch="64"> <name>Car Brakes</name> </entry>
+          <entry pitch="65"> <name>Car Passing</name> </entry>
+          <entry pitch="66"> <name>Car Crash</name> </entry>
+          <entry pitch="67"> <name>Siren</name> </entry>
+          <entry pitch="68"> <name>Train</name> </entry>
+          <entry pitch="69"> <name>Jet Plane</name> </entry>
+          <entry pitch="70"> <name>Helicopter</name> </entry>
+          <entry pitch="71"> <name>Starship</name> </entry>
+          <entry pitch="72"> <name>Gun Shot</name> </entry>
+          <entry pitch="73"> <name>Machine Gun</name> </entry>
+          <entry pitch="74"> <name>Laser Gun</name> </entry>
+          <entry pitch="75"> <name>Explosion</name> </entry>
+          <entry pitch="76"> <name>Dog Bark</name> </entry>
+          <entry pitch="77"> <name>Horse Gallop</name> </entry>
+          <entry pitch="78"> <name>Birds Tweet</name> </entry>
+          <entry pitch="79"> <name>Rain</name> </entry>
+          <entry pitch="80"> <name>Thunder</name> </entry>
+          <entry pitch="81"> <name>Wind</name> </entry>
+          <entry pitch="82"> <name>Seashore</name> </entry>
+          <entry pitch="83"> <name>Stream</name> </entry>
+          <entry pitch="84"> <name>Bubble</name> </entry>
+        </drummap>
+      </entry>
+        
+      <entry>
+        <patch_collection hbank="127" prog="127" />
+        <drummap>
+          <entry pitch="52"> <name></name> </entry>
+          <entry pitch="53"> <name></name> </entry>
+          <entry pitch="55"> <name></name> </entry>
+          <entry pitch="57"> <name></name> </entry>
+          <entry pitch="58"> <name></name> </entry>
+          <entry pitch="59"> <name></name> </entry>
+          <entry pitch="73"> <name>Quijada</name> </entry>
+          <entry pitch="74"> <name></name> </entry>
+          <entry pitch="76"> <name>Laughing</name> </entry>
+          <entry pitch="77"> <name>Screaming</name> </entry>
+          <entry pitch="78"> <name>Punch</name> </entry>
+          <entry pitch="79"> <name>Heartbeat</name> </entry>
+          <entry pitch="80"> <name>Footsteps 1</name> </entry>
+          <entry pitch="81"> <name>Footsteps 2</name> </entry>
+          <entry pitch="82"> <name>Applause</name> </entry>
+          <entry pitch="83"> <name>Door Creaking</name> </entry>
+          <entry pitch="84"> <name>Door Closing</name> </entry>
+          <entry pitch="85"> <name>Scratch</name> </entry>
+          <entry pitch="86"> <name>Wind Chimes</name> </entry>
+          <entry pitch="87"> <name>Car Engine</name> </entry>
+          <entry pitch="88"> <name>Car Brakes</name> </entry>
+          <entry pitch="89"> <name>Car Passing</name> </entry>
+          <entry pitch="90"> <name>Car Crash</name> </entry>
+          <entry pitch="91"> <name>Siren</name> </entry>
+          <entry pitch="92"> <name>Train</name> </entry>
+          <entry pitch="93"> <name>Jet Plane</name> </entry>
+          <entry pitch="94"> <name>Helicopter</name> </entry>
+          <entry pitch="95"> <name>Starship</name> </entry>
+          <entry pitch="96"> <name>Gun Shot</name> </entry>
+          <entry pitch="97"> <name>Machine Gun</name> </entry>
+          <entry pitch="98"> <name>Laser Gun</name> </entry>
+          <entry pitch="99"> <name>Explosion</name> </entry>
+          <entry pitch="100"> <name>Dog Bark</name> </entry>
+          <entry pitch="101"> <name>Horse Gallop</name> </entry>
+          <entry pitch="102"> <name>Birds Tweet</name> </entry>
+          <entry pitch="103"> <name>Rain</name> </entry>
+          <entry pitch="104"> <name>Thunder</name> </entry>
+          <entry pitch="105"> <name>Wind</name> </entry>
+          <entry pitch="106"> <name>Seashore</name> </entry>
+          <entry pitch="107"> <name>Stream</name> </entry>
+          <entry pitch="108"> <name>Bubble</name> </entry>
+        </drummap>
+      </entry>
+
   </MidiInstrument>
 </muse>
-- 
cgit v1.2.3


From 14ed268100ece710a009c287fa4d61d7254f7aa1 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Fri, 30 Dec 2011 18:51:46 +0000
Subject: fixed gs.idf

---
 muse2/muse/midiedit/scoreedit.cpp | 4 +++-
 muse2/muse/xml.cpp                | 2 +-
 muse2/share/instruments/gs.idf    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'muse2/share/instruments/gs.idf')

diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 055134e2..45ccd4d6 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4679,7 +4679,9 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *     from clipboard failed. ignoring this one... ) [ not reproducible ]
  *
  * CURRENT TODO
- *   o drum controllers
+ *   o write instrument drummaps
+ *   o GUI for editing instrument drummaps
+ *   * drum controllers
  *       update ctrlcanvas/panel
  *       test!
  *   * drum editor is buggy. propagate_drum_map may operate on old values
diff --git a/muse2/muse/xml.cpp b/muse2/muse/xml.cpp
index 45bed368..1a989366 100644
--- a/muse2/muse/xml.cpp
+++ b/muse2/muse/xml.cpp
@@ -225,7 +225,7 @@ Xml::Token Xml::parse()
       bool endFlag = false;
       nextc();
       if (c == EOF) {
-            printf("unexpected EOF reading *.med file at level %d, line %d, <%s><%s><%s>\n",
+            printf("unexpected EOF reading xml file at level %d, line %d, <%s><%s><%s>\n",
                level, _line, _tag.toLatin1().constData(), _s1.toLatin1().constData(), _s2.toLatin1().constData());
             return level == 0 ? End : Error;
             }
diff --git a/muse2/share/instruments/gs.idf b/muse2/share/instruments/gs.idf
index 1e8a54c0..9314e282 100644
--- a/muse2/share/instruments/gs.idf
+++ b/muse2/share/instruments/gs.idf
@@ -580,6 +580,6 @@
           <entry pitch="108"> <name>Bubble</name> </entry>
         </drummap>
       </entry>
-
+    </Drummaps>
   </MidiInstrument>
 </muse>
-- 
cgit v1.2.3