From 1c547a97cf011a07fa7269df343820470856dd36 Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Thu, 13 Oct 2011 14:37:39 +0000 Subject: Song::remapPortDrumCtrlEvents() now also processes hidden events --- muse2/muse/instruments/minstrument.cpp | 8 ++++---- muse2/muse/song.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'muse2') 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 ""; } -//--------------------------------------------------------- -// 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; -- cgit v1.2.3