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

Fix recording of the last disk chunk's worth of MIDI data.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4645 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-20 01:20:03 +00:00
parent c9582da233
commit df4e6f2341
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ardour/midi_diskstream.cc
View file

@ -873,14 +873,15 @@ MidiDiskstream::do_flush (RunContext context, bool force_flush)
_write_data_count = 0;
total = _session.transport_frame() - _last_flush_frame;
if (_last_flush_frame > _session.transport_frame()
|| _last_flush_frame < capture_start_frame) {
_last_flush_frame = _session.transport_frame();
}
total = _session.transport_frame() - _last_flush_frame;
if (total == 0 || (_capture_buf->read_space() == 0 && _session.transport_speed() == 0) || (total < disk_io_chunk_frames && !force_flush && was_recording)) {
if (total == 0 || _capture_buf->read_space() == 0
|| (!force_flush && (total < disk_io_chunk_frames && was_recording))) {
goto out;
}
@ -903,7 +904,9 @@ MidiDiskstream::do_flush (RunContext context, bool force_flush)
assert(!destructive());
if (record_enabled() && _session.transport_frame() - _last_flush_frame > disk_io_chunk_frames) {
if (record_enabled()
&& ( (_session.transport_frame() - _last_flush_frame > disk_io_chunk_frames)
|| force_flush)) {
if ((!_write_source) || _write_source->midi_write (*_capture_buf, capture_start_frame, to_write) != to_write) {
error << string_compose(_("MidiDiskstream %1: cannot write to disk"), _id) << endmsg;
return -1;