const correctness.
[ardour.git] / libs / ardour / midi_diskstream.cc
index 4cae90007456aedb6a72265f78f30e56526893fd..95e242e6714384816f432461305ab8411fd857c3 100644 (file)
 #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_playlist.h"
@@ -51,6 +55,8 @@
 #include "ardour/session.h"
 #include "ardour/smf_source.h"
 #include "ardour/utils.h"
+#include "ardour/session_playlists.h"
+#include "ardour/route.h"
 
 #include "midi++/types.h"
 
@@ -77,8 +83,9 @@ MidiDiskstream::MidiDiskstream (Session &sess, const string &name, Diskstream::F
 
        in_set_state = true;
 
-       init(flag);
+       init ();
        use_new_playlist ();
+        use_new_write_source (0);
 
        in_set_state = false;
 
@@ -96,25 +103,22 @@ MidiDiskstream::MidiDiskstream (Session& sess, const XMLNode& node)
        , _frames_read_from_ringbuffer(0)
 {
        in_set_state = true;
-       init (Recordable);
 
-       if (set_state (node)) {
+       init ();
+
+       if (set_state (node, Stateful::loading_state_version)) {
                in_set_state = false;
                throw failed_constructor();
        }
 
-       in_set_state = false;
+        use_new_write_source (0);
 
-       if (destructive()) {
-               use_destructive_playlist ();
-       }
+       in_set_state = false;
 }
 
 void
-MidiDiskstream::init (Diskstream::Flag f)
+MidiDiskstream::init ()
 {
-       Diskstream::init(f);
-
        /* there are no channels at this point, so these
           two calls just get speed_buffer_size and wrap_buffer
           size setup without duplicating their code.
@@ -123,7 +127,7 @@ MidiDiskstream::init (Diskstream::Flag f)
        set_block_size (_session.get_block_size());
        allocate_temporary_buffers ();
 
-       const size_t size = _session.midi_diskstream_buffer_size();
+       const size_t size = _session.butler()->midi_diskstream_buffer_size();
        _playback_buf = new MidiRingBuffer<nframes_t>(size);
        _capture_buf = new MidiRingBuffer<nframes_t>(size);
 
@@ -180,9 +184,10 @@ MidiDiskstream::non_realtime_input_change ()
                /* implicit unlock */
        }
 
-       /* reset capture files */
-
-       reset_write_sources (false);
+        /* 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 */
 
@@ -218,7 +223,7 @@ MidiDiskstream::find_and_use_playlist (const string& name)
 {
        boost::shared_ptr<MidiPlaylist> playlist;
 
-       if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist> (_session.playlist_by_name (name))) == 0) {
+       if ((playlist = boost::dynamic_pointer_cast<MidiPlaylist> (_session.playlists->by_name (name))) == 0) {
                playlist = boost::dynamic_pointer_cast<MidiPlaylist> (PlaylistFactory::create (DataType::MIDI, _session, name));
        }
 
@@ -313,114 +318,6 @@ MidiDiskstream::set_note_mode (NoteMode m)
                _write_source->model()->set_note_mode(m);
 }
 
-void
-MidiDiskstream::check_record_status (nframes_t transport_frame, nframes_t /*nframes*/, bool can_record)
-{
-       // FIXME: waaay too much code to duplicate (AudioDiskstream)
-
-       int possibly_recording;
-       int rolling;
-       int change;
-       const int transport_rolling = 0x4;
-       const int track_rec_enabled = 0x2;
-       const int global_rec_enabled = 0x1;
-
-       /* merge together the 3 factors that affect record status, and compute
-          what has changed.
-       */
-
-       rolling = _session.transport_speed() != 0.0f;
-       possibly_recording = (rolling << 2) | (record_enabled() << 1) | can_record;
-       change = possibly_recording ^ last_possibly_recording;
-
-       if (possibly_recording == last_possibly_recording) {
-               return;
-       }
-
-       /* change state */
-
-       /* if per-track or global rec-enable turned on while the other was already on, we've started recording */
-
-       if (((change & track_rec_enabled) && record_enabled() && (!(change & global_rec_enabled) && can_record)) ||
-           ((change & global_rec_enabled) && can_record && (!(change & track_rec_enabled) && record_enabled()))) {
-
-               /* starting to record: compute first+last frames */
-
-               first_recordable_frame = transport_frame + _capture_offset;
-               last_recordable_frame = max_frames;
-               capture_start_frame = transport_frame;
-
-               if (!(last_possibly_recording & transport_rolling) && (possibly_recording & transport_rolling)) {
-
-                       /* was stopped, now rolling (and recording) */
-
-                       if (_alignment_style == ExistingMaterial) {
-                               first_recordable_frame += _session.worst_output_latency();
-                       } else {
-                               first_recordable_frame += _roll_delay;
-                       }
-
-               } else {
-
-                       /* was rolling, but record state changed */
-
-                       if (_alignment_style == ExistingMaterial) {
-
-
-                               if (!_session.config.get_punch_in()) {
-
-                                       /* manual punch in happens at the correct transport frame
-                                          because the user hit a button. but to get alignment correct
-                                          we have to back up the position of the new region to the
-                                          appropriate spot given the roll delay.
-                                       */
-
-                                       capture_start_frame -= _roll_delay;
-
-                                       /* XXX paul notes (august 2005): i don't know why
-                                          this is needed.
-                                       */
-
-                                       first_recordable_frame += _capture_offset;
-
-                               } else {
-
-                                       /* autopunch toggles recording at the precise
-                                          transport frame, and then the DS waits
-                                          to start recording for a time that depends
-                                          on the output latency.
-                                       */
-
-                                       first_recordable_frame += _session.worst_output_latency();
-                               }
-
-                       } else {
-
-                               if (_session.config.get_punch_in()) {
-                                       first_recordable_frame += _roll_delay;
-                               } else {
-                                       capture_start_frame -= _roll_delay;
-                               }
-                       }
-
-               }
-
-       } else if (!record_enabled() || !can_record) {
-
-               /* stop recording */
-
-               last_recordable_frame = transport_frame + _capture_offset;
-
-               if (_alignment_style == ExistingMaterial) {
-                       last_recordable_frame += _session.worst_output_latency();
-               } else {
-                       last_recordable_frame += _roll_delay;
-               }
-       }
-
-       last_possibly_recording = possibly_recording;
-}
-
 #if 0
 static void
 trace_midi (ostream& o, MIDI::byte *msg, size_t len)
@@ -591,94 +488,36 @@ trace_midi (ostream& o, MIDI::byte *msg, size_t len)
 #endif
 
 int
-MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input)
+MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_record, bool rec_monitors_input, bool& need_butler)
 {
-       // FIXME: waay too much code to duplicate (AudioDiskstream::process)
        int       ret = -1;
        nframes_t rec_offset = 0;
        nframes_t rec_nframes = 0;
        bool      nominally_recording;
        bool      re = record_enabled ();
 
-       /* if we've already processed the frames corresponding to this call,
-          just return. this allows multiple routes that are taking input
-          from this diskstream to call our ::process() method, but have
-          this stuff only happen once. more commonly, it allows both
-          the AudioTrack that is using this AudioDiskstream *and* the Session
-          to call process() without problems.
-          */
-
-       if (_processed) {
-               return 0;
-       }
-
-       commit_should_unlock = false;
+        playback_distance = 0;
 
        check_record_status (transport_frame, nframes, can_record);
 
        nominally_recording = (can_record && re);
 
        if (nframes == 0) {
-               _processed = true;
                return 0;
        }
 
-       /* This lock is held until the end of ::commit, so these two functions
-          must always be called as a pair. The only exception is if this function
-          returns a non-zero value, in which case, ::commit should not be called.
-          */
+        Glib::Mutex::Lock sm (state_lock, Glib::TRY_LOCK);
 
-       // If we can't take the state lock return.
-       if (!state_lock.trylock()) {
+        if (!sm.locked()) {
                return 1;
        }
-       commit_should_unlock = true;
+
        adjust_capture_position = 0;
 
        if (nominally_recording || (_session.get_record_enabled() && _session.config.get_punch_in())) {
-               OverlapType ot;
-
-               ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
+               OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
 
-               switch (ot) {
-                       case OverlapNone:
-                               rec_nframes = 0;
-                               break;
-
-                       case OverlapInternal:
-                               /*     ----------    recrange
-                                          |---|       transrange
-                                          */
-                               rec_nframes = nframes;
-                               rec_offset = 0;
-                               break;
-
-                       case OverlapStart:
-                               /*    |--------|    recrange
-                                         -----|          transrange
-                                         */
-                               rec_nframes = transport_frame + nframes - first_recordable_frame;
-                               if (rec_nframes) {
-                                       rec_offset = first_recordable_frame - transport_frame;
-                               }
-                               break;
-
-                       case OverlapEnd:
-                               /*    |--------|    recrange
-                                         |--------  transrange
-                                         */
-                               rec_nframes = last_recordable_frame - transport_frame;
-                               rec_offset = 0;
-                               break;
-
-                       case OverlapExternal:
-                               /*    |--------|    recrange
-                                         --------------  transrange
-                                         */
-                               rec_nframes = last_recordable_frame - last_recordable_frame;
-                               rec_offset = first_recordable_frame - transport_frame;
-                               break;
-               }
+               calculate_record_range(ot, transport_frame, nframes, rec_nframes, rec_offset);
 
                if (rec_nframes && !was_recording) {
                        capture_captured = 0;
@@ -687,8 +526,8 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_
        }
 
 
-       if (can_record && !_last_capture_regions.empty()) {
-               _last_capture_regions.clear ();
+       if (can_record && !_last_capture_sources.empty()) {
+               _last_capture_sources.clear ();
        }
 
        if (nominally_recording || rec_nframes) {
@@ -723,7 +562,7 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_
 
                /* XXXX do this for MIDI !!!
                   can't do actual capture yet - waiting for latency effects to finish before we start
-               */
+                  */
 
                playback_distance = nframes;
 
@@ -731,17 +570,9 @@ MidiDiskstream::process (nframes_t transport_frame, nframes_t nframes, bool can_
 
        ret = 0;
 
-       _processed = true;
-
-       if (ret) {
-
-               /* we're exiting with failure, so ::commit will not
-                  be called. unlock the state lock.
-                  */
-
-               commit_should_unlock = false;
-               state_lock.unlock();
-       }
+        if (commit (nframes)) {
+                need_butler = true;
+        }
 
        return ret;
 }
@@ -772,12 +603,6 @@ MidiDiskstream::commit (nframes_t nframes)
                " = " << frames_written - frames_read
                << " + " << nframes << " < " << midi_readahead << " = " << need_butler << ")" << endl;*/
 
-       if (commit_should_unlock) {
-               state_lock.unlock();
-       }
-
-       _processed = false;
-
        return need_butler;
 }
 
@@ -786,7 +611,7 @@ 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;
+       _pending_overwrite = yn;
 
        overwrite_frame = playback_sample;
 }
@@ -796,7 +621,7 @@ MidiDiskstream::overwrite_existing_buffers ()
 {
        //read(overwrite_frame, disk_io_chunk_frames, false);
        overwrite_queued = false;
-       pending_overwrite = false;
+       _pending_overwrite = false;
 
        return 0;
 }
@@ -849,10 +674,12 @@ MidiDiskstream::read (nframes_t& start, nframes_t dur, bool reversed)
        bool reloop = false;
        nframes_t loop_end = 0;
        nframes_t loop_start = 0;
-       nframes_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
@@ -1058,13 +885,11 @@ out:
 }
 
 void
-MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool abort_capture)
+MidiDiskstream::transport_stopped_wallclock (struct tm& /*when*/, time_t /*twhen*/, bool abort_capture)
 {
-       uint32_t buffer_position;
        bool more_work = true;
        int err = 0;
        boost::shared_ptr<MidiRegion> region;
-       nframes_t total_capture;
        MidiRegion::SourceList srcs;
        MidiRegion::SourceList::iterator src;
        vector<CaptureInfo*>::iterator ci;
@@ -1101,7 +926,6 @@ MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool a
                if (_write_source) {
 
                        _write_source->mark_for_remove ();
-                       _write_source->drop_references ();
                        _write_source.reset();
                }
 
@@ -1111,92 +935,123 @@ MidiDiskstream::transport_stopped (struct tm& /*when*/, time_t /*twhen*/, bool a
 
                assert(_write_source);
 
-               for (total_capture = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
+               nframes_t total_capture = 0;
+               for (ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
                        total_capture += (*ci)->frames;
                }
 
-               /* figure out the name for this take */
+                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);
 
-               srcs.push_back (_write_source);
-               _write_source->set_timeline_position (capture_info.front()->start);
-               _write_source->set_captured_for (_name);
+                        _write_source->set_timeline_position (capture_info.front()->start);
+                        _write_source->set_captured_for (_name);
 
-               string whole_file_region_name;
-               whole_file_region_name = region_name_from_path (_write_source->name(), true);
+                        /* flush to disk: this step differs from the audio path, 
+                           where all the data is already on disk.
+                         */
 
-               /* 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!)
-                  */
+                        _write_source->mark_streaming_write_completed ();
+                        
+                        /* 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
+                        */
 
-               try {
-                       boost::shared_ptr<Region> rx (RegionFactory::create (srcs, 0,
-                                       total_capture, whole_file_region_name, 0,
-                                       Region::Flag (Region::DefaultFlags|Region::Automatic|Region::WholeFile)));
+                       _write_source->mark_nonremovable (); 
+                        
+                        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;
 
-                       region = boost::dynamic_pointer_cast<MidiRegion> (rx);
-                       region->special_set_position (capture_info.front()->start);
-               }
+                                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);
 
+                                boost::shared_ptr<Region> rx (RegionFactory::create (srcs, plist));
 
-               catch (failed_constructor& err) {
-                       error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg;
-                       /* XXX what now? */
-               }
+                                region = boost::dynamic_pointer_cast<MidiRegion> (rx);
+                                region->special_set_position (capture_info.front()->start);
+                        }
 
-               _last_capture_regions.push_back (region);
 
-               // cerr << _name << ": there are " << capture_info.size() << " capture_info records\n";
+                        catch (failed_constructor& err) {
+                                error << string_compose(_("%1: could not create region for complete midi file"), _name) << endmsg;
+                                /* XXX what now? */
+                        }
 
-               XMLNode &before = _playlist->get_state();
-               _playlist->freeze ();
+                        _last_capture_sources.insert (_last_capture_sources.end(), srcs.begin(), srcs.end());
 
-               for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
+                        _playlist->clear_history ();
+                        _playlist->freeze ();
 
-                       string region_name;
+                        uint32_t buffer_position = 0;
+                        for (buffer_position = 0, ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
 
-                       _session.region_name (region_name, _write_source->name(), false);
+                                string region_name;
 
-                       // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n";
+                                RegionFactory::region_name (region_name, _write_source->name(), false);
 
-                       try {
-                               boost::shared_ptr<Region> rx (RegionFactory::create (srcs, buffer_position, (*ci)->frames, region_name));
-                               region = boost::dynamic_pointer_cast<MidiRegion> (rx);
-                       }
+                                // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n";
 
-                       catch (failed_constructor& err) {
-                               error << _("MidiDiskstream: could not create region for captured midi!") << endmsg;
-                               continue; /* XXX is this OK? */
-                       }
-
-                       region->GoingAway.connect (bind (mem_fun (*this, &Diskstream::remove_region_from_last_capture), boost::weak_ptr<Region>(region)));
+                                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_regions.push_back (region);
+                                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;
+                                // 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--;
-
-                       buffer_position += (*ci)->frames;
-               }
+                                i_am_the_modifier++;
+                                _playlist->add_region (region, (*ci)->start);
+                                i_am_the_modifier--;
 
-               _playlist->thaw ();
-               XMLNode &after = _playlist->get_state();
-               _session.add_command (new MementoCommand<Playlist>(*_playlist, &before, &after));
+                                buffer_position += (*ci)->frames;
+                        }
 
-       }
+                        _playlist->thaw ();
+                        _session.add_command (new StatefulDiffCommand(_playlist));
+                }
 
-       mark_write_completed = true;
+                mark_write_completed = true;
+       }
 
-       reset_write_sources (mark_write_completed);
+        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;
 }
@@ -1271,15 +1126,6 @@ MidiDiskstream::set_record_enabled (bool yn)
 
        assert(!destructive());
 
-       if (yn && _source_port == 0) {
-
-               /* pick up connections not initiated *from* the IO object
-                  we're associated with.
-               */
-
-               get_input_sources ();
-       }
-
        /* yes, i know that this not proof against race conditions, but its
           good enough. i think.
        */
@@ -1304,10 +1150,6 @@ MidiDiskstream::engage_record_enable ()
                _source_port->request_monitor_input (!(_session.config.get_auto_input() && rolling));
        }
 
-       // FIXME: Why is this necessary?  Isn't needed for AudioDiskstream...
-       if (!_write_source)
-               use_new_write_source();
-
        _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame());
 
        RecordEnableChanged (); /* EMIT SIGNAL */
@@ -1329,7 +1171,7 @@ MidiDiskstream::disengage_record_enable ()
 XMLNode&
 MidiDiskstream::get_state ()
 {
-       XMLNode* node = new XMLNode ("MidiDiskstream");
+       XMLNode* node = new XMLNode ("Diskstream");
        char buf[64];
        LocaleGuard lg (X_("POSIX"));
 
@@ -1366,7 +1208,7 @@ MidiDiskstream::get_state ()
                if (_session.config.get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) {
                        snprintf (buf, sizeof (buf), "%" PRId64, pi->start());
                } else {
-                       snprintf (buf, sizeof (buf), "%" PRIu32, _session.transport_frame());
+                       snprintf (buf, sizeof (buf), "%" PRId64, _session.transport_frame());
                }
 
                cs_child->add_property (X_("at"), buf);
@@ -1381,12 +1223,11 @@ MidiDiskstream::get_state ()
 }
 
 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;
-       uint32_t nchans = 1;
        XMLNode* capture_pending_node = 0;
        LocaleGuard lg (X_("POSIX"));
 
@@ -1434,10 +1275,6 @@ MidiDiskstream::set_state (const XMLNode& node, int version)
 
        set_channel_mode(channel_mode, channel_mask);
 
-       if ((prop = node.property ("channels")) != 0) {
-               nchans = atoi (prop->value().c_str());
-       }
-
        if ((prop = node.property ("playlist")) == 0) {
                return -1;
        }
@@ -1450,7 +1287,7 @@ MidiDiskstream::set_state (const XMLNode& node, int version)
                }
 
                if (!had_playlist) {
-                       _playlist->set_orig_diskstream_id (_id);
+                       _playlist->set_orig_diskstream_id (id());
                }
 
                if (capture_pending_node) {
@@ -1469,17 +1306,6 @@ MidiDiskstream::set_state (const XMLNode& node, int version)
 
        in_set_state = false;
 
-       /* make sure this is clear before we do anything else */
-
-       // FIXME?
-       //_capturing_source = 0;
-
-       /* write sources are handled when we handle the input set
-          up of the IO that owns this DS (::non_realtime_input_change())
-       */
-
-       in_set_state = false;
-
        return 0;
 }
 
@@ -1492,18 +1318,10 @@ MidiDiskstream::use_new_write_source (uint32_t n)
 
        assert(n == 0);
 
-       if (_write_source) {
-
-               if (_write_source->is_empty ()) {
-                       _write_source->mark_for_remove ();
-                       _write_source.reset();
-               } else {
-                       _write_source.reset();
-               }
-       }
+        _write_source.reset();
 
        try {
-               _write_source = boost::dynamic_pointer_cast<SMFSource>(_session.create_midi_source_for_session (*this));
+               _write_source = boost::dynamic_pointer_cast<SMFSource>(_session.create_midi_source_for_session (0, name ()));
                if (!_write_source) {
                        throw failed_constructor();
                }
@@ -1516,14 +1334,24 @@ MidiDiskstream::use_new_write_source (uint32_t n)
        }
 
        _write_source->set_allow_remove_if_empty (true);
+       _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame());
 
        return 0;
 }
 
+list<boost::shared_ptr<Source> > 
+MidiDiskstream::steal_write_sources()
+{
+        list<boost::shared_ptr<Source> > ret;
+        ret.push_back (_write_source);
+        reset_write_sources (false);
+        return ret;
+}
+
 void
 MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
 {
-       if (!recordable()) {
+       if (!_session.writable() || !recordable()) {
                return;
        }
 
@@ -1532,17 +1360,13 @@ MidiDiskstream::reset_write_sources (bool mark_write_complete, bool /*force*/)
        }
 
        use_new_write_source (0);
-
-       if (record_enabled()) {
-               //_capturing_sources.push_back (_write_source);
-       }
 }
 
 int
 MidiDiskstream::rename_write_sources ()
 {
        if (_write_source != 0) {
-               _write_source->set_source_name (_name, destructive());
+               _write_source->set_source_name (_name.val(), destructive());
                /* XXX what to do if this fails ? */
        }
        return 0;
@@ -1624,14 +1448,13 @@ MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end)
 
        // Translates stamps to be relative to start
 
-       _playback_buf->read(dst, start, end);
 
-#if 0
+#ifndef NDEBUG
        const size_t events_read = _playback_buf->read(dst, start, end);
-       cout << _name << ": MDS events read = " << events_read
-            << " start = " << start << " end = " << end
-            << " readspace " << _playback_buf->read_space()
-            << " writespace " << _playback_buf->write_space() << endl;
+       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
 
        gint32 frames_read = end - start;