Improved: Instrument Editor, fFixed MANY bugs. Should be SOLID now.

Improved: Midi controller graph 'Ctrl' popup menus. 
Improved: Aftertouch and PolyAftertouch (channel/key pressure) are true MusE controllers now.
TODO: Still W.I.P. See ChangeLog

5 files changed, 41 insertions, 37 deletions

diff --git a/muse2/share/instruments/Emu-4mbgsgmmt-sf.idf b/muse2/share/instruments/Emu-4mbgsgmmt-sf.idf
index b8b312c9..39aa1be5 100644
--- a/muse2/share/instruments/Emu-4mbgsgmmt-sf.idf
+++ b/muse2/share/instruments/Emu-4mbgsgmmt-sf.idf
@@ -429,11 +429,11 @@
     <Controller name="AttackRate" type="NRPN" h="1" l="99" />
     <Controller name="DecayRate" type="NRPN" h="1" l="100" />
     <Controller name="ReleaseRate" type="NRPN" h="1" l="102" />
-    <Controller name="DrumPitchCoarseTune" type="NRPN" h="24" l="pitch" min="-64" max="63" />
-    <Controller name="DrumLevel" type="NRPN" h="26" l="pitch" />
-    <Controller name="DrumPanpot" type="NRPN" h="28" l="pitch" min="-64" max="63" init="0" />
-    <Controller name="DrumReverbSend" type="NRPN" h="29" l="pitch" />
-    <Controller name="DrumChorusSend" type="NRPN" h="30" l="pitch" />
+    <Controller name="DrumPitchCoarseTune" type="NRPN" h="24" l="pitch" min="-64" max="63" showType="1" />
+    <Controller name="DrumLevel" type="NRPN" h="26" l="pitch" showType="1" />
+    <Controller name="DrumPanpot" type="NRPN" h="28" l="pitch" min="-64" max="63" init="0" showType="1" />
+    <Controller name="DrumReverbSend" type="NRPN" h="29" l="pitch" showType="1" />
+    <Controller name="DrumChorusSend" type="NRPN" h="30" l="pitch" showType="1" />
     <Controller name="Pitch" type="Pitch" />
     <Controller name="Program" type="Program" />
   </MidiInstrument>
diff --git a/muse2/share/instruments/Roland-E28.idf b/muse2/share/instruments/Roland-E28.idf
index dd96fdd7..5d6d62d8 100644
--- a/muse2/share/instruments/Roland-E28.idf
+++ b/muse2/share/instruments/Roland-E28.idf
@@ -298,11 +298,11 @@
     <Controller name="AttackRate" type="NRPN" h="1" l="99" />
     <Controller name="DecayRate" type="NRPN" h="1" l="100" />
     <Controller name="ReleaseRate" type="NRPN" h="1" l="102" />
-    <Controller name="DrumPitchCoarseTune" type="NRPN" h="24" l="pitch" min="-64" max="63" />
-    <Controller name="DrumLevel" type="NRPN" h="26" l="pitch" />
-    <Controller name="DrumPanpot" type="NRPN" h="28" l="pitch" min="-64" max="63" />
-    <Controller name="DrumReverbSend" type="NRPN" h="29" l="pitch" />
-    <Controller name="DrumChorusSend" type="NRPN" h="30" l="pitch" />
+    <Controller name="DrumPitchCoarseTune" type="NRPN" h="24" l="pitch" min="-64" max="63" showType="1" />
+    <Controller name="DrumLevel" type="NRPN" h="26" l="pitch" showType="1" />
+    <Controller name="DrumPanpot" type="NRPN" h="28" l="pitch" min="-64" max="63" showType="1" />
+    <Controller name="DrumReverbSend" type="NRPN" h="29" l="pitch" showType="1" />
+    <Controller name="DrumChorusSend" type="NRPN" h="30" l="pitch" showType="1" />
     <Controller name="Pitch" type="Pitch" />
     <Controller name="Program" type="Program" />
   </MidiInstrument>
diff --git a/muse2/share/instruments/Yamaha-CS1x.idf b/muse2/share/instruments/Yamaha-CS1x.idf
index 41e8e16a..1c05f5be 100644
--- a/muse2/share/instruments/Yamaha-CS1x.idf
+++ b/muse2/share/instruments/Yamaha-CS1x.idf
@@ -1565,17 +1565,17 @@
     <Controller name="NRPN EG Attack Time"   type="NRPN" h="0x01" l="0x63" min="-0x40" max="0x3f" init="0x00" />
     <Controller name="NRPN EG Decay Time"    type="NRPN" h="0x01" l="0x64" min="-0x40" max="0x3f" init="0x00" />
     <Controller name="NRPN EG Release Time"  type="NRPN" h="0x01" l="0x66" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum Cutoff Freq." type="NRPN" h="0x14" l="pitch" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum Filter Res."  type="NRPN" h="0x15" l="pitch" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum AEG Atk Time" type="NRPN" h="0x16" l="pitch" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum AEG Dcy Time" type="NRPN" h="0x17" l="pitch" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum Pitch Coarse" type="NRPN" h="0x18" l="pitch" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum Pitch Fine"   type="NRPN" h="0x19" l="pitch" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum Level"        type="NRPN" h="0x1a" l="pitch" min="0x00"  max="0x7f" init="0x64" />
-    <Controller name="NRPN Drum Panpot"       type="NRPN" h="0x1c" l="pitch" min="-0x40" max="0x3f" init="0x00" />
-    <Controller name="NRPN Drum Reverb Send"  type="NRPN" h="0x1d" l="pitch" min="0x00"  max="0x7f" init="0x28" />
-    <Controller name="NRPN Drum Chorus Send"  type="NRPN" h="0x1e" l="pitch" min="0x00"  max="0x7f" init="0x00" />
-    <Controller name="NRPN Drum Var Send"     type="NRPN" h="0x1f" l="pitch" min="0x00"  max="0x7f" init="0x00" />
+    <Controller name="NRPN Drum Cutoff Freq." type="NRPN" h="0x14" l="pitch" min="-0x40" max="0x3f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum Filter Res."  type="NRPN" h="0x15" l="pitch" min="-0x40" max="0x3f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum AEG Atk Time" type="NRPN" h="0x16" l="pitch" min="-0x40" max="0x3f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum AEG Dcy Time" type="NRPN" h="0x17" l="pitch" min="-0x40" max="0x3f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum Pitch Coarse" type="NRPN" h="0x18" l="pitch" min="-0x40" max="0x3f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum Pitch Fine"   type="NRPN" h="0x19" l="pitch" min="-0x40" max="0x3f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum Level"        type="NRPN" h="0x1a" l="pitch" min="0x00"  max="0x7f" init="0x64" showType="1" />
+    <Controller name="NRPN Drum Panpot"       type="NRPN" h="0x1c" l="pitch" min="-0x40" max="0x3f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum Reverb Send"  type="NRPN" h="0x1d" l="pitch" min="0x00"  max="0x7f" init="0x28" showType="1" />
+    <Controller name="NRPN Drum Chorus Send"  type="NRPN" h="0x1e" l="pitch" min="0x00"  max="0x7f" init="0x00" showType="1" />
+    <Controller name="NRPN Drum Var Send"     type="NRPN" h="0x1f" l="pitch" min="0x00"  max="0x7f" init="0x00" showType="1" />
     <Controller name="RPN Pitch Bend Sens."   type="RPN"   h="0x00" l="0x00" min="0x00" max="0x18" init="0x02" />
     <Controller name="RPN Master Coarse Tune" type="RPN"   h="0x00" l="0x02" min="0x28" max="0x58" init="0x40" />
     <Controller name="RPN Master Fine Tune"   type="RPN14" h="0x00" l="0x01" min="0x0000" max="0x7f7f" init="0x4000" />
diff --git a/muse2/share/instruments/gs.idf b/muse2/share/instruments/gs.idf
index 873cbd18..0e0bca78 100644
--- a/muse2/share/instruments/gs.idf
+++ b/muse2/share/instruments/gs.idf
@@ -223,13 +223,15 @@
     <Controller name="AttackRate" type="NRPN" h="1" l="99" />
     <Controller name="DecayRate" type="NRPN" h="1" l="100" />
     <Controller name="ReleaseRate" type="NRPN" h="1" l="102" />
-    <Controller name="DrumPitchCoarseTune" type="NRPN" h="24" l="pitch" min="-64" max="63" />
-    <Controller name="DrumLevel" type="NRPN" h="26" l="pitch" />
-    <Controller name="DrumPanpot" type="NRPN" h="28" l="pitch" min="-64" max="63" init="0" />
-    <Controller name="DrumReverbSend" type="NRPN" h="29" l="pitch" />
-    <Controller name="DrumChorusSend" type="NRPN" h="30" l="pitch" />
+    <Controller name="DrumPitchCoarseTune" type="NRPN" h="24" l="pitch" min="-64" max="63" showType="1" />
+    <Controller name="DrumLevel" type="NRPN" h="26" l="pitch" showType="1" />
+    <Controller name="DrumPanpot" type="NRPN" h="28" l="pitch" min="-64" max="63" init="0" showType="1" />
+    <Controller name="DrumReverbSend" type="NRPN" h="29" l="pitch" showType="1" />
+    <Controller name="DrumChorusSend" type="NRPN" h="30" l="pitch" showType="1" />
     <Controller name="Pitch" type="Pitch" />
     <Controller name="Program" type="Program" />
+    <Controller name="PolyAftertouch" type="PolyAftertouch" />
+    <Controller name="Aftertouch" type="Aftertouch" />
     <Drummaps>
       <entry>
         <patch_collection hbank="127" prog="0-7" />
diff --git a/muse2/share/instruments/xg.idf b/muse2/share/instruments/xg.idf
index 6d597d38..4d169a94 100644
--- a/muse2/share/instruments/xg.idf
+++ b/muse2/share/instruments/xg.idf
@@ -605,19 +605,21 @@
     <Controller name="EG AttackTime" type="NRPN" h="1" l="99" />
     <Controller name="EG DecayTime" type="NRPN" h="1" l="100" />
     <Controller name="EG Release" type="NRPN" h="1" l="102" />
-    <Controller name="Drum FilterCutoffFreq" type="NRPN" h="20" l="pitch" />
-    <Controller name="Drum FilterResonance" type="NRPN" h="21" l="pitch" />
-    <Controller name="Drum EG AttackRate" type="NRPN" h="22" l="pitch" />
-    <Controller name="Drum EG DecayRage" type="NRPN" h="23" l="pitch" />
-    <Controller name="Drum Pitch Coarse" type="NRPN" h="24" l="pitch" min="-64" max="63" />
-    <Controller name="Drum Pitch Fine" type="NRPN" h="25" l="pitch" min="-64" max="63" />
-    <Controller name="Drum Level" type="NRPN" h="26" l="pitch" />
-    <Controller name="Drum Pan" type="NRPN" h="28" l="pitch" min="-64" max="63" />
-    <Controller name="Drum ReverbSendLevel" type="NRPN" h="29" l="pitch" />
-    <Controller name="Drum ChorusSendLevel" type="NRPN" h="30" l="pitch" />
-    <Controller name="Drum VariationSendLev" type="NRPN" h="31" l="pitch" />
+    <Controller name="Drum FilterCutoffFreq" type="NRPN" h="20" l="pitch" showType="1" />
+    <Controller name="Drum FilterResonance" type="NRPN" h="21" l="pitch" showType="1" />
+    <Controller name="Drum EG AttackRate" type="NRPN" h="22" l="pitch" showType="1" />
+    <Controller name="Drum EG DecayRage" type="NRPN" h="23" l="pitch" showType="1" />
+    <Controller name="Drum Pitch Coarse" type="NRPN" h="24" l="pitch" min="-64" max="63" showType="1" />
+    <Controller name="Drum Pitch Fine" type="NRPN" h="25" l="pitch" min="-64" max="63" showType="1" />
+    <Controller name="Drum Level" type="NRPN" h="26" l="pitch" showType="1" />
+    <Controller name="Drum Pan" type="NRPN" h="28" l="pitch" min="-64" max="63" showType="1" />
+    <Controller name="Drum ReverbSendLevel" type="NRPN" h="29" l="pitch" showType="1" />
+    <Controller name="Drum ChorusSendLevel" type="NRPN" h="30" l="pitch" showType="1" />
+    <Controller name="Drum VariationSendLev" type="NRPN" h="31" l="pitch" showType="1" />
     <Controller name="Pitch" type="Pitch" />
     <Controller name="Program" type="Program" />
+    <Controller name="PolyAftertouch" type="PolyAftertouch" />
+    <Controller name="Aftertouch" type="Aftertouch" />
 
     <Drummaps>
       <entry>