diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-10-31 21:17:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-10-31 21:17:08 +0000 |
| commit | 5dba72c874def27bef3ba3fe7a5cf2414e77aadb (patch) | |
| tree | d4a41d2aca384122422d72a850b19ef46627488e /libs/ardour/midi_diskstream.cc | |
| parent | d47e9247dfba27d198b8a0c43cef5553fc40745d (diff) | |
Take commit() out of process() in both types of
diskstream, and call commit() where appropriate.
git-svn-id: svn://localhost/ardour2/branches/3.0@10361 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 15cfb9f1c9..79b59eef50 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -475,15 +475,15 @@ trace_midi (ostream& o, MIDI::byte *msg, size_t len) #endif int -MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool& need_butler) +MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecnt_t& playback_distance) { - int ret = -1; framecnt_t rec_offset = 0; framecnt_t rec_nframes = 0; bool nominally_recording; bool re = record_enabled (); bool can_record = _session.actively_recording (); - framecnt_t playback_distance = 0; + + playback_distance = 0; check_record_status (transport_frame, can_record); @@ -596,13 +596,7 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool& ne } - ret = 0; - - if (commit (playback_distance)) { - need_butler = true; - } - - return ret; + return 0; } bool |