From 890ee8999eaca679fa1874adf3f572f365138e29 Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Mon, 3 Oct 2011 14:02:55 +0000
Subject: drum map changes are now handled properly

---
 muse2/muse/midiedit/dcanvas.cpp  | 4 +++-
 muse2/muse/midiedit/dlist.cpp    | 9 ++++++---
 muse2/muse/midiedit/drumedit.cpp | 6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'muse2')

diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 8e2f284d..35236e87 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -977,7 +977,9 @@ void DrumCanvas::mapChanged(int spitch, int dpitch)
       }
       
       
-      song->update(SC_DRUMMAP);
+      song->update(SC_DRUMMAP); // this causes a complete rebuild of ourDrumMap
+                                // which also handles the changed order in all
+                                // other drum editors
    }
 }
 
diff --git a/muse2/muse/midiedit/dlist.cpp b/muse2/muse/midiedit/dlist.cpp
index c35f2a21..85382c4a 100644
--- a/muse2/muse/midiedit/dlist.cpp
+++ b/muse2/muse/midiedit/dlist.cpp
@@ -413,7 +413,8 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
       if (!old_style_drummap_mode && dm_old != *dm) //something changed and we're in new style mode?
         dcanvas->propagate_drummap_change(dm-ourDrumMap);
       
-      redraw();
+      song->update(SC_DRUMMAP);
+      //redraw(); //this is done by the songChanged slot
       }
 
 //---------------------------------------------------------
@@ -686,7 +687,8 @@ void DList::returnPressed()
       editor->hide();
       editEntry = 0;
       setFocus();
-      redraw();
+      song->update(SC_DRUMMAP);
+      //redraw(); //this is done by the songChanged slot
       }
 
 //---------------------------------------------------------
@@ -751,7 +753,8 @@ void DList::pitchEdited()
       pitch_editor->hide();
       editEntry = 0;
       setFocus();
-      redraw();
+      song->update(SC_DRUMMAP);
+      //redraw(); //this is done by the songChanged slot
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index ce261425..92cc765a 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -587,8 +587,12 @@ void DrumEdit::songChanged1(int bits)
             toolbar->setSolo(canvas->track()->solo());
             return;
         }      
+        if ( !old_style_drummap_mode() && 
+             ( bits & (SC_DRUMMAP | SC_TRACK_INSERTED | SC_TRACK_REMOVED | SC_TRACK_MODIFIED |
+                       SC_PART_INSERTED | SC_PART_REMOVED | SC_PART_MODIFIED) ) )
+          ((DrumCanvas*)(canvas))->rebuildOurDrumMap();
+        
         songChanged(bits);
-
       }
 
 //---------------------------------------------------------
-- 
cgit v1.2.3