allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

optimize midi delayline.

Browse Source
This commit is contained in:
Robin Gareus
2014-06-15 16:36:13 +02:00
parent b0bab058d0
commit 6c6afa4ecf
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libs/ardour/delayline.cc
View File

@@ -222,10 +222,12 @@ DelayLine::run (BufferSet& bufs, framepos_t /* start_frame */, framepos_t /* end
}
}
// delay events in current-buffer, in place.
for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
MidiBuffer::TimeType *t = m.timeptr();
*t += _delay;
if (_delay != 0) {
// delay events in current-buffer, in place.
for (MidiBuffer::iterator m = mb.begin(); m != mb.end(); ++m) {
MidiBuffer::TimeType *t = m.timeptr();
*t += _delay;
}
}
// move events from dly-buffer into current-buffer until nsamples
@@ -239,16 +241,22 @@ DelayLine::run (BufferSet& bufs, framepos_t /* start_frame */, framepos_t /* end
m = dly->erase(m);
}
// move events after nsamples from current-buffer into dly-buffer
// and trim current-buffer after nsamples
for (MidiBuffer::iterator m = mb.begin(); m != mb.end();) {
const Evoral::MIDIEvent<MidiBuffer::TimeType> ev (*m, false);
if (ev.time() < nsamples) {
++m;
continue;
/* For now, this is only relevant if there is there's a positive delay.
* In the future this could also be used to delay 'too early' events
* (ie '_global_port_buffer_offset + _port_buffer_offset' - midi_port.cc)
*/
if (_delay != 0) {
// move events after nsamples from current-buffer into dly-buffer
// and trim current-buffer after nsamples
for (MidiBuffer::iterator m = mb.begin(); m != mb.end();) {
const Evoral::MIDIEvent<MidiBuffer::TimeType> ev (*m, false);
if (ev.time() < nsamples) {
++m;
continue;
}
dly->insert_event(ev);
m = mb.erase(m);
}
dly->insert_event(ev);
m = mb.erase(m);
}
}
}