diff options
author | Werner Schweer <ws.seh.de> | 2006-11-03 15:53:35 +0000 |
---|---|---|
committer | Werner Schweer <ws.seh.de> | 2006-11-03 15:53:35 +0000 |
commit | b6c114cd8626e0cfd5256154d8d41bf5ae87098f (patch) | |
tree | 1d3387fc790e0f1811872b730a163be6c68bf3fc /muse/muse/midiout.cpp | |
parent | 48cb6e87fc888bdc1f4e80e7429e6f5f7c14d55f (diff) |
updates
Diffstat (limited to 'muse/muse/midiout.cpp')
-rw-r--r-- | muse/muse/midiout.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/muse/muse/midiout.cpp b/muse/muse/midiout.cpp index fc04b586..c07b2822 100644 --- a/muse/muse/midiout.cpp +++ b/muse/muse/midiout.cpp @@ -186,7 +186,7 @@ void MidiOut::seek(unsigned tickPos, unsigned framePos) // stop all notes //--------------------------------------------------- - for (iMPEvent i = _schedEvents.begin(); i != _schedEvents.end(); ++i) { + for (iMidiEvent i = _schedEvents.begin(); i != _schedEvents.end(); ++i) { MidiEvent ev = *i; if (ev.isNoteOff()) { ev.setTime(framePos); @@ -226,7 +226,7 @@ void MidiOut::stop() // stop all notes //--------------------------------------------------- - for (iMPEvent i = _schedEvents.begin(); i != _schedEvents.end(); ++i) { + for (iMidiEvent i = _schedEvents.begin(); i != _schedEvents.end(); ++i) { MidiEvent ev = *i; if (ev.isNoteOff()) { ev.setTime(frame); @@ -322,10 +322,10 @@ void MidiOut::reset() // _playEvents queue which is processed by the MidiSeq thread. //------------------------------------------------------------------- -void MidiOut::processMidi(MPEventList& el, unsigned fromTick, unsigned toTick, unsigned /*fromFrame*/, unsigned /*toFrame*/) +void MidiOut::processMidi(MidiEventList& el, unsigned fromTick, unsigned toTick, unsigned /*fromFrame*/, unsigned /*toFrame*/) { while (!eventFifo.isEmpty()) - el.add(eventFifo.get()); + el.insert(eventFifo.get()); // collect port controller if (fromTick != toTick) { // if rolling @@ -339,7 +339,7 @@ void MidiOut::processMidi(MPEventList& el, unsigned fromTick, unsigned toTick, u Event ev(Controller); ev.setA(c->id()); ev.setB(ic.value().i); - el.add(MidiEvent(frame, -1, ev)); + el.insert(MidiEvent(frame, -1, ev)); } } } @@ -360,7 +360,7 @@ void MidiOut::processMidi(MPEventList& el, unsigned fromTick, unsigned toTick, u Event ev(Controller); ev.setA(c->id()); ev.setB(is.value().i); - el.add(MidiEvent(frame, ch, ev)); + el.insert(MidiEvent(frame, ch, ev)); } } } @@ -371,10 +371,10 @@ void MidiOut::processMidi(MPEventList& el, unsigned fromTick, unsigned toTick, u MidiTrackBase* track = (MidiTrackBase*)i->track; if (track->isMute()) continue; - MPEventList ell; + MidiEventList ell; track->getEvents(fromTick, toTick, 0, &ell); int velo = 0; - for (iMPEvent i = ell.begin(); i != ell.end(); ++i) { + for (iMidiEvent i = ell.begin(); i != ell.end(); ++i) { MidiEvent ev(*i); ev.setChannel(ch); el.insert(ev); |