From 6d181986beeacc4508aa6c3df71b8b56f6acfd0a Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Sun, 25 Dec 2011 20:02:44 +0000
Subject: disallowed mixing old-style and new-style drum tracks in one editor

---
 muse2/muse/midiedit/drumedit.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'muse2/muse/midiedit/drumedit.h')

diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 59590d34..5bdd54a8 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -96,6 +96,7 @@ class DrumEdit : public MidiEditor {
    private:
       group_mode_t _group_mode;
       bool _ignore_hide;
+      bool _old_style_drummap_mode;
       
       MusECore::Event selEvent;
       MusECore::MidiPart* selPart;
@@ -135,7 +136,7 @@ class DrumEdit : public MidiEditor {
 
       void setHeaderToolTips();
       void setHeaderWhatsThis();
-
+      
    private slots:
       void setRaster(int);
       void noteinfoChanged(MusEGui::NoteInfo::ValType type, int val);
@@ -159,6 +160,8 @@ class DrumEdit : public MidiEditor {
       void hideAllInstruments();
       void hideUnusedInstruments();
       void hideEmptyInstruments();
+      
+      void display_old_new_conflict_message();
 
    public slots:
       void setSelection(int, MusECore::Event&, MusECore::Part*);
@@ -180,7 +183,7 @@ class DrumEdit : public MidiEditor {
       static void readConfiguration(MusECore::Xml& xml);
       static void writeConfiguration(int, MusECore::Xml&);
       
-      bool old_style_drummap_mode();
+      bool old_style_drummap_mode() { return _old_style_drummap_mode; }
       group_mode_t group_mode() { return _group_mode; }
       bool ignore_hide() { return _ignore_hide; }
       
-- 
cgit v1.2.3