diff options
author | Florian Jung <flo@windfisch.org> | 2011-10-13 14:37:39 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-10-13 14:37:39 +0000 |
commit | 1c547a97cf011a07fa7269df343820470856dd36 (patch) | |
tree | 94554ba4aa1a4d8c91470b3705dc1ba169ace670 /muse2 | |
parent | d3a9aa4568b325c183b758f6d05a1af4a457b245 (diff) |
Song::remapPortDrumCtrlEvents() now also processes hidden events
Diffstat (limited to 'muse2')
-rw-r--r-- | muse2/muse/instruments/minstrument.cpp | 8 | ||||
-rw-r--r-- | muse2/muse/song.cpp | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/muse2/muse/instruments/minstrument.cpp b/muse2/muse/instruments/minstrument.cpp index 8e8bb6c3..c479ebc6 100644 --- a/muse2/muse/instruments/minstrument.cpp +++ b/muse2/muse/instruments/minstrument.cpp @@ -932,14 +932,14 @@ QString MidiInstrument::getPatchName(int channel, int prog, MType mode, bool dru return "<unknown>"; } -//--------------------------------------------------------- -// populatePatchPopup -//--------------------------------------------------------- - } // namespace MusECore namespace MusEGui { +//--------------------------------------------------------- +// populatePatchPopup +//--------------------------------------------------------- + void populatePatchPopup(MusECore::MidiInstrument* midiInstrument, PopupMenu* menu, int chan, MType songType, bool drum) { menu->clear(); diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp index c9efe288..98ad007a 100644 --- a/muse2/muse/song.cpp +++ b/muse2/muse/song.cpp @@ -635,9 +635,10 @@ void Song::remapPortDrumCtrlEvents(int mapidx, int newnote, int newchan, int new { const Event& ev = ie->second; // Added by T356. Do not handle events which are past the end of the part. - //FINDMICHJETZT why not? - if(ev.tick() >= len) - break; + // Commented out by flo: yes, DO handle them! these are "hidden events" + // which may be revealed later again! + // if(ev.tick() >= len) + // break; if(ev.type() != Controller) continue; |