a grab bag of changes correcting and improving the way MIDI note on/off tracking...
[ardour.git] / libs / ardour / midi_diskstream.cc
index 3dddbb54f5a4860bce95731e9a4fc6892bdfca00..e3d7014457a01ffe2ff0c98889c8f00cdc552054 100644 (file)
 #include "ardour/debug.h"
 #include "ardour/io.h"
 #include "ardour/midi_diskstream.h"
+#include "ardour/midi_model.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_port.h"
 #include "ardour/midi_region.h"
 #include "ardour/playlist_factory.h"
 #include "ardour/region_factory.h"
+#include "ardour/route.h"
 #include "ardour/send.h"
 #include "ardour/session.h"
+#include "ardour/session_playlists.h"
 #include "ardour/smf_source.h"
 #include "ardour/utils.h"
-#include "ardour/session_playlists.h"
-#include "ardour/route.h"
 
 #include "midi++/types.h"
 
@@ -73,14 +74,11 @@ MidiDiskstream::MidiDiskstream (Session &sess, const string &name, Diskstream::F
        : Diskstream(sess, name, flag)
        , _playback_buf(0)
        , _capture_buf(0)
-       , _source_port(0)
-       , _last_flush_frame(0)
        , _note_mode(Sustained)
        , _frames_written_to_ringbuffer(0)
        , _frames_read_from_ringbuffer(0)
+       , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
 {
-       /* prevent any write sources from being created */
-
        in_set_state = true;
 
        init ();
@@ -96,11 +94,10 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node)
        : Diskstream(sess, node)
        , _playback_buf(0)
        , _capture_buf(0)
-       , _source_port(0)
-       , _last_flush_frame(0)
        , _note_mode(Sustained)
        , _frames_written_to_ringbuffer(0)
        , _frames_read_from_ringbuffer(0)
+       , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
 {
        in_set_state = true;
 
@@ -148,7 +145,7 @@ MidiDiskstream::non_realtime_locate (framepos_t position)
        if (_write_source) {
                _write_source->set_timeline_position (position);
        }
-       seek(position, false);
+       seek (position, false);
 }
 
 
@@ -163,15 +160,27 @@ MidiDiskstream::non_realtime_input_change ()
                }
 
                if (input_change_pending.type & IOChange::ConfigurationChanged) {
-                       if (_io->n_ports().n_midi() != _n_channels.n_midi()) {
-                               error << "Can not feed IO " << _io->n_ports()
-                                       << " with diskstream " << _n_channels << endl;
+                       uint32_t ni = _io->n_ports().n_midi();
+
+                       if (ni != _n_channels.n_midi()) {
+                               error << string_compose (_("%1: I/O configuration change %4 requested to use %2, but channel setup is %3"),
+                                                        name(),
+                                                        _io->n_ports(),
+                                                        _n_channels, input_change_pending.type)
+                                     << endmsg;
+                       }
+
+                       if (ni == 0) {
+                               _source_port.reset ();
+                       } else {
+                               _source_port = _io->midi(0);
                        }
                }
 
-               get_input_sources ();
-               set_capture_offset ();
-                set_align_style_from_io ();
+               if (input_change_pending.type & IOChange::ConnectionsChanged) {
+                       set_capture_offset ();
+                       set_align_style_from_io ();
+               }
 
                input_change_pending.type = IOChange::NoChange;
 
@@ -192,24 +201,9 @@ MidiDiskstream::non_realtime_input_change ()
                seek (_session.transport_frame());
        }
 
-       _last_flush_frame = _session.transport_frame();
-}
-
-void
-MidiDiskstream::get_input_sources ()
-{
-       uint32_t ni = _io->n_ports().n_midi();
-
-       if (ni == 0) {
-               return;
+       if (_write_source) {
+               _write_source->set_last_write_end (_session.transport_frame());
        }
-
-       // This is all we do for now at least
-       assert(ni == 1);
-
-       _source_port = _io->midi(0);
-
-       // do... stuff?
 }
 
 int
@@ -258,7 +252,6 @@ MidiDiskstream::use_new_playlist ()
        if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist> (PlaylistFactory::create (
                        DataType::MIDI, _session, newname, hidden()))) != 0) {
 
-               playlist->set_orig_diskstream_id (id());
                return use_playlist (playlist);
 
        } else {
@@ -286,7 +279,6 @@ MidiDiskstream::use_copy_playlist ()
        newname = Playlist::bump_name (_playlist->name(), _session);
 
        if ((playlist  = boost::dynamic_pointer_cast<MidiPlaylist>(PlaylistFactory::create (midi_playlist(), newname))) != 0) {
-               playlist->set_orig_diskstream_id (id());
                return use_playlist (playlist);
        } else {
                return -1;
@@ -298,6 +290,7 @@ MidiDiskstream::use_copy_playlist ()
 int
 MidiDiskstream::set_destructive (bool yn)
 {
+       yn = 0; // stop pedantic gcc complaints about unused parameter
        assert( ! destructive());
        assert( ! yn);
        return -1;
@@ -482,13 +475,13 @@ trace_midi (ostream& o, MIDI::byte *msg, size_t len)
 #endif
 
 int
-MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can_record, bool rec_monitors_input, 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 ();
 
        playback_distance = 0;
 
@@ -500,6 +493,12 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can
                return 0;
        }
 
+       boost::shared_ptr<MidiPort> sp = _source_port.lock ();
+
+       if (sp == 0) {
+               return 1;
+       }
+
        Glib::Mutex::Lock sm (state_lock, Glib::TRY_LOCK);
 
        if (!sm.locked()) {
@@ -520,7 +519,6 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can
                }
        }
 
-
        if (can_record && !_last_capture_sources.empty()) {
                _last_capture_sources.clear ();
        }
@@ -528,27 +526,52 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can
        if (nominally_recording || rec_nframes) {
 
                // Pump entire port buffer into the ring buffer (FIXME: split cycles?)
-               MidiBuffer& buf = _source_port->get_midi_buffer(nframes);
+               MidiBuffer& buf = sp->get_midi_buffer(nframes);
                for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
                        const Evoral::MIDIEvent<MidiBuffer::TimeType> ev(*i, false);
                        assert(ev.buffer());
+#ifndef NDEBUG
+                       if (DEBUG::MidiIO & PBD::debug_bits) {
+                               const uint8_t* __data = ev.buffer();
+                               DEBUG_STR_DECL(a);
+                               DEBUG_STR_APPEND(a, string_compose ("mididiskstream %1 capture event @ %2 + %3 sz %4 ", this, ev.time(), transport_frame, ev.size()));
+                               for (size_t i=0; i < ev.size(); ++i) {
+                                       DEBUG_STR_APPEND(a,hex);
+                                       DEBUG_STR_APPEND(a,"0x");
+                                       DEBUG_STR_APPEND(a,(int)__data[i]);
+                                       DEBUG_STR_APPEND(a,' ');
+                               }
+                               DEBUG_STR_APPEND(a,'\n');
+                               DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
+                       }
+#endif
                        _capture_buf->write(ev.time() + transport_frame, ev.type(), ev.size(), ev.buffer());
                }
 
                if (buf.size() != 0) {
-                       /* Make a copy of this data and emit it for the GUI to see */
-                       boost::shared_ptr<MidiBuffer> copy (new MidiBuffer (buf.capacity ()));
-                       for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
-                               copy->push_back ((*i).time() + transport_frame, (*i).size(), (*i).buffer());
+                       Glib::Mutex::Lock lm (_gui_feed_buffer_mutex, Glib::TRY_LOCK);
+
+                       if (lm.locked ()) {
+                               /* Copy this data into our GUI feed buffer and tell the GUI
+                                  that it can read it if it likes.
+                               */
+                               _gui_feed_buffer.clear ();
+                               
+                               for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
+                                       /* This may fail if buf is larger than _gui_feed_buffer, but it's not really
+                                          the end of the world if it does.
+                                       */
+                                       _gui_feed_buffer.push_back ((*i).time() + transport_frame, (*i).size(), (*i).buffer());
+                               }
                        }
 
-                       DataRecorded (copy, _write_source); /* EMIT SIGNAL */
+                       DataRecorded (_write_source); /* EMIT SIGNAL */
                }
 
        } else {
 
                if (was_recording) {
-                       finish_capture (rec_monitors_input);
+                       finish_capture ();
                }
 
        }
@@ -579,17 +602,11 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can
 
        }
 
-       ret = 0;
-
-       if (commit (nframes)) {
-               need_butler = true;
-       }
-
-       return ret;
+       return 0;
 }
 
 bool
-MidiDiskstream::commit (framecnt_t nframes)
+MidiDiskstream::commit (framecnt_t playback_distance)
 {
        bool need_butler = false;
 
@@ -606,7 +623,7 @@ MidiDiskstream::commit (framecnt_t nframes)
 
        uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer);
        uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer);
-       if ((frames_written - frames_read) + nframes < midi_readahead) {
+       if ((frames_written - frames_read) + playback_distance < midi_readahead) {
                need_butler = true;
        }
 
@@ -623,7 +640,6 @@ MidiDiskstream::set_pending_overwrite (bool yn)
        /* called from audio thread, so we can use the read ptr and playback sample as we wish */
 
        _pending_overwrite = yn;
-
        overwrite_frame = playback_sample;
 }
 
@@ -637,6 +653,7 @@ MidiDiskstream::overwrite_existing_buffers ()
        g_atomic_int_set (&_frames_written_to_ringbuffer, 0);
 
        read (overwrite_frame, disk_io_chunk_frames, false);
+       file_frame = overwrite_frame; // it was adjusted by ::read()
        overwrite_queued = false;
        _pending_overwrite = false;
 
@@ -720,16 +737,16 @@ MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed)
                        start = loop_start + ((start - loop_start) % loop_length);
                        //cerr << "to " << start << endl;
                }
-               //cerr << "start is " << start << "  loopstart: " << loop_start << "  loopend: " << loop_end << endl;
+               // cerr << "start is " << start << "  loopstart: " << loop_start << "  loopend: " << loop_end << endl;
        }
 
        while (dur) {
 
                /* take any loop into account. we can't read past the end of the loop. */
 
-               if (loc && (loop_end - start < dur)) {
+               if (loc && (loop_end - start <= dur)) {
                        this_read = loop_end - start;
-                       //cerr << "reloop true: thisread: " << this_read << "  dur: " << dur << endl;
+                       // cerr << "reloop true: thisread: " << this_read << "  dur: " << dur << endl;
                        reloop = true;
                } else {
                        reloop = false;
@@ -745,14 +762,12 @@ MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed)
                if (midi_playlist()->read (*_playback_buf, start, this_read) != this_read) {
                        error << string_compose(
                                        _("MidiDiskstream %1: cannot read %2 from playlist at frame %3"),
-                                       _id, this_read, start) << endmsg;
+                                       id(), this_read, start) << endmsg;
                        return -1;
                }
 
                g_atomic_int_add(&_frames_written_to_ringbuffer, this_read);
 
-               _read_data_count = _playlist->read_data_count();
-
                if (reversed) {
 
                        // Swap note ons with note offs here.  etc?
@@ -845,20 +860,21 @@ MidiDiskstream::do_refill ()
 int
 MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
 {
-       uint32_t to_write;
-       int32_t ret = 0;
+       framecnt_t to_write;
        framecnt_t total;
+       int32_t ret = 0;
 
-       _write_data_count = 0;
+       if (!_write_source) {
+               return 0;
+       }
 
-       total = _session.transport_frame() - _last_flush_frame;
+       assert (!destructive());
 
-       if (_last_flush_frame > _session.transport_frame() || _last_flush_frame < capture_start_frame) {
-               _last_flush_frame = _session.transport_frame();
-       }
+       total = _session.transport_frame() - _write_source->last_write_end();
 
-       if (total == 0 || _capture_buf->read_space() == 0
-                       || (!force_flush && (total < disk_io_chunk_frames && was_recording))) {
+       if (total == 0 || 
+           _capture_buf->read_space() == 0 || 
+           (!force_flush && (total < disk_io_chunk_frames) && was_recording)) {
                goto out;
        }
 
@@ -877,19 +893,18 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
                ret = 1;
        }
 
-       to_write = disk_io_chunk_frames;
-
-       assert(!destructive());
+       if (force_flush) {
+               /* push out everything we have, right now */
+               to_write = max_framecnt;
+       } else {
+               to_write = 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, get_capture_start_frame (0), to_write) != to_write) {
-                       error << string_compose(_("MidiDiskstream %1: cannot write to disk"), _id) << endmsg;
+       if (record_enabled() && ((total > disk_io_chunk_frames) || force_flush)) {
+               if (_write_source->midi_write (*_capture_buf, get_capture_start_frame (0), to_write) != to_write) {
+                       error << string_compose(_("MidiDiskstream %1: cannot write to disk"), id()) << endmsg;
                        return -1;
-               } else {
-                       _last_flush_frame = _session.transport_frame();
-               }
+               } 
        }
 
 out:
@@ -905,9 +920,8 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
        MidiRegion::SourceList srcs;
        MidiRegion::SourceList::iterator src;
        vector<CaptureInfo*>::iterator ci;
-       bool mark_write_completed = false;
 
-       finish_capture (true);
+       finish_capture ();
 
        /* butler is already stopped, but there may be work to do
           to flush remaining data to disk.
@@ -930,7 +944,7 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
        Glib::Mutex::Lock lm (capture_info_lock);
 
        if (capture_info.empty()) {
-               return;
+               goto no_capture_stuff_to_do;
        }
 
        if (abort_capture) {
@@ -963,17 +977,17 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
                        _write_source->set_timeline_position (capture_info.front()->start);
                        _write_source->set_captured_for (_name);
 
+                       /* set length in beats to entire capture length */
+
+                       BeatsFramesConverter converter (_session.tempo_map(), capture_info.front()->start);
+                       const double total_capture_beats = converter.from (total_capture);
+                       _write_source->set_length_beats (total_capture_beats);
+
                        /* flush to disk: this step differs from the audio path,
                           where all the data is already on disk.
                        */
 
-                       _write_source->mark_streaming_write_completed ();
-
-                       /* set length in beats to entire capture length */
-
-                       BeatsFramesConverter converter (_session.tempo_map(), capture_info.front()->start);
-                       const double total_capture_beats = converter.from(total_capture);
-                       _write_source->set_length_beats(total_capture_beats);
+                       _write_source->mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::ResolveStuckNotes, total_capture_beats);
 
                        /* we will want to be able to keep (over)writing the source
                           but we don't want it to be removable. this also differs
@@ -1074,9 +1088,7 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
                                _write_source.reset();
                        }
                }
-               
 
-               mark_write_completed = true;
        }
 
        use_new_write_source (0);
@@ -1085,12 +1097,12 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
                delete *ci;
        }
 
-       if (_playlist) {
-               midi_playlist()->clear_note_trackers ();
-       }
-
        capture_info.clear ();
        capture_start_frame = 0;
+
+  no_capture_stuff_to_do:
+
+       reset_tracker ();
 }
 
 void
@@ -1110,7 +1122,7 @@ MidiDiskstream::transport_looped (framepos_t transport_frame)
                        }
                }
 
-               finish_capture (true);
+               finish_capture ();
 
                // the next region will start recording via the normal mechanism
                // we'll set the start position to the current transport pos
@@ -1120,10 +1132,14 @@ MidiDiskstream::transport_looped (framepos_t transport_frame)
                last_recordable_frame = max_framepos;
                was_recording = true;
        }
+
+       if (!Config->get_seamless_loop()) {
+               reset_tracker ();
+       }
 }
 
 void
-MidiDiskstream::finish_capture (bool /*rec_monitors_input*/)
+MidiDiskstream::finish_capture ()
 {
        was_recording = false;
 
@@ -1183,8 +1199,10 @@ MidiDiskstream::engage_record_enable ()
 
        g_atomic_int_set (&_record_enabled, 1);
 
-       if (_source_port && Config->get_monitoring_model() == HardwareMonitoring) {
-               _source_port->request_monitor_input (!(_session.config.get_auto_input() && rolling));
+       boost::shared_ptr<MidiPort> sp = _source_port.lock ();
+       
+       if (sp && Config->get_monitoring_model() == HardwareMonitoring) {
+               sp->request_jack_monitors_input (!(_session.config.get_auto_input() && rolling));
        }
 
        RecordEnableChanged (); /* EMIT SIGNAL */
@@ -1255,9 +1273,9 @@ MidiDiskstream::set_state (const XMLNode& node, int version)
                }
        }
 
-        if (Diskstream::set_state (node, version)) {
-                return -1;
-        }
+       if (Diskstream::set_state (node, version)) {
+               return -1;
+       }
 
        ChannelMode channel_mode = AllChannels;
        if ((prop = node.property ("channel-mode")) != 0) {
@@ -1273,9 +1291,9 @@ MidiDiskstream::set_state (const XMLNode& node, int version)
        }
 
 
-        if (capture_pending_node) {
-                use_pending_capture_data (*capture_pending_node);
-        }
+       if (capture_pending_node) {
+               use_pending_capture_data (*capture_pending_node);
+       }
 
        set_channel_mode (channel_mode, channel_mask);
 
@@ -1318,13 +1336,8 @@ MidiDiskstream::steal_write_sources()
 {
        list<boost::shared_ptr<Source> > ret;
 
-       /* put some data on the disk, even if its just a header for an empty file.
-          XXX should we not have a more direct method for doing this? Maybe not
-          since we don't want to mess around with the model/disk relationship
-          that the Source has to pay attention to.
-       */
-
-       boost::dynamic_pointer_cast<MidiSource>(_write_source)->session_saved ();
+       /* put some data on the disk, even if its just a header for an empty file */
+       boost::dynamic_pointer_cast<SMFSource> (_write_source)->ensure_disk_file ();
 
        /* never let it go away */
        _write_source->mark_nonremovable ();
@@ -1351,16 +1364,6 @@ MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
        use_new_write_source (0);
 }
 
-int
-MidiDiskstream::rename_write_sources ()
-{
-       if (_write_source != 0) {
-               _write_source->set_source_name (_name.val(), destructive());
-               /* XXX what to do if this fails ? */
-       }
-       return 0;
-}
-
 void
 MidiDiskstream::set_block_size (pframes_t /*nframes*/)
 {
@@ -1372,51 +1375,52 @@ MidiDiskstream::allocate_temporary_buffers ()
 }
 
 void
-MidiDiskstream::monitor_input (bool yn)
+MidiDiskstream::ensure_jack_monitors_input (bool yn)
 {
-       if (_source_port)
-               _source_port->ensure_monitor_input (yn);
+       boost::shared_ptr<MidiPort> sp = _source_port.lock ();
+       
+       if (sp) {
+               sp->ensure_jack_monitors_input (yn);
+       }
 }
 
 void
 MidiDiskstream::set_align_style_from_io ()
 {
-       bool have_physical = false;
-
-        if (_alignment_choice != Automatic) {
-                return;
-        }
-
-       if (_io == 0) {
+       if (_alignment_choice != Automatic) {
                return;
        }
 
-       get_input_sources ();
-
-       if (_source_port && _source_port->flags() & JackPortIsPhysical) {
-               have_physical = true;
-       }
+       /* XXX Not sure what, if anything we can do with MIDI
+          as far as capture alignment etc.
+       */
 
-       if (have_physical) {
-               set_align_style (ExistingMaterial);
-       } else {
-               set_align_style (CaptureTime);
-       }
+       set_align_style (ExistingMaterial);
 }
 
 
 float
 MidiDiskstream::playback_buffer_load () const
 {
-       return (float) ((double) _playback_buf->read_space()/
-                       (double) _playback_buf->capacity());
+       /* For MIDI it's not trivial to differentiate the following two cases:
+          
+          1.  The playback buffer is empty because the system has run out of time to fill it.
+          2.  The playback buffer is empty because there is no more data on the playlist.
+
+          If we use a simple buffer load computation, we will report that the MIDI diskstream
+          cannot keep up when #2 happens, when in fact it can.  Since MIDI data rates
+          are so low compared to audio, just give a pretend answer here.
+       */
+       
+       return 1;
 }
 
 float
 MidiDiskstream::capture_buffer_load () const
 {
-       return (float) ((double) _capture_buf->write_space()/
-                       (double) _capture_buf->capacity());
+       /* We don't report playback buffer load, so don't report capture load either */
+       
+       return 1;
 }
 
 int
@@ -1425,32 +1429,65 @@ MidiDiskstream::use_pending_capture_data (XMLNode& /*node*/)
        return 0;
 }
 
-/** Writes playback events in the given range to \a dst, translating time stamps
- * so that an event at \a start has time = 0
+/** Writes playback events from playback_sample for nframes to dst, translating time stamps
+ *  so that an event at playback_sample has time = 0
  */
 void
-MidiDiskstream::get_playback (MidiBuffer& dst, framepos_t start, framepos_t end)
+MidiDiskstream::get_playback (MidiBuffer& dst, framecnt_t nframes)
 {
        dst.clear();
        assert(dst.size() == 0);
 
-       // Reverse.  ... We just don't do reverse, ok?  Back off.
-       if (end <= start) {
-               return;
-       }
-
-       // Translates stamps to be relative to start
-
-
 #ifndef NDEBUG
-       const size_t events_read = _playback_buf->read(dst, start, end);
-       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("%1 MDS events read %2 range %3 .. %4 rspace %5 wspace %6\n", _name, events_read, start, end,
-                                                             _playback_buf->read_space(), _playback_buf->write_space()));
+       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
+                            "%1 MDS pre-read read %4..%5 from %2 write to %3\n", _name,
+                            _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), playback_sample, playback_sample + nframes));
+//        cerr << "================\n";
+//        _playback_buf->dump (cerr);
+//        cerr << "----------------\n";
+
+       const size_t events_read = _playback_buf->read (dst, playback_sample, playback_sample + nframes);
+       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
+                            "%1 MDS events read %2 range %3 .. %4 rspace %5 wspace %6 r@%7 w@%8\n",
+                            _name, events_read, playback_sample, playback_sample + nframes,
+                            _playback_buf->read_space(), _playback_buf->write_space(),
+                            _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr()));
 #else
-       _playback_buf->read(dst, start, end);
+       _playback_buf->read (dst, playback_sample, playback_sample + nframes);
 #endif
 
-       gint32 frames_read = end - start;
-       g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read);
+       g_atomic_int_add (&_frames_read_from_ringbuffer, nframes);
+}
+
+bool
+MidiDiskstream::set_name (string const & name)
+{
+       Diskstream::set_name (name);
+
+       /* get a new write source so that its name reflects the new diskstream name */
+       use_new_write_source (0);
+
+       return true;
+}
+
+boost::shared_ptr<MidiBuffer>
+MidiDiskstream::get_gui_feed_buffer () const
+{
+       boost::shared_ptr<MidiBuffer> b (new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI)));
+       
+       Glib::Mutex::Lock lm (_gui_feed_buffer_mutex);
+       b->copy (_gui_feed_buffer);
+       return b;
 }
 
+void
+MidiDiskstream::reset_tracker ()
+{
+       _playback_buf->reset_tracker ();
+
+       boost::shared_ptr<MidiPlaylist> mp (midi_playlist());
+
+       if (mp) {
+               mp->clear_note_trackers ();
+       }
+}