summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_diskstream.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-07-01 18:54:19 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-07-01 18:54:19 +0000
commit082b4a2019beb61dba10a1af1a443696c5942072 (patch)
tree79af6beb1c8103faf5a7479d5453c9accafeb32d /libs/ardour/midi_diskstream.cc
parent601dc846dad6af9362355aa3df78145dd35a030f (diff)
add MidiModel::sync_to_source() to push model state into its existing source; mark SMFSource as non-removable after its called SMF::end_write(); some indentation fixes
git-svn-id: svn://localhost/ardour2/branches/3.0@7350 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
-rw-r--r--libs/ardour/midi_diskstream.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index c3c5f53d50..9c0abe53ef 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -869,9 +869,9 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
assert(!destructive());
- if (record_enabled()
- && ( (_session.transport_frame() - _last_flush_frame > disk_io_chunk_frames)
- || force_flush)) {
+ 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;