diff options
Diffstat (limited to 'muse2')
-rw-r--r-- | muse2/muse/midiedit/drumedit.cpp | 8 | ||||
-rw-r--r-- | muse2/muse/midiedit/drummap.cpp | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index 4015bbc1..8f6d09ee 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -1470,7 +1470,7 @@ void DrumEdit::showAllInstruments() track->drummap_hidden()[i]=false; } - ((DrumCanvas*)(canvas))->rebuildOurDrumMap(); + MusEGlobal::song->update(SC_DRUMMAP); } void DrumEdit::hideAllInstruments() @@ -1489,7 +1489,7 @@ void DrumEdit::hideAllInstruments() track->drummap_hidden()[i]=true; } - ((DrumCanvas*)(canvas))->rebuildOurDrumMap(); + MusEGlobal::song->update(SC_DRUMMAP); } void DrumEdit::hideUnusedInstruments() @@ -1522,7 +1522,7 @@ void DrumEdit::hideUnusedInstruments() track->drummap_hidden()[i]=hide[i]; } - ((DrumCanvas*)(canvas))->rebuildOurDrumMap(); + MusEGlobal::song->update(SC_DRUMMAP); } void DrumEdit::hideEmptyInstruments() @@ -1555,7 +1555,7 @@ void DrumEdit::hideEmptyInstruments() track->drummap_hidden()[i]=hide[i]; } - ((DrumCanvas*)(canvas))->rebuildOurDrumMap(); + MusEGlobal::song->update(SC_DRUMMAP); } diff --git a/muse2/muse/midiedit/drummap.cpp b/muse2/muse/midiedit/drummap.cpp index 47232011..2705a252 100644 --- a/muse2/muse/midiedit/drummap.cpp +++ b/muse2/muse/midiedit/drummap.cpp @@ -314,11 +314,10 @@ void resetGMDrumMap() // operator == //--------------------------------------------------------- -//bool const DrumMap::operator==(const DrumMap& map) const bool DrumMap::operator==(const DrumMap& map) const { return - (name == map.name) + name == map.name && vol == map.vol && quant == map.quant && len == map.len |