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

SMFSource / MIDISource: more readable variable names in read/write(_unlocked), added debugging output to diagnose recording bug (MIDI recording stops receiving events after a short while)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4974 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2009-04-14 10:13:06 +00:00
parent 06a8d164da
commit 625c9ac228
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/ardour/midi_source.cc
View file

@ -164,11 +164,11 @@ MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, sframes_t position,
} }
nframes_t nframes_t
MidiSource::midi_write (MidiRingBuffer<nframes_t>& dst, sframes_t position, nframes_t cnt) MidiSource::midi_write (MidiRingBuffer<nframes_t>& source, sframes_t position, nframes_t duration)
{ {
Glib::Mutex::Lock lm (_lock); Glib::Mutex::Lock lm (_lock);
const nframes_t ret = write_unlocked (dst, position, cnt); const nframes_t ret = write_unlocked (source, position, duration);
_last_write_end = position + cnt; _last_write_end = position + duration;
return ret; return ret;
} }

34
libs/ardour/smf_source.cc
View file

@ -95,8 +95,8 @@ SMFSource::~SMFSource ()
/** All stamps in audio frames */ /** All stamps in audio frames */
nframes_t nframes_t
SMFSource::read_unlocked (MidiRingBuffer<nframes_t>& dst, sframes_t position, SMFSource::read_unlocked (MidiRingBuffer<nframes_t>& destination, sframes_t position,
sframes_t start, nframes_t dur, sframes_t start, nframes_t duration,
sframes_t stamp_offset, sframes_t negative_stamp_offset) const sframes_t stamp_offset, sframes_t negative_stamp_offset) const
{ {
int ret = 0; int ret = 0;
@ -122,14 +122,14 @@ SMFSource::read_unlocked (MidiRingBuffer<nframes_t>& dst, sframes_t position,
while (time < start_ticks) { while (time < start_ticks) {
ret = read_event(&ev_delta_t, &ev_size, &ev_buffer); ret = read_event(&ev_delta_t, &ev_size, &ev_buffer);
if (ret == -1) { // EOF if (ret == -1) { // EOF
_last_read_end = start + dur; _last_read_end = start + duration;
return dur; return duration;
} }
time += ev_delta_t; // accumulate delta time time += ev_delta_t; // accumulate delta time
} }
} }
_last_read_end = start + dur; _last_read_end = start + duration;
while (true) { while (true) {
ret = read_event(&ev_delta_t, &ev_size, &ev_buffer); ret = read_event(&ev_delta_t, &ev_size, &ev_buffer);
@ -148,8 +148,8 @@ SMFSource::read_unlocked (MidiRingBuffer<nframes_t>& dst, sframes_t position,
assert(time >= start_ticks); assert(time >= start_ticks);
const sframes_t ev_frame_time = converter.to(time / (double)ppqn()) + stamp_offset; const sframes_t ev_frame_time = converter.to(time / (double)ppqn()) + stamp_offset;
if (ev_frame_time < start + dur) { if (ev_frame_time < start + duration) {
dst.write(ev_frame_time - negative_stamp_offset, ev_type, ev_size, ev_buffer); destination.write(ev_frame_time - negative_stamp_offset, ev_type, ev_size, ev_buffer);
} else { } else {
break; break;
} }
@ -162,12 +162,12 @@ SMFSource::read_unlocked (MidiRingBuffer<nframes_t>& dst, sframes_t position,
ev_size = scratch_size; // ensure read_event only allocates if necessary ev_size = scratch_size; // ensure read_event only allocates if necessary
} }
return dur; return duration;
} }
/** All stamps in audio frames */ /** All stamps in audio frames */
nframes_t nframes_t
SMFSource::write_unlocked (MidiRingBuffer<nframes_t>& src, sframes_t position, nframes_t dur) SMFSource::write_unlocked (MidiRingBuffer<nframes_t>& source, sframes_t position, nframes_t duration)
{ {
_write_data_count = 0; _write_data_count = 0;
@ -185,12 +185,16 @@ SMFSource::write_unlocked (MidiRingBuffer<nframes_t>& src, sframes_t position, n
Evoral::MIDIEvent<nframes_t> ev; Evoral::MIDIEvent<nframes_t> ev;
while (true) { while (true) {
bool ret = src.peek_time(&time); bool ret = source.peek_time(&time);
if (!ret || time > _last_write_end + dur) { g_debug ("time: %u, last_write_end: %lu, duration: %u", time, _last_write_end, duration);
if (!ret || time > _last_write_end + duration) {
if (!ret) g_debug ("peek failed");
if (time > _last_write_end + duration) g_debug ("time: %u > last_write_end: %lu + duration: %u", time, _last_write_end, duration);
break; break;
} }
ret = src.read_prefix(&time, &type, &size); ret = source.read_prefix(&time, &type, &size);
if (!ret) { if (!ret) {
cerr << "ERROR: Unable to read event prefix, corrupt MIDI ring buffer" << endl; cerr << "ERROR: Unable to read event prefix, corrupt MIDI ring buffer" << endl;
break; break;
@ -201,7 +205,7 @@ SMFSource::write_unlocked (MidiRingBuffer<nframes_t>& src, sframes_t position, n
buf = (uint8_t*)realloc(buf, size); buf = (uint8_t*)realloc(buf, size);
} }
ret = src.read_contents(size, buf); ret = source.read_contents(size, buf);
if (!ret) { if (!ret) {
cerr << "ERROR: Read time/size but not buffer, corrupt MIDI ring buffer" << endl; cerr << "ERROR: Read time/size but not buffer, corrupt MIDI ring buffer" << endl;
break; break;
@ -228,9 +232,9 @@ SMFSource::write_unlocked (MidiRingBuffer<nframes_t>& src, sframes_t position, n
Evoral::SMF::flush(); Evoral::SMF::flush();
free(buf); free(buf);
ViewDataRangeReady(position + _last_write_end, dur); /* EMIT SIGNAL */ ViewDataRangeReady(position + _last_write_end, duration); /* EMIT SIGNAL */
return dur; return duration;
} }