summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_diskstream.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-08-28 16:06:08 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-08-28 16:06:08 +0000
commite7e071db1a07ec6d66b71982f204c2cbaa70adee (patch)
tree89bb307195d90c110fa7244a062397403390d21f /libs/ardour/midi_diskstream.cc
parent710ba02c70545e06ea57193c61bddba706a49dec (diff)
more MIDI editing tweaks ; flip mouse mode buttons around for MIDI so that "object" mode is the most likely mode for both region \& region editing ; frame handle events (from lincoln's region trimming patch) are now handled more explicitly
git-svn-id: svn://localhost/ardour2/branches/3.0@5600 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
-rw-r--r--libs/ardour/midi_diskstream.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 29b6ab4a4d..3d4b188a8b 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1652,15 +1652,15 @@ MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end)
MidiBuffer::iterator this_cycle_start = dst.end();
// Translates stamps to be relative to start
- #if 1
- _playback_buf->read(dst, start, end);
- #else
- const size_t events_read = _playback_buf->read(dst, start, end);
- cout << "MDS events read = " << events_read
- << " start = " << start << " end = " << end
- << " readspace " << _playback_buf->read_space()
- << " writespace " << _playback_buf->write_space() << endl;
- #endif
+
+ _playback_buf->read(dst, start, end);
+#if 0
+ const size_t events_read = _playback_buf->read(dst, start, end);
+ cout << _name << ": MDS events read = " << events_read
+ << " start = " << start << " end = " << end
+ << " readspace " << _playback_buf->read_space()
+ << " writespace " << _playback_buf->write_space() << endl;
+#endif
gint32 frames_read = end - start;
g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read);