diff options
author | Florian Jung <flo@windfisch.org> | 2011-10-06 11:37:57 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-10-06 11:37:57 +0000 |
commit | f60ddccd6d328a5cebc4d524246e33b399a8dfdd (patch) | |
tree | c96d609c0b1e2eb6cb74b700dbb960c8cab726fd /muse2/muse/midiedit/dcanvas.h | |
parent | 421cb6dbce48a6c1044dd37e8f710b83db5d11a9 (diff) |
you can now hide and show drumlist instruments
squashed some minor bugs
Diffstat (limited to 'muse2/muse/midiedit/dcanvas.h')
-rw-r--r-- | muse2/muse/midiedit/dcanvas.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h index 9a45f6ac..8ecbdac9 100644 --- a/muse2/muse/midiedit/dcanvas.h +++ b/muse2/muse/midiedit/dcanvas.h @@ -73,6 +73,17 @@ struct instrument_number_mapping_t tracks=tr; pitch=p; } + + bool operator==(const instrument_number_mapping_t& that) //TODO maybe compare the Track* serial numbers, not the pointers themselves? + { + return (this->tracks == that.tracks && this->pitch==that.pitch); + } + + bool operator!=(const instrument_number_mapping_t& that) + { + return !operator==(that); + } + }; //--------------------------------------------------------- @@ -122,7 +133,7 @@ class DrumCanvas : public EventCanvas { signals: void newWidth(int); - void ourDrumMapChanged(); + void ourDrumMapChanged(bool /*instrumentMap changed as well?*/); private slots: void midiNote(int pitch, int velo); @@ -156,7 +167,7 @@ class DrumCanvas : public EventCanvas { int pitch_and_track_to_instrument(int pitch, Track* track); DrumMap* getOurDrumMap() { return ourDrumMap; } //FINDMICH UGLY int getOurDrumMapSize() { return instrument_map.size(); } //FINDMICH UGLY - + QVector<instrument_number_mapping_t>& get_instrument_map() { return instrument_map; } //FINDMICH UGLY void propagate_drummap_change(int instrument); //FINDMICH move to drumedit void rebuildOurDrumMap(); }; |