advance track's play-position even if processing is locked
[ardour.git] / libs / ardour / midi_diskstream.cc
index 08b37193011cd604df5b025fcb53e4442811dd9a..489a84e477cbea5708768d80b6f5535db8579e90 100644 (file)
 #include <fcntl.h>
 #include <cstdlib>
 #include <ctime>
+#include <strings.h> // for ffs(3)
 #include <sys/stat.h>
 #include <sys/mman.h>
 
 #include "pbd/error.h"
 #include "pbd/basename.h"
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include "pbd/xml++.h"
 #include "pbd/memento_command.h"
 #include "pbd/enumwriter.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/ardour.h"
 #include "ardour/audioengine.h"
 #include "ardour/butler.h"
-#include "ardour/configuration.h"
-#include "ardour/cycle_timer.h"
 #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/send.h"
 #include "ardour/session.h"
+#include "ardour/session_playlists.h"
 #include "ardour/smf_source.h"
+#include "ardour/types.h"
 #include "ardour/utils.h"
-#include "ardour/session_playlists.h"
-#include "ardour/route.h"
 
 #include "midi++/types.h"
 
@@ -67,40 +65,42 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-nframes_t MidiDiskstream::midi_readahead = 4096;
+framecnt_t MidiDiskstream::midi_readahead = 4096;
 
 MidiDiskstream::MidiDiskstream (Session &sess, const string &name, Diskstream::Flag flag)
        : 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)
+       , _frames_pending_write(0)
+       , _num_captured_loops(0)
+       , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
 {
-       /* prevent any write sources from being created */
-
        in_set_state = true;
 
        init ();
        use_new_playlist ();
-        use_new_write_source (0);
+       use_new_write_source (0);
 
        in_set_state = false;
 
-       assert(!destructive());
+       if (destructive()) {
+               throw failed_constructor();
+       }
 }
 
 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)
+       , _frames_pending_write(0)
+       , _num_captured_loops(0)
+       , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
 {
        in_set_state = true;
 
@@ -111,7 +111,7 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node)
                throw failed_constructor();
        }
 
-        use_new_write_source (0);
+       use_new_write_source (0);
 
        in_set_state = false;
 }
@@ -128,27 +128,25 @@ MidiDiskstream::init ()
        allocate_temporary_buffers ();
 
        const size_t size = _session.butler()->midi_diskstream_buffer_size();
-       _playback_buf = new MidiRingBuffer<nframes_t>(size);
-       _capture_buf = new MidiRingBuffer<nframes_t>(size);
+       _playback_buf = new MidiRingBuffer<framepos_t>(size);
+       _capture_buf = new MidiRingBuffer<framepos_t>(size);
 
        _n_channels = ChanCount(DataType::MIDI, 1);
-
-       assert(recordable());
 }
 
 MidiDiskstream::~MidiDiskstream ()
 {
-       Glib::Mutex::Lock lm (state_lock);
+       Glib::Threads::Mutex::Lock lm (state_lock);
 }
 
 
 void
-MidiDiskstream::non_realtime_locate (nframes_t position)
+MidiDiskstream::non_realtime_locate (framepos_t position)
 {
        if (_write_source) {
                _write_source->set_timeline_position (position);
        }
-       seek(position, false);
+       seek (position, false);
 }
 
 
@@ -156,66 +154,56 @@ void
 MidiDiskstream::non_realtime_input_change ()
 {
        {
-               Glib::Mutex::Lock lm (state_lock);
+               Glib::Threads::Mutex::Lock lm (state_lock);
 
-               if (input_change_pending == NoChange) {
+               if (input_change_pending.type == IOChange::NoChange) {
                        return;
                }
 
-               if (input_change_pending & ConfigurationChanged) {
-                       if (_io->n_ports().n_midi() != _n_channels.n_midi()) {
-                               error << "Can not feed IO " << _io->n_ports()
-                                       << " with diskstream " << _n_channels << endl;
+               if (input_change_pending.type & IOChange::ConfigurationChanged) {
+                       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;
                        }
-               }
 
-               get_input_sources ();
-               set_capture_offset ();
+                       if (ni == 0) {
+                               _source_port.reset ();
+                       } else {
+                               _source_port = _io->midi(0);
+                       }
+               }
 
-               if (first_input_change) {
-                       set_align_style (_persistent_alignment_style);
-                       first_input_change = false;
-               } else {
+               if (input_change_pending.type & IOChange::ConnectionsChanged) {
+                       set_capture_offset ();
                        set_align_style_from_io ();
                }
 
-               input_change_pending = NoChange;
+               input_change_pending.type = IOChange::NoChange;
 
                /* implicit unlock */
        }
 
-        /* unlike with audio, there is never any need to reset write sources
-           based on input configuration changes because ... a MIDI track 
-           has just 1 MIDI port as input, always. 
-        */
+       /* unlike with audio, there is never any need to reset write sources
+          based on input configuration changes because ... a MIDI track
+          has just 1 MIDI port as input, always.
+       */
 
        /* now refill channel buffers */
 
        if (speed() != 1.0f || speed() != -1.0f) {
-               seek ((nframes_t) (_session.transport_frame() * (double) speed()));
+               seek ((framepos_t) (_session.transport_frame() * (double) speed()));
        }
        else {
                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;
-       }
-
-       // This is all we do for now at least
-       assert(ni == 1);
-
-       _source_port = _io->midi(0);
-
-       // do... stuff?
+       g_atomic_int_set(&_frames_pending_write, 0);
+       g_atomic_int_set(&_num_captured_loops, 0);
 }
 
 int
@@ -228,7 +216,7 @@ MidiDiskstream::find_and_use_playlist (const string& name)
        }
 
        if (!playlist) {
-               error << string_compose(_("MidiDiskstream: Playlist \"%1\" isn't an midi playlist"), name) << endmsg;
+               error << string_compose(_("MidiDiskstream: Playlist \"%1\" isn't a midi playlist"), name) << endmsg;
                return -1;
        }
 
@@ -238,9 +226,9 @@ MidiDiskstream::find_and_use_playlist (const string& name)
 int
 MidiDiskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
 {
-       assert(boost::dynamic_pointer_cast<MidiPlaylist>(playlist));
-
-       Diskstream::use_playlist(playlist);
+       if (boost::dynamic_pointer_cast<MidiPlaylist>(playlist)) {
+               Diskstream::use_playlist(playlist);
+       }
 
        return 0;
 }
@@ -264,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 {
@@ -275,8 +262,6 @@ MidiDiskstream::use_new_playlist ()
 int
 MidiDiskstream::use_copy_playlist ()
 {
-       assert(midi_playlist());
-
        if (destructive()) {
                return 0;
        }
@@ -292,7 +277,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;
@@ -304,9 +288,7 @@ MidiDiskstream::use_copy_playlist ()
 int
 MidiDiskstream::set_destructive (bool yn)
 {
-       assert( ! destructive());
-       assert( ! yn);
-       return -1;
+       return yn ? -1 : 0;
 }
 
 void
@@ -318,187 +300,38 @@ MidiDiskstream::set_note_mode (NoteMode m)
                _write_source->model()->set_note_mode(m);
 }
 
-#if 0
+/** Get the start, end, and length of a location "atomically".
+ *
+ * Note: Locations don't get deleted, so all we care about when I say "atomic"
+ * is that we are always pointing to the same one and using start/length values
+ * obtained just once.  Use this function to achieve this since location being
+ * a parameter achieves this.
+ */
 static void
-trace_midi (ostream& o, MIDI::byte *msg, size_t len)
+get_location_times(const Location* location,
+                   framepos_t*     start,
+                   framepos_t*     end,
+                   framepos_t*     length)
 {
-       using namespace MIDI;
-       eventType type;
-       const char trace_prefix = ':';
-
-       type = (eventType) (msg[0]&0xF0);
-
-       switch (type) {
-       case off:
-               o << trace_prefix
-                  << "Channel "
-                  << (msg[0]&0xF)+1
-                  << " NoteOff NoteNum "
-                  << (int) msg[1]
-                  << " Vel "
-                  << (int) msg[2]
-                  << endl;
-               break;
-
-       case on:
-               o << trace_prefix
-                  << "Channel "
-                  << (msg[0]&0xF)+1
-                  << " NoteOn NoteNum "
-                  << (int) msg[1]
-                  << " Vel "
-                  << (int) msg[2]
-                  << endl;
-               break;
-
-       case polypress:
-               o << trace_prefix
-                  << "Channel "
-                  << (msg[0]&0xF)+1
-                  << " PolyPressure"
-                  << (int) msg[1]
-                  << endl;
-               break;
-
-       case MIDI::controller:
-               o << trace_prefix
-                  << "Channel "
-                  << (msg[0]&0xF)+1
-                  << " Controller "
-                  << (int) msg[1]
-                  << " Value "
-                  << (int) msg[2]
-                  << endl;
-               break;
-
-       case program:
-               o << trace_prefix
-                  << "Channel "
-                  << (msg[0]&0xF)+1
-                  <<  " Program Change ProgNum "
-                  << (int) msg[1]
-                  << endl;
-               break;
-
-       case chanpress:
-               o << trace_prefix
-                  << "Channel "
-                  << (msg[0]&0xF)+1
-                  << " Channel Pressure "
-                  << (int) msg[1]
-                  << endl;
-               break;
-
-       case MIDI::pitchbend:
-               o << trace_prefix
-                  << "Channel "
-                  << (msg[0]&0xF)+1
-                  << " Pitch Bend "
-                  << ((msg[2]<<7)|msg[1])
-                  << endl;
-               break;
-
-       case MIDI::sysex:
-               if (len == 1) {
-                       switch (msg[0]) {
-                       case 0xf8:
-                               o << trace_prefix
-                                  << "Clock"
-                                  << endl;
-                               break;
-                       case 0xfa:
-                               o << trace_prefix
-                                  << "Start"
-                                  << endl;
-                               break;
-                       case 0xfb:
-                               o << trace_prefix
-                                  << "Continue"
-                                  << endl;
-                               break;
-                       case 0xfc:
-                               o << trace_prefix
-                                  << "Stop"
-                                  << endl;
-                               break;
-                       case 0xfe:
-                               o << trace_prefix
-                                  << "Active Sense"
-                                  << endl;
-                               break;
-                       case 0xff:
-                               o << trace_prefix
-                                  << "System Reset"
-                                  << endl;
-                               break;
-                       default:
-                               o << trace_prefix
-                                  << "System Exclusive (1 byte : " << hex << (int) *msg << dec << ')'
-                                  << endl;
-                               break;
-                       }
-               } else {
-                       o << trace_prefix
-                          << "System Exclusive (" << len << ") = [ " << hex;
-                       for (unsigned int i = 0; i < len; ++i) {
-                               o << (int) msg[i] << ' ';
-                       }
-                       o << dec << ']' << endl;
-
-               }
-               break;
-
-       case MIDI::song:
-               o << trace_prefix << "Song" << endl;
-               break;
-
-       case MIDI::tune:
-               o << trace_prefix << "Tune" << endl;
-               break;
-
-       case MIDI::eox:
-               o << trace_prefix << "End-of-System Exclusive" << endl;
-               break;
-
-       case MIDI::timing:
-               o << trace_prefix << "Timing" << endl;
-               break;
-
-       case MIDI::start:
-               o << trace_prefix << "Start" << endl;
-               break;
-
-       case MIDI::stop:
-               o << trace_prefix << "Stop" << endl;
-               break;
-
-       case MIDI::contineu:
-               o << trace_prefix << "Continue" << endl;
-               break;
-
-       case active:
-               o << trace_prefix << "Active Sense" << endl;
-               break;
-
-       default:
-               o << trace_prefix << "Unrecognized MIDI message" << endl;
-               break;
+       if (location) {
+               *start  = location->start();
+               *end    = location->end();
+               *length = *end - *start;
        }
 }
-#endif
 
 int
-MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler)
+MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t nframes, framecnt_t& playback_distance, bool need_disk_signal)
 {
-       int       ret = -1;
-       nframes_t rec_offset = 0;
-       nframes_t rec_nframes = 0;
+       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;
+       playback_distance = 0;
 
-       check_record_status (transport_frame, nframes, can_record);
+       check_record_status (transport_frame, can_record);
 
        nominally_recording = (can_record && re);
 
@@ -506,26 +339,49 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_
                return 0;
        }
 
-        Glib::Mutex::Lock sm (state_lock, Glib::TRY_LOCK);
+       boost::shared_ptr<MidiPort> sp = _source_port.lock ();
+
+       if (sp == 0) {
+               return 1;
+       }
+
+       Glib::Threads::Mutex::Lock sm (state_lock, Glib::Threads::TRY_LOCK);
 
-        if (!sm.locked()) {
+       if (!sm.locked()) {
                return 1;
        }
 
+       const Location* const loop_loc    = loop_location;
+       framepos_t            loop_start  = 0;
+       framepos_t            loop_end    = 0;
+       framepos_t            loop_length = 0;
+       get_location_times(loop_loc, &loop_start, &loop_end, &loop_length);
+
        adjust_capture_position = 0;
 
-       if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) {
-               OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
+       if (nominally_recording || (re && was_recording && _session.get_record_enabled() && _session.config.get_punch_in())) {
+               Evoral::OverlapType ot = Evoral::coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
 
                calculate_record_range(ot, transport_frame, nframes, rec_nframes, rec_offset);
 
                if (rec_nframes && !was_recording) {
-                       capture_captured = 0;
+                       if (loop_loc) {
+                               /* Loop recording, so pretend the capture started at the loop
+                                  start rgardless of what time it is now, so the source starts
+                                  at the loop start and can handle time wrapping around.
+                                  Otherwise, start the source right now as usual.
+                               */
+                               capture_captured    = transport_frame - loop_start;
+                               capture_start_frame = loop_start;
+                       }
+                       _write_source->mark_write_starting_now(
+                               capture_start_frame, capture_captured, loop_length);
+                       g_atomic_int_set(&_frames_pending_write, 0);
+                       g_atomic_int_set(&_num_captured_loops, 0);
                        was_recording = true;
                }
        }
 
-
        if (can_record && !_last_capture_sources.empty()) {
                _last_capture_sources.clear ();
        }
@@ -533,17 +389,89 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_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);
+               ChannelMode mode = AllChannels; // _track->get_capture_channel_mode ();
+               uint32_t mask = 0xffff; // _track->get_capture_channel_mask ();
+
                for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
-                       const Evoral::MIDIEvent<MidiBuffer::TimeType> ev(*i, false);
-                       assert(ev.buffer());
-                       _capture_buf->write(ev.time() + transport_frame, ev.type(), ev.size(), ev.buffer());
+                       Evoral::MIDIEvent<MidiBuffer::TimeType> ev(*i, false);
+#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
+                       /* Write events to the capture buffer in frames from session start,
+                          but ignoring looping so event time progresses monotonically.
+                          The source knows the loop length so it knows exactly where the
+                          event occurs in the series of recorded loops and can implement
+                          any desirable behaviour.  We don't want to send event with
+                          transport time here since that way the source can not
+                          reconstruct their actual time; future clever MIDI looping should
+                          probabl be implemented in the source instead of here.
+                       */
+                       const framecnt_t loop_offset = _num_captured_loops * loop_length;
+                       
+                       switch (mode) {
+                       case AllChannels:
+                               _capture_buf->write(transport_frame + loop_offset + ev.time(),
+                                                   ev.type(), ev.size(), ev.buffer());
+                               break;
+                       case FilterChannels:
+                               if (ev.is_channel_event()) {
+                                       if ((1<<ev.channel()) & mask) {
+                                               _capture_buf->write(transport_frame + loop_offset + ev.time(),
+                                                                   ev.type(), ev.size(), ev.buffer());
+                                       }
+                               } else {
+                                       _capture_buf->write(transport_frame + loop_offset + ev.time(),
+                                                           ev.type(), ev.size(), ev.buffer());
+                               }
+                               break;
+                       case ForceChannel:
+                               if (ev.is_channel_event()) {
+                                       ev.set_channel (ffs(mask) - 1);
+                               }
+                               _capture_buf->write(transport_frame + loop_offset + ev.time(),
+                                                   ev.type(), ev.size(), ev.buffer());
+                               break;
+                       }
+               }
+               g_atomic_int_add(&_frames_pending_write, nframes);
+
+               if (buf.size() != 0) {
+                       Glib::Threads::Mutex::Lock lm (_gui_feed_buffer_mutex, Glib::Threads::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 (_write_source); /* EMIT SIGNAL */
                }
 
        } else {
 
                if (was_recording) {
-                       finish_capture (rec_monitors_input);
+                       finish_capture ();
                }
 
        }
@@ -566,19 +494,45 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_
 
                playback_distance = nframes;
 
+       } else {
+
+               /* XXX: should be doing varispeed stuff here, similar to the code in AudioDiskstream::process */
+
+               playback_distance = nframes;
+
        }
 
-       ret = 0;
+       if (need_disk_signal) {
+               /* copy the diskstream data to all output buffers */
+               
+               MidiBuffer& mbuf (bufs.get_midi (0));
+               get_playback (mbuf, nframes);
+               
+               /* leave the audio count alone */
+               ChanCount cnt (DataType::MIDI, 1);
+               cnt.set (DataType::AUDIO, bufs.count().n_audio());
+               bufs.set_count (cnt);
+       }
 
-        if (commit (nframes)) {
-                need_butler = true;
-        }
+       return 0;
+}
 
-       return ret;
+frameoffset_t
+MidiDiskstream::calculate_playback_distance (pframes_t nframes)
+{
+       frameoffset_t playback_distance = nframes;
+
+       /* XXX: should be doing varispeed stuff once it's implemented in ::process() above */
+
+       if (_actual_speed < 0.0) {
+               return -playback_distance;
+       } else {
+               return playback_distance;
+       }
 }
 
 bool
-MidiDiskstream::commit (nframes_t nframes)
+MidiDiskstream::commit (framecnt_t playback_distance)
 {
        bool need_butler = false;
 
@@ -593,15 +547,28 @@ MidiDiskstream::commit (nframes_t nframes)
                adjust_capture_position = 0;
        }
 
-       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) {
-               need_butler = true;
+       uint32_t frames_read = g_atomic_int_get(const_cast<gint*>(&_frames_read_from_ringbuffer));
+       uint32_t frames_written = g_atomic_int_get(const_cast<gint*>(&_frames_written_to_ringbuffer));
+
+       /*
+         cerr << name() << " MDS written: " << frames_written << " - read: " << frames_read <<
+         " = " << frames_written - frames_read
+         << " + " << playback_distance << " < " << midi_readahead << " = " << need_butler << ")" << endl;
+       */
+
+       /* frames_read will generally be less than frames_written, but
+        * immediately after an overwrite, we can end up having read some data
+        * before we've written any. we don't need to trip an assert() on this,
+        * but we do need to check so that the decision on whether or not we
+        * need the butler is done correctly.
+        */
+       
+       if (frames_read <= frames_written) {
+               if ((frames_written - frames_read) + playback_distance < midi_readahead) {
+                       need_butler = true;
+               }
        }
 
-       /*cerr << "MDS written: " << frames_written << " - read: " << frames_read <<
-               " = " << frames_written - frames_read
-               << " + " << nframes << " < " << midi_readahead << " = " << need_butler << ")" << endl;*/
 
        return need_butler;
 }
@@ -612,14 +579,20 @@ 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;
 }
 
 int
 MidiDiskstream::overwrite_existing_buffers ()
 {
-       //read(overwrite_frame, disk_io_chunk_frames, false);
+       /* This is safe as long as the butler thread is suspended, which it should be */
+       _playback_buf->reset ();
+
+       g_atomic_int_set (&_frames_read_from_ringbuffer, 0);
+       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;
 
@@ -627,11 +600,19 @@ MidiDiskstream::overwrite_existing_buffers ()
 }
 
 int
-MidiDiskstream::seek (nframes_t frame, bool complete_refill)
+MidiDiskstream::seek (framepos_t frame, bool complete_refill)
 {
-       Glib::Mutex::Lock lm (state_lock);
+       Glib::Threads::Mutex::Lock lm (state_lock);
        int ret = -1;
 
+       if (g_atomic_int_get (&_frames_read_from_ringbuffer) == 0) {
+               /* we haven't read anything since the last seek,
+                  so flush all note trackers to prevent
+                  wierdness
+               */
+               reset_tracker ();
+       }
+
        _playback_buf->reset();
        _capture_buf->reset();
        g_atomic_int_set(&_frames_read_from_ringbuffer, 0);
@@ -650,7 +631,7 @@ MidiDiskstream::seek (nframes_t frame, bool complete_refill)
 }
 
 int
-MidiDiskstream::can_internal_playback_seek (nframes_t distance)
+MidiDiskstream::can_internal_playback_seek (framecnt_t distance)
 {
        uint32_t frames_read    = g_atomic_int_get(&_frames_read_from_ringbuffer);
        uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer);
@@ -658,7 +639,7 @@ MidiDiskstream::can_internal_playback_seek (nframes_t distance)
 }
 
 int
-MidiDiskstream::internal_playback_seek (nframes_t distance)
+MidiDiskstream::internal_playback_seek (framecnt_t distance)
 {
        first_recordable_frame += distance;
        playback_sample += distance;
@@ -668,31 +649,19 @@ MidiDiskstream::internal_playback_seek (nframes_t distance)
 
 /** @a start is set to the new frame position (TIME) read up to */
 int
-MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed)
+MidiDiskstream::read (framepos_t& start, framecnt_t dur, bool reversed)
 {
-       nframes_t this_read = 0;
-       bool reloop = false;
-       nframes_t loop_end = 0;
-       nframes_t loop_start = 0;
-       Location *loc = 0;
+       framecnt_t this_read   = 0;
+       bool       reloop      = false;
+       framepos_t loop_end    = 0;
+       framepos_t loop_start  = 0;
+       framecnt_t loop_length = 0;
+       Location*  loc         = 0;
 
        if (!reversed) {
 
-               nframes_t loop_length = 0;
-
-               /* Make the use of a Location atomic for this read operation.
-
-                  Note: Locations don't get deleted, so all we care about
-                  when I say "atomic" is that we are always pointing to
-                  the same one and using a start/length values obtained
-                  just once.
-               */
-
-               if ((loc = loop_location) != 0) {
-                       loop_start = loc->start();
-                       loop_end = loc->end();
-                       loop_length = loop_end - loop_start;
-               }
+               loc = loop_location;
+               get_location_times(loc, &loop_start, &loop_end, &loop_length);
 
                /* if we are looping, ensure that the first frame we read is at the correct
                   position within the loop.
@@ -703,16 +672,16 @@ MidiDiskstream::read (nframes_t& start, nframes_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 << " end " << start+dur << "  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;
@@ -728,13 +697,11 @@ MidiDiskstream::read (nframes_t& start, nframes_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();
+               
+               g_atomic_int_add (&_frames_written_to_ringbuffer, this_read);
 
                if (reversed) {
 
@@ -745,14 +712,9 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed)
                } else {
 
                        /* if we read to the end of the loop, go back to the beginning */
-
                        if (reloop) {
                                // Synthesize LoopEvent here, because the next events
                                // written will have non-monotonic timestamps.
-                               _playback_buf->write(loop_end - 1, LoopEventType, 0, 0);
-                               cout << "Pushing LoopEvent ts=" << loop_end-1
-                                    << " start+this_read " << start+this_read << endl;
-
                                start = loop_start;
                        } else {
                                start += this_read;
@@ -788,29 +750,27 @@ MidiDiskstream::do_refill ()
        }
 
        /* at end: nothing to do */
-       if (file_frame == max_frames) {
+       if (file_frame == max_framepos) {
                return 0;
        }
 
-       // At this point we...
-       assert(_playback_buf->write_space() > 0); // ... have something to write to, and
-       assert(file_frame <= max_frames); // ... something to write
+       /* no space to write */
+       if (_playback_buf->write_space() == 0) {
+               return 0;
+       }
 
-       // now calculate how much time is in the ringbuffer.
-       // and lets write as much as we need to get this to be midi_readahead;
        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) >= midi_readahead) {
-               //cout << "MDS Nothing to do. all fine" << endl;
                return 0;
        }
 
-       nframes_t to_read = midi_readahead - (frames_written - frames_read);
+       framecnt_t to_read = midi_readahead - (frames_written - frames_read);
 
        //cout << "MDS read for midi_readahead " << to_read << "  rb_contains: "
        //      << frames_written - frames_read << endl;
 
-       to_read = min(to_read, (max_frames - file_frame));
+       to_read = (framecnt_t) min ((framecnt_t) to_read, (framecnt_t) (max_framepos - file_frame));
 
        if (read (file_frame, to_read, reversed)) {
                ret = -1;
@@ -832,21 +792,18 @@ MidiDiskstream::do_refill ()
 int
 MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
 {
-       uint32_t to_write;
+       framecnt_t to_write;
        int32_t ret = 0;
-       nframes_t total;
 
-       _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();
+       if (!_write_source) {
+               return 0;
        }
 
-       if (total == 0 || _capture_buf->read_space() == 0
-                       || (!force_flush && (total < disk_io_chunk_frames && was_recording))) {
+       const framecnt_t total = g_atomic_int_get(&_frames_pending_write);
+
+       if (total == 0 || 
+           _capture_buf->read_space() == 0 || 
+           (!force_flush && (total < disk_io_chunk_frames) && was_recording)) {
                goto out;
        }
 
@@ -865,19 +822,19 @@ 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, capture_start_frame, 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();
-               }
+               } 
+               g_atomic_int_add(&_frames_pending_write, -to_write);
        }
 
 out:
@@ -893,9 +850,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.
@@ -903,29 +859,29 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
 
        while (more_work && !err) {
                switch (do_flush (TransportContext, true)) {
-                       case 0:
-                               more_work = false;
-                               break;
-                       case 1:
-                               break;
-                       case -1:
-                               error << string_compose(_("MidiDiskstream \"%1\": cannot flush captured data to disk!"), _name) << endmsg;
-                               err++;
+               case 0:
+                       more_work = false;
+                       break;
+               case 1:
+                       break;
+               case -1:
+                       error << string_compose(_("MidiDiskstream \"%1\": cannot flush captured data to disk!"), _name) << endmsg;
+                       err++;
                }
        }
 
        /* XXX is there anything we can do if err != 0 ? */
-       Glib::Mutex::Lock lm (capture_info_lock);
+       Glib::Threads::Mutex::Lock lm (capture_info_lock);
 
        if (capture_info.empty()) {
-               return;
+               goto no_capture_stuff_to_do;
        }
 
        if (abort_capture) {
 
                if (_write_source) {
-
                        _write_source->mark_for_remove ();
+                       _write_source->drop_references ();
                        _write_source.reset();
                }
 
@@ -933,164 +889,167 @@ MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen
 
        } else {
 
-               assert(_write_source);
-
-               nframes_t total_capture = 0;
+               framecnt_t total_capture = 0;
                for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
                        total_capture += (*ci)->frames;
                }
 
-                if (_write_source->length (capture_info.front()->start) != 0) {
-                        
-                        /* phew, we have data */
-                        
-                        /* figure out the name for this take */
-                        
-                        srcs.push_back (_write_source);
+               if (_write_source->length (capture_info.front()->start) != 0) {
 
-                        _write_source->set_timeline_position (capture_info.front()->start);
-                        _write_source->set_captured_for (_name);
+                       /* phew, we have data */
 
-                        /* flush to disk: this step differs from the audio path, 
-                           where all the data is already on disk.
-                         */
+                       /* figure out the name for this take */
 
-                        _write_source->mark_streaming_write_completed ();
-                        
-                        /* make it not a stub anymore */
+                       srcs.push_back (_write_source);
 
-                        _write_source->unstubify ();
+                       _write_source->set_timeline_position (capture_info.front()->start);
+                       _write_source->set_captured_for (_name);
 
-                        /* we will want to be able to keep (over)writing the source
-                           but we don't want it to be removable. this also differs
-                           from the audio situation, where the source at this point
-                           must be considered immutable. luckily, we can rely on
-                           MidiSource::mark_streaming_write_completed() to have 
-                           already done the necessary work for that.
-                        */
+                       /* set length in beats to entire capture length */
 
-                        string whole_file_region_name;
-                        whole_file_region_name = region_name_from_path (_write_source->name(), true);
-                        
-                        /* Register a new region with the Session that
-                           describes the entire source. Do this first
-                           so that any sub-regions will obviously be
-                           children of this one (later!)
-                        */
-                        
-                        try {
-                                PropertyList plist;
+                       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);
 
-                                plist.add (Properties::name, whole_file_region_name);
-                                plist.add (Properties::whole_file, true);
-                                plist.add (Properties::automatic, true);
-                                plist.add (Properties::start, 0);
-                                plist.add (Properties::length, total_capture);
-                                plist.add (Properties::layer, 0);
+                       /* flush to disk: this step differs from the audio path,
+                          where all the data is already on disk.
+                       */
 
-                                boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
+                       _write_source->mark_midi_streaming_write_completed (Evoral::Sequence<Evoral::MusicalTime>::ResolveStuckNotes, total_capture_beats);
 
-                                region = boost::dynamic_pointer_cast<MidiRegion> (rx);
-                                region->special_set_position (capture_info.front()->start);
-                        }
+                       /* we will want to be able to keep (over)writing the source
+                          but we don't want it to be removable. this also differs
+                          from the audio situation, where the source at this point
+                          must be considered immutable. luckily, we can rely on
+                          MidiSource::mark_streaming_write_completed() to have
+                          already done the necessary work for that.
+                       */
 
+                       string whole_file_region_name;
+                       whole_file_region_name = region_name_from_path (_write_source->name(), true);
 
-                        catch (failed_constructor& err) {
-                                error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg;
-                                /* XXX what now? */
-                        }
+                       /* Register a new region with the Session that
+                          describes the entire source. Do this first
+                          so that any sub-regions will obviously be
+                          children of this one (later!)
+                       */
 
-                        _last_capture_sources.insert (_last_capture_sources.end(), srcs.begin(), srcs.end());
+                       try {
+                               PropertyList plist;
 
-                        _playlist->clear_history ();
-                        _playlist->freeze ();
+                               plist.add (Properties::name, whole_file_region_name);
+                               plist.add (Properties::whole_file, true);
+                               plist.add (Properties::automatic, true);
+                               plist.add (Properties::start, 0);
+                               plist.add (Properties::length, total_capture);
+                               plist.add (Properties::layer, 0);
 
-                        uint32_t buffer_position = 0;
-                        for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
+                               boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
 
-                                string region_name;
+                               region = boost::dynamic_pointer_cast<MidiRegion> (rx);
+                               region->special_set_position (capture_info.front()->start);
+                       }
 
-                                RegionFactory::region_name (region_name, _write_source->name(), false);
 
-                                // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n";
+                       catch (failed_constructor& err) {
+                               error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg;
+                               /* XXX what now? */
+                       }
 
-                                try {
-                                        PropertyList plist;
-                               
-                                        plist.add (Properties::start, buffer_position);
-                                        plist.add (Properties::length, (*ci)->frames);
-                                        plist.add (Properties::name, region_name);
-                               
-                                        boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
-                                        region = boost::dynamic_pointer_cast<MidiRegion> (rx);
-                                }
+                       _last_capture_sources.insert (_last_capture_sources.end(), srcs.begin(), srcs.end());
 
-                                catch (failed_constructor& err) {
-                                        error << _("MidiDiskstream: could not create region for captured midi!") << endmsg;
-                                        continue; /* XXX is this OK? */
-                                }
+                       _playlist->clear_changes ();
+                       _playlist->freeze ();
 
-                                // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl;
+                       /* Session frame time of the initial capture in this pass, which is where the source starts */
+                       framepos_t initial_capture = 0;
+                       if (!capture_info.empty()) {
+                               initial_capture = capture_info.front()->start;
+                       }
+
+                       for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
+
+                               string region_name;
+
+                               RegionFactory::region_name (region_name, _write_source->name(), false);
+
+                               // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n";
 
-                                i_am_the_modifier++;
-                                _playlist->add_region (region, (*ci)->start);
-                                i_am_the_modifier--;
+                               try {
+                                       PropertyList plist;
 
-                                buffer_position += (*ci)->frames;
-                        }
+                                       /* start of this region is the offset between the start of its capture and the start of the whole pass */
+                                       plist.add (Properties::start, (*ci)->start - initial_capture);
+                                       plist.add (Properties::length, (*ci)->frames);
+                                       plist.add (Properties::length_beats, converter.from((*ci)->frames));
+                                       plist.add (Properties::name, region_name);
 
-                        _playlist->thaw ();
-                        _session.add_command (new StatefulDiffCommand(_playlist));
-                }
+                                       boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
+                                       region = boost::dynamic_pointer_cast<MidiRegion> (rx);
+                               }
+
+                               catch (failed_constructor& err) {
+                                       error << _("MidiDiskstream: could not create region for captured midi!") << endmsg;
+                                       continue; /* XXX is this OK? */
+                               }
+
+                               // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl;
+
+                               i_am_the_modifier++;
+                               _playlist->add_region (region, (*ci)->start);
+                               i_am_the_modifier--;
+                       }
+
+                       _playlist->thaw ();
+                       _session.add_command (new StatefulDiffCommand(_playlist));
+
+               } else {
+
+                       /* No data was recorded, so this capture will
+                          effectively be aborted; do the same as we
+                          do for an explicit abort.
+                       */
+
+                       if (_write_source) {
+                               _write_source->mark_for_remove ();
+                               _write_source->drop_references ();
+                               _write_source.reset();
+                       }
+               }
 
-                mark_write_completed = true;
        }
 
-        use_new_write_source (0);
+       use_new_write_source (0);
 
        for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
                delete *ci;
        }
 
-       if (_playlist) {
-               midi_playlist()->clear_note_trackers ();
-       }
-
        capture_info.clear ();
        capture_start_frame = 0;
+
+  no_capture_stuff_to_do:
+
+       reset_tracker ();
 }
 
 void
-MidiDiskstream::transport_looped (nframes_t transport_frame)
+MidiDiskstream::transport_looped (framepos_t)
 {
+       /* Here we only keep track of the number of captured loops so monotonic
+          event times can be delivered to the write source in process().  Trying
+          to be clever here is a world of trouble, it is better to simply record
+          the input in a straightforward non-destructive way.  In the future when
+          we want to implement more clever MIDI looping modes it should be done in
+          the Source and/or entirely after the capture is finished.
+       */
        if (was_recording) {
-
-               // adjust the capture length knowing that the data will be recorded to disk
-               // only necessary after the first loop where we're recording
-               if (capture_info.size() == 0) {
-                       capture_captured += _capture_offset;
-
-                       if (_alignment_style == ExistingMaterial) {
-                               capture_captured += _session.worst_output_latency();
-                       } else {
-                               capture_captured += _roll_delay;
-                       }
-               }
-
-               finish_capture (true);
-
-               // the next region will start recording via the normal mechanism
-               // we'll set the start position to the current transport pos
-               // no latency adjustment or capture offset needs to be made, as that already happened the first time
-               capture_start_frame = transport_frame;
-               first_recordable_frame = transport_frame; // mild lie
-               last_recordable_frame = max_frames;
-               was_recording = true;
+               g_atomic_int_add(&_num_captured_loops, 1);
        }
 }
 
 void
-MidiDiskstream::finish_capture (bool /*rec_monitors_input*/)
+MidiDiskstream::finish_capture ()
 {
        was_recording = false;
 
@@ -1098,9 +1057,6 @@ MidiDiskstream::finish_capture (bool /*rec_monitors_input*/)
                return;
        }
 
-       // Why must we destroy?
-       assert(!destructive());
-
        CaptureInfo* ci = new CaptureInfo;
 
        ci->start  = capture_start_frame;
@@ -1124,12 +1080,10 @@ MidiDiskstream::finish_capture (bool /*rec_monitors_input*/)
 void
 MidiDiskstream::set_record_enabled (bool yn)
 {
-       if (!recordable() || !_session.record_enabling_legal()) {
+       if (!recordable() || !_session.record_enabling_legal() || _io->n_ports().n_midi() == 0) {
                return;
        }
 
-       assert(!destructive());
-
        /* yes, i know that this not proof against race conditions, but its
           good enough. i think.
        */
@@ -1140,62 +1094,43 @@ MidiDiskstream::set_record_enabled (bool yn)
                } else {
                        disengage_record_enable ();
                }
+               
+               RecordEnableChanged (); /* EMIT SIGNAL */
        }
 }
 
-void
-MidiDiskstream::engage_record_enable ()
+bool
+MidiDiskstream::prep_record_enable ()
 {
-    bool rolling = _session.transport_speed() != 0.0f;
+       if (!recordable() || !_session.record_enabling_legal() || _io->n_ports().n_midi() == 0) {
+               return false;
+       }
 
-       g_atomic_int_set (&_record_enabled, 1);
+       bool const rolling = _session.transport_speed() != 0.0f;
 
-       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));
        }
 
-       _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame());
-
-       RecordEnableChanged (); /* EMIT SIGNAL */
+       return true;
 }
 
-void
-MidiDiskstream::disengage_record_enable ()
+bool
+MidiDiskstream::prep_record_disable ()
 {
-       g_atomic_int_set (&_record_enabled, 0);
-       if (_source_port && Config->get_monitoring_model() == HardwareMonitoring) {
-               if (_source_port) {
-                       _source_port->request_monitor_input (false);
-               }
-       }
 
-       RecordEnableChanged (); /* EMIT SIGNAL */
+       return true;
 }
 
 XMLNode&
 MidiDiskstream::get_state ()
 {
-       XMLNode* node = new XMLNode ("Diskstream");
+       XMLNode& node (Diskstream::get_state());
        char buf[64];
        LocaleGuard lg (X_("POSIX"));
 
-       snprintf (buf, sizeof(buf), "0x%x", _flags);
-       node->add_property ("flags", buf);
-
-       node->add_property("channel-mode", enum_2_string(get_channel_mode()));
-
-       snprintf (buf, sizeof(buf), "0x%x", get_channel_mask());
-       node->add_property("channel-mask", buf);
-
-       node->add_property ("playlist", _playlist->name());
-
-       snprintf (buf, sizeof(buf), "%f", _visible_speed);
-       node->add_property ("speed", buf);
-
-       node->add_property("name", _name);
-       id().print(buf, sizeof(buf));
-       node->add_property("id", buf);
-
        if (_write_source && _session.get_record_enabled()) {
 
                XMLNode* cs_child = new XMLNode (X_("CapturingSources"));
@@ -1216,96 +1151,36 @@ MidiDiskstream::get_state ()
                }
 
                cs_child->add_property (X_("at"), buf);
-               node->add_child_nocopy (*cs_child);
-       }
-
-       if (_extra_xml) {
-               node->add_child_copy (*_extra_xml);
+               node.add_child_nocopy (*cs_child);
        }
 
-       return* node;
+       return node;
 }
 
 int
-MidiDiskstream::set_state (const XMLNode& node, int /*version*/)
+MidiDiskstream::set_state (const XMLNode& node, int version)
 {
-       const XMLProperty* prop;
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
        XMLNode* capture_pending_node = 0;
        LocaleGuard lg (X_("POSIX"));
 
+       /* prevent write sources from being created */
+
        in_set_state = true;
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               /*if ((*niter)->name() == IO::state_node_name) {
-                       deprecated_io_node = new XMLNode (**niter);
-               }*/
-               assert ((*niter)->name() != IO::state_node_name);
-
                if ((*niter)->name() == X_("CapturingSources")) {
                        capture_pending_node = *niter;
                }
        }
 
-       /* prevent write sources from being created */
-
-       in_set_state = true;
-
-       if ((prop = node.property ("name")) != 0) {
-               _name = prop->value();
-       }
-
-       if ((prop = node.property ("id")) != 0) {
-               _id = prop->value ();
-       }
-
-       if ((prop = node.property ("flags")) != 0) {
-               _flags = Flag (string_2_enum (prop->value(), _flags));
-       }
-
-       ChannelMode channel_mode = AllChannels;
-       if ((prop = node.property ("channel-mode")) != 0) {
-               channel_mode = ChannelMode (string_2_enum(prop->value(), channel_mode));
-       }
-
-       unsigned int channel_mask = 0xFFFF;
-       if ((prop = node.property ("channel-mask")) != 0) {
-               sscanf (prop->value().c_str(), "0x%x", &channel_mask);
-               if (channel_mask & (~0xFFFF)) {
-                       warning << _("MidiDiskstream: XML property channel-mask out of range") << endmsg;
-               }
-       }
-
-       set_channel_mode(channel_mode, channel_mask);
-
-       if ((prop = node.property ("playlist")) == 0) {
+       if (Diskstream::set_state (node, version)) {
                return -1;
        }
 
-       {
-               bool had_playlist = (_playlist != 0);
-
-               if (find_and_use_playlist (prop->value())) {
-                       return -1;
-               }
-
-               if (!had_playlist) {
-                       _playlist->set_orig_diskstream_id (id());
-               }
-
-               if (capture_pending_node) {
-                       use_pending_capture_data (*capture_pending_node);
-               }
-
-       }
-
-       if ((prop = node.property ("speed")) != 0) {
-               double sp = atof (prop->value().c_str());
-
-               if (realtime_set_speed (sp, false)) {
-                       non_realtime_set_speed ();
-               }
+       if (capture_pending_node) {
+               use_pending_capture_data (*capture_pending_node);
        }
 
        in_set_state = false;
@@ -1320,18 +1195,11 @@ MidiDiskstream::use_new_write_source (uint32_t n)
                return 1;
        }
 
-       assert(n == 0);
-
-        _write_source.reset();
+       _write_source.reset();
 
        try {
-                /* file starts off as a stub file, it will be converted
-                   when we're done with a capture pass, or when "stolen"
-                   by the GUI.
-                */
-
                _write_source = boost::dynamic_pointer_cast<SMFSource>(
-                        _session.create_midi_source_for_session (0, name (), true));
+                       _session.create_midi_source_for_session (0, name ()));
 
                if (!_write_source) {
                        throw failed_constructor();
@@ -1344,36 +1212,27 @@ MidiDiskstream::use_new_write_source (uint32_t n)
                return -1;
        }
 
-       _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame());
-
        return 0;
 }
 
-list<boost::shared_ptr<Source> > 
+list<boost::shared_ptr<Source> >
 MidiDiskstream::steal_write_sources()
 {
-        list<boost::shared_ptr<Source> > ret;
+       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 ();
 
-        /* make it visible/present */
-        _write_source->unstubify ();
-        /* never let it go away */
-        _write_source->mark_nonremovable ();
+       /* never let it go away */
+       _write_source->mark_nonremovable ();
 
-        ret.push_back (_write_source);
+       ret.push_back (_write_source);
 
-        /* get a new one */
+       /* get a new one */
 
-        use_new_write_source (0);
+       use_new_write_source (0);
 
-        return ret;
+       return ret;
 }
 
 void
@@ -1385,22 +1244,12 @@ MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
 
        if (_write_source && mark_write_complete) {
                _write_source->mark_streaming_write_completed ();
-        }
-        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;
+       use_new_write_source (0);
 }
 
 void
-MidiDiskstream::set_block_size (nframes_t /*nframes*/)
+MidiDiskstream::set_block_size (pframes_t /*nframes*/)
 {
 }
 
@@ -1410,47 +1259,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 (_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
@@ -1459,32 +1313,125 @@ 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
+void
+MidiDiskstream::flush_playback (framepos_t start, framepos_t end)
+{
+       _playback_buf->flush (start, end);
+       g_atomic_int_add (&_frames_read_from_ringbuffer, end - start);
+}
+
+/** 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, nframes_t start, nframes_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;
+       Location* loc = loop_location;
+
+       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose (
+                            "%1 MDS pre-read read %8 @ %4..%5 from %2 write to %3, LOOPED ? %6-%7\n", _name,
+                            _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), playback_sample, playback_sample + nframes, 
+                            (loc ? loc->start() : -1), (loc ? loc->end() : -1), nframes));
+
+        // cerr << "================\n";
+        // _playback_buf->dump (cerr);
+        // cerr << "----------------\n";
+
+       size_t events_read = 0; 
+
+       if (loc) {
+               framepos_t effective_start;
+
+               if (playback_sample >= loc->end()) {
+                       effective_start = loc->start() + ((playback_sample - loc->end()) % loc->length());
+               } else {
+                       effective_start = playback_sample;
+               }
+               
+               DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("looped, effective start adjusted to %1\n", effective_start));
+
+               if (effective_start == loc->start()) {
+                       /* We need to turn off notes that may extend
+                          beyond the loop end.
+                       */
+
+                       _playback_buf->loop_resolve (dst, 0);
+               }
+
+               if (loc->end() >= effective_start && loc->end() < effective_start + nframes) {
+                       /* end of loop is within the range we are reading, so
+                          split the read in two, and lie about the location
+                          for the 2nd read
+                       */
+                       framecnt_t first, second;
+
+                       first = loc->end() - effective_start;
+                       second = nframes - first;
+
+                       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read for eff %1 end %2: %3 and %4\n",
+                                                                             effective_start, loc->end(), first, second));
+
+                       if (first) {
+                               DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #1, from %1 for %2\n",
+                                                                                     effective_start, first));
+                               events_read = _playback_buf->read (dst, effective_start, first);
+                       } 
+
+                       if (second) {
+                               DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #2, from %1 for %2\n",
+                                                                                     loc->start(), second));
+                               events_read += _playback_buf->read (dst, loc->start(), second);
+                       }
+                                                                   
+               } else {
+                       DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #3, adjusted start as %1 for %2\n",
+                                                                             effective_start, nframes));
+                       events_read = _playback_buf->read (dst, effective_start, effective_start + nframes);
+               }
+       } else {
+               events_read = _playback_buf->read (dst, playback_sample, playback_sample + nframes);
        }
 
-       // Translates stamps to be relative to start
+       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()));
 
+       g_atomic_int_add (&_frames_read_from_ringbuffer, nframes);
+}
 
-#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()));
-#else
-       _playback_buf->read(dst, start, end);
-#endif
+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;
+}
 
-       gint32 frames_read = end - start;
-       g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read);
+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::Threads::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 ();
+       }
+}