1 files changed, 35 insertions, 3 deletions

diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 1ca6f989..5603e449 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -64,6 +64,23 @@ class ScrollScale;
 class Splitter;
 class Toolbar1;
 
+enum DrumColumn {
+  COL_HIDE = 0,
+  COL_MUTE,
+  COL_NAME,
+  COL_VOLUME,
+  COL_QUANT,
+  COL_INPUTTRIGGER,
+  COL_NOTELENGTH,
+  COL_NOTE,
+  COL_OUTCHANNEL,
+  COL_OUTPORT,
+  COL_LEVEL1,
+  COL_LEVEL2,
+  COL_LEVEL3,
+  COL_LEVEL4,
+  COL_NONE = -1
+};
 
 //---------------------------------------------------------
 //   DrumEdit
@@ -71,7 +88,14 @@ class Toolbar1;
 
 class DrumEdit : public MidiEditor {
       Q_OBJECT
-    
+
+   public:
+      enum group_mode_t { DONT_GROUP, GROUP_SAME_CHANNEL, GROUP_MAX };
+  
+   private:
+      group_mode_t _group_mode;
+      bool _ignore_hide;
+      
       MusECore::Event selEvent;
       MusECore::MidiPart* selPart;
       int selTick;
@@ -93,13 +117,14 @@ class DrumEdit : public MidiEditor {
 
       static int _rasterInit;
       static int _dlistWidthInit, _dcanvasWidthInit;
+      static bool _ignore_hide_init;
 
       QAction *loadAction, *saveAction, *resetAction;
       QAction *cutAction, *copyAction, *copyRangeAction, *pasteAction, *pasteDialogAction, *deleteAction;
       QAction *fixedAction, *veloAction, *crescAction, *quantizeAction;
       QAction *sallAction, *snoneAction, *invAction, *inAction , *outAction;
       QAction *prevAction, *nextAction;
-
+      QAction *groupNoneAction, *groupChanAction, *groupMaxAction;
       
       void initShortcuts();
 
@@ -127,6 +152,8 @@ class DrumEdit : public MidiEditor {
       void configChanged();
       void songChanged1(int);
       void setStep(QString);
+      void updateGroupingActions();
+      void set_ignore_hide(bool);
 
    public slots:
       void setSelection(int, MusECore::Event&, MusECore::Part*);
@@ -134,8 +161,9 @@ class DrumEdit : public MidiEditor {
       void execDeliveredScript(int);
       void execUserScript(int);
       CtrlEdit* addCtrl();
-      
+      void ourDrumMapChanged(bool);
       virtual void updateHScrollRange();
+
    signals:
       void deleted(MusEGui::TopWin*);
 
@@ -146,6 +174,10 @@ class DrumEdit : public MidiEditor {
       virtual void writeStatus(int, MusECore::Xml&) const;
       static void readConfiguration(MusECore::Xml& xml);
       static void writeConfiguration(int, MusECore::Xml&);
+      
+      bool old_style_drummap_mode();
+      group_mode_t group_mode() { return _group_mode; }
+      bool ignore_hide() { return _ignore_hide; }
       };
 
 } // namespace MusEGui