smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

track notes at the region level in MidiPlaylist; resolve them (deliver note offs) if a note spans the end of the region

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5804 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-10-19 17:05:22 +00:00
parent a86b994c68
commit 539a692b0e
11 changed files with 139 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/ardour/midi_source.cc
View file

@ -35,6 +35,7 @@
#include "ardour/audioengine.h"
#include "ardour/midi_model.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_state_tracker.h"
#include "ardour/midi_source.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
@ -126,8 +127,9 @@ MidiSource::invalidate ()
nframes_t
MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, sframes_t source_start,
sframes_t start, nframes_t cnt,
sframes_t stamp_offset, sframes_t negative_stamp_offset) const
sframes_t start, nframes_t cnt,
sframes_t stamp_offset, sframes_t negative_stamp_offset,
MidiStateTracker* tracker) const
{
Glib::Mutex::Lock lm (_lock);
@ -152,13 +154,21 @@ MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, sframes_t source_start,
const sframes_t time_frames = BEATS_TO_FRAMES(i->time());
if (time_frames < source_start + start + cnt) {
dst.write(time_frames, i->event_type(), i->size(), i->buffer());
if (tracker) {
Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*i)));
if (ev.is_note_on()) {
tracker->add (ev.note(), ev.channel());
} else if (ev.is_note_off()) {
tracker->remove (ev.note(), ev.channel());
}
}
} else {
break;
}
}
return cnt;
} else {
return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset);
return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset, tracker);
}
}