summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit/dcanvas.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-09-30 16:34:40 +0000
committerFlorian Jung <flo@windfisch.org>2011-09-30 16:34:40 +0000
commit0d93b9b7a99847b19b7f0863a694e5441727419e (patch)
treeb5137ce6be250985df17db1f0455fb5fe81430f8 /muse2/muse/midiedit/dcanvas.h
parent790900244f2eca7370ebdc7d40426ff5f7178416 (diff)
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
Diffstat (limited to 'muse2/muse/midiedit/dcanvas.h')
-rw-r--r--muse2/muse/midiedit/dcanvas.h8
1 files changed, 6 insertions, 2 deletions
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<Track*> 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<Track*>& tr, int p)
+ instrument_number_mapping_t(const QSet<Track*>& 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