summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit/dcanvas.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-09 16:02:35 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-09 16:02:35 +0000
commit9a4a4ee6fd5c2a73216240da912f7273aacaa11e (patch)
tree9f7b2aa792d292d45d0bc670a47e4d4329b92f6d /muse2/muse/midiedit/dcanvas.cpp
parent159a2b58fd28c7a00b9b723dcea77e6c2ec2e874 (diff)
recording and importing midi now works for new style drum tracks plus
fixes for old-style drum tracks
Diffstat (limited to 'muse2/muse/midiedit/dcanvas.cpp')
-rw-r--r--muse2/muse/midiedit/dcanvas.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 22db70d0..7daaff29 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -1306,13 +1306,17 @@ int DrumCanvas::pitch_and_track_to_instrument(int pitch, MusECore::Track* track)
return -1;
}
-void DrumCanvas::propagate_drummap_change(int instr)
+void DrumCanvas::propagate_drummap_change(int instr, bool update_druminmap)
{
const QSet<MusECore::Track*>& tracks=instrument_map[instr].tracks;
int index=instrument_map[instr].pitch;
for (QSet<MusECore::Track*>::const_iterator it = tracks.begin(); it != tracks.end(); it++)
+ {
dynamic_cast<MusECore::MidiTrack*>(*it)->drummap()[index] = ourDrumMap[instr];
+ if (update_druminmap)
+ dynamic_cast<MusECore::MidiTrack*>(*it)->update_drum_in_map();
+ }
}