From 0d93b9b7a99847b19b7f0863a694e5441727419e Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Fri, 30 Sep 2011 16:34:40 +0000 Subject: added dedicated drummap to tracks (only relevant for new-style-drumtracks) propagating ourDrumMap changes to track's drummaps changed volume percent limit from 200 to 999 cleaned up a bit --- muse2/muse/midiedit/dcanvas.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'muse2/muse/midiedit/dcanvas.h') diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h index c02c5442..736b63b3 100644 --- a/muse2/muse/midiedit/dcanvas.h +++ b/muse2/muse/midiedit/dcanvas.h @@ -60,17 +60,20 @@ struct instrument_number_mapping_t { QSet tracks; int pitch; + int track_dlist_index; instrument_number_mapping_t() { pitch=-1; + track_dlist_index=-1; tracks.clear(); } - instrument_number_mapping_t(const QSet& tr, int p) + instrument_number_mapping_t(const QSet& tr, int p, int i) { tracks=tr; pitch=p; + track_dlist_index=i; } }; @@ -154,10 +157,11 @@ class DrumCanvas : public EventCanvas { virtual void keyPress(QKeyEvent* event); Event *getEventAtCursorPos(); void selectCursorEvent(Event *ev); - int drum_map_size() { return instrument_map.size(); } int pitch_and_track_to_instrument(int pitch, Track* track); DrumMap* getOurDrumMap() { return ourDrumMap; } //FINDMICH UGLY int getOurDrumMapSize() { return instrument_map.size(); } //FINDMICH UGLY + + void propagate_drummap_change(int instrument); //FINDMICH move to drumedit }; #endif -- cgit v1.2.3