smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-21 14:16:31 +01:00
Code Issues Projects Releases Wiki Activity

cue monitoring for MIDI

Browse source
This commit is contained in:
Paul Davis 2017-06-12 15:39:09 -04:00
parent 2fb99b4ad4
commit 23eada30e3
2 changed files with 105 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/disk_reader.h
View file

@ -149,7 +149,7 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
frameoffset_t calculate_playback_distance (pframes_t);
void get_playback (MidiBuffer& dst, framecnt_t nframes);
void get_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState, BufferSet&, double speed, framecnt_t distance);
void flush_playback (framepos_t start, framepos_t end);
};

55
libs/ardour/disk_reader.cc
View file

@ -267,6 +267,8 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
playback_distance = -playback_distance;
}
BufferSet& scratch_bufs (_session.get_scratch_buffers (bufs.count()));
if (!result_required || ((ms & MonitoringDisk) == 0)) {
/* no need for actual disk data, just advance read pointer and return */
@ -282,7 +284,6 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
size_t n_buffers = bufs.count().n_audio();
size_t n_chans = c->size();
gain_t scaling;
BufferSet& scratch_bufs (_session.get_scratch_buffers (bufs.count()));
if (n_chans > n_buffers) {
scaling = ((float) n_buffers)/n_chans;
@ -372,19 +373,9 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
/* MIDI data handling */
if (!_session.declick_out_pending()) {
/* copy the diskstream data to all output buffers */
if (ms & MonitoringDisk) {
MidiBuffer& mbuf (bufs.get_midi (0));
get_playback (mbuf, playback_distance);
/* vari-speed */
if (speed != 0.0 && fabsf (speed) != 1.0f) {
MidiBuffer& mbuf (bufs.get_midi (0));
for (MidiBuffer::iterator i = mbuf.begin(); i != mbuf.end(); ++i) {
MidiBuffer::TimeType *tme = i.timeptr();
*tme = (*tme) * nframes / playback_distance;
}
get_playback (mbuf, playback_distance, ms, scratch_bufs, speed, playback_distance);
}
}
@ -455,8 +446,6 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
if (frames_read <= frames_written) {
if ((frames_written - frames_read) + playback_distance < midi_readahead) {
_need_butler = true;
} else {
cerr << name() << " fr " << frames_read << " > " << frames_written << endl;
}
} else {
_need_butler = true;
@ -1210,9 +1199,19 @@ DiskReader::flush_playback (framepos_t start, framepos_t end)
* so that an event at playback_sample has time = 0
*/
void
DiskReader::get_playback (MidiBuffer& dst, framecnt_t nframes)
DiskReader::get_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState ms, BufferSet& scratch_bufs, double speed, framecnt_t playback_distance)
{
MidiBuffer* target;
if ((ms & MonitoringInput) == 0) {
dst.clear();
target = &dst;
} else {
target = &scratch_bufs.get_midi (0);
}
if (ms & MonitoringDisk) {
/* no disk data needed */
Location* loc = loop_location;
@ -1240,7 +1239,7 @@ DiskReader::get_playback (MidiBuffer& dst, framecnt_t nframes)
beyond the loop end.
*/
_midi_buf->resolve_tracker (dst, 0);
_midi_buf->resolve_tracker (*target, 0);
}
/* for split-cycles we need to offset the events */
@ -1263,19 +1262,19 @@ DiskReader::get_playback (MidiBuffer& dst, framecnt_t nframes)
if (first) {
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #1, from %1 for %2\n",
effective_start, first));
events_read = _midi_buf->read (dst, effective_start, first);
events_read = _midi_buf->read (*target, effective_start, first);
}
if (second) {
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #2, from %1 for %2\n",
loc->start(), second));
events_read += _midi_buf->read (dst, loc->start(), second);
events_read += _midi_buf->read (*target, loc->start(), second);
}
} else {
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #3, adjusted start as %1 for %2\n",
effective_start, nframes));
events_read = _midi_buf->read (dst, effective_start, effective_start + nframes);
events_read = _midi_buf->read (*target, effective_start, effective_start + nframes);
}
} else {
const size_t n_skipped = _midi_buf->skip_to (playback_sample);
@ -1283,7 +1282,7 @@ DiskReader::get_playback (MidiBuffer& dst, framecnt_t nframes)
warning << string_compose(_("MidiDiskstream %1: skipped %2 events, possible underflow"), id(), n_skipped) << endmsg;
}
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("playback buffer read, from %1 to %2 (%3)", playback_sample, playback_sample + nframes, nframes));
events_read = _midi_buf->read (dst, playback_sample, playback_sample + nframes);
events_read = _midi_buf->read (*target, playback_sample, playback_sample + nframes);
}
DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
@ -1291,9 +1290,23 @@ DiskReader::get_playback (MidiBuffer& dst, framecnt_t nframes)
_name, events_read, playback_sample, playback_sample + nframes,
_midi_buf->read_space(), _midi_buf->write_space(),
_midi_buf->get_read_ptr(), _midi_buf->get_write_ptr()));
}
g_atomic_int_add (&_frames_read_from_ringbuffer, nframes);
/* vari-speed */
if (speed != 0.0 && fabsf (speed) != 1.0f) {
for (MidiBuffer::iterator i = target->begin(); i != target->end(); ++i) {
MidiBuffer::TimeType *tme = i.timeptr();
*tme = (*tme) * nframes / playback_distance;
}
}
if (ms & MonitoringInput) {
dst.merge_from (*target, nframes);
}
//cerr << "======== POST ========\n";
//_midi_buf->dump (cerr);
//cerr << "----------------\n";