Respond to MMC even when synced to JACK. Fixes #3700.
[ardour.git] / libs / ardour / midi_track.cc
index d4f7be1e6f567d8a2506008468b4f9fb166939f9..cdd4633448e7590138d83354a153b61319c88920 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
        By Dave Robillard, 2006
 
     This program is free software; you can redistribute it and/or modify
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include <pbd/error.h>
-#include <sigc++/retype.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/bind.h>
-
-#include <ardour/midi_track.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/session.h>
-#include <ardour/redirect.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_source.h>
-#include <ardour/route_group_specialized.h>
-#include <ardour/insert.h>
-#include <ardour/midi_playlist.h>
-#include <ardour/panner.h>
-#include <ardour/utils.h>
+#include "pbd/error.h"
+
+#include "pbd/enumwriter.h"
+#include "pbd/convert.h"
+#include "midi++/events.h"
+#include "evoral/midi_util.h"
+
+#include "ardour/amp.h"
+#include "ardour/buffer_set.h"
+#include "ardour/debug.h"
+#include "ardour/delivery.h"
+#include "ardour/io_processor.h"
+#include "ardour/meter.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_port.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_track.h"
+#include "ardour/panner.h"
+#include "ardour/port.h"
+#include "ardour/processor.h"
+#include "ardour/route_group_specialized.h"
+#include "ardour/session.h"
+#include "ardour/session_playlists.h"
+#include "ardour/utils.h"
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 
 MidiTrack::MidiTrack (Session& sess, string name, Route::Flag flag, TrackMode mode)
-       : Route (sess, name, 1, -1, -1, -1, flag, Buffer::MIDI),
-         diskstream (0),
-         _midi_rec_enable_control (*this, _session.midi_port())
+       : Track (sess, name, flag, mode, DataType::MIDI)
+       , _immediate_events(1024) // FIXME: size?
+       , _step_edit_ring_buffer(64) // FIXME: size?
+       , _note_mode(Sustained)
+       , _step_editing (false)
+       , _default_channel (0)
+       , _midi_thru (true)
 {
-       MidiDiskstream::Flag dflags = MidiDiskstream::Flag (0);
-
-       if (_flags & Hidden) {
-               dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Hidden);
-       } else {
-               dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Recordable);
-       }
-
-       if (mode == Destructive) {
-               dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Destructive);
-       }
-
-       MidiDiskstream* ds = new MidiDiskstream (_session, name, dflags);
-       
-       _declickable = true;
-       _freeze_record.state = NoFreeze;
-       _saved_meter_point = _meter_point;
-       _mode = mode;
-
-       set_diskstream (*ds, this);
-
-       // session.SMPTEOffsetChanged.connect (mem_fun (*this, &MidiTrack::handle_smpte_offset_change));
-
-       // we do this even though Route already did it in it's init
-       reset_midi_control (_session.midi_port(), _session.get_midi_control());
-       
-}
-
-MidiTrack::MidiTrack (Session& sess, const XMLNode& node)
-       : Route (sess, "to be renamed", 0, 0, -1, -1),
-         diskstream (0),
-         _midi_rec_enable_control (*this, _session.midi_port())
-{
-       _freeze_record.state = NoFreeze;
-       set_state (node);
-       _declickable = true;
-       _saved_meter_point = _meter_point;
-
-       // we do this even though Route already did it in it's init
-       reset_midi_control (_session.midi_port(), _session.get_midi_control());
 }
 
 MidiTrack::~MidiTrack ()
 {
-       if (diskstream) {
-               diskstream->unref();
-       }
 }
 
-#if 0
 void
-MidiTrack::handle_smpte_offset_change ()
-{
-       diskstream
-}
-#endif
-
-int
-MidiTrack::deprecated_use_diskstream_connections ()
+MidiTrack::use_new_diskstream ()
 {
-       if (diskstream->deprecated_io_node == 0) {
-               return 0;
-       }
-
-       const XMLProperty* prop;
-       XMLNode& node (*diskstream->deprecated_io_node);
-
-       /* don't do this more than once. */
-
-       diskstream->deprecated_io_node = 0;
-
-       set_input_minimum (-1);
-       set_input_maximum (-1);
-       set_output_minimum (-1);
-       set_output_maximum (-1);
-       
-       if ((prop = node.property ("gain")) != 0) {
-               set_gain (atof (prop->value().c_str()), this);
-               _gain = _desired_gain;
-       }
-
-       if ((prop = node.property ("input-connection")) != 0) {
-               Connection* c = _session.connection_by_name (prop->value());
-               
-               if (c == 0) {
-                       PBD::error << string_compose(_("Unknown connection \"%1\" listed for input of %2"), prop->value(), _name) << endmsg;
-                       
-                       if ((c = _session.connection_by_name (_("in 1"))) == 0) {
-                               PBD::error << _("No input connections available as a replacement")
-                               << endmsg;
-                               return -1;
-                       } else {
-                               PBD::info << string_compose (_("Connection %1 was not available - \"in 1\" used instead"), prop->value())
-                              << endmsg;
-                       }
-               }
-
-               use_input_connection (*c, this);
-
-       } else if ((prop = node.property ("inputs")) != 0) {
-               if (set_inputs (prop->value())) {
-                       PBD::error << string_compose(_("improper input channel list in XML node (%1)"), prop->value()) << endmsg;
-                       return -1;
-               }
-       }
-       
-       return 0;
-}
-
-int
-MidiTrack::set_diskstream (MidiDiskstream& ds, void *src)
-{
-       if (diskstream) {
-               diskstream->unref();
-       }
-
-       diskstream = &ds.ref();
-       diskstream->set_io (*this);
-       diskstream->set_destructive (_mode == Destructive);
-
-       if (diskstream->deprecated_io_node) {
+       MidiDiskstream::Flag dflags = MidiDiskstream::Flag (0);
 
-               if (!connecting_legal) {
-                       ConnectingLegal.connect (mem_fun (*this, &MidiTrack::deprecated_use_diskstream_connections));
-               } else {
-                       deprecated_use_diskstream_connections ();
-               }
+       if (_flags & Hidden) {
+               dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Hidden);
+       } else {
+               dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Recordable);
        }
 
-       diskstream->set_record_enabled (false, this);
-       //diskstream->monitor_input (false);
+       assert(_mode != Destructive);
 
-       ic_connection.disconnect();
-       ic_connection = input_changed.connect (mem_fun (*diskstream, &MidiDiskstream::handle_input_change));
+       boost::shared_ptr<MidiDiskstream> ds (new MidiDiskstream (_session, name(), dflags));
+       ds->do_refill_with_alloc ();
+       ds->set_block_size (_session.get_block_size ());
 
-       diskstream_changed (src); /* EMIT SIGNAL */
-
-       return 0;
-}      
-
-int 
-MidiTrack::use_diskstream (string name)
-{
-       /*
-       MidiDiskstream *dstream;
-
-       if ((dstream = _session.diskstream_by_name (name)) == 0) {
-         PBD::error << string_compose(_("MidiTrack: diskstream \"%1\" not known by session"), name) << endmsg;
-               return -1;
-       }
-
-       return set_diskstream (*dstream, this);
-       */
-       return 0;
+       set_diskstream (ds);
 }
 
-int 
-MidiTrack::use_diskstream (id_t id)
+void
+MidiTrack::set_record_enabled (bool yn, void *src)
 {
-       /*
-       MidiDiskstream *dstream;
+        if (_step_editing) {
+                return;
+        }
 
-       if ((dstream = _session.diskstream_by_id (id)) == 0) {
-               PBD::error << string_compose(_("MidiTrack: diskstream \"%1\" not known by session"), id) << endmsg;
-               return -1;
-       }
-       
-       return set_diskstream (*dstream, this);
-       */
-       return 0;
-}
-
-bool
-MidiTrack::record_enabled () const
-{
-       return diskstream->record_enabled ();
+        Track::set_record_enabled (yn, src);
 }
 
 void
-MidiTrack::set_record_enable (bool yn, void *src)
+MidiTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 {
-       if (_freeze_record.state == Frozen) {
-               return;
-       }
-#if 0
-       if (_mix_group && src != _mix_group && _mix_group->is_active()) {
-               _mix_group->apply (&MidiTrack::set_record_enable, yn, _mix_group);
-               return;
-       }
+       Track::set_diskstream (ds);
+       
+       _diskstream->set_track (this);
+       _diskstream->set_destructive (_mode == Destructive);
 
-       /* keep track of the meter point as it was before we rec-enabled */
+       _diskstream->set_record_enabled (false);
+       //_diskstream->monitor_input (false);
 
-       if (!diskstream->record_enabled()) {
-               _saved_meter_point = _meter_point;
-       }
-       
-       diskstream->set_record_enabled (yn, src);
+       _diskstream_data_recorded_connection.disconnect ();
+       boost::shared_ptr<MidiDiskstream> mds = boost::dynamic_pointer_cast<MidiDiskstream> (ds);
+       mds->DataRecorded.connect_same_thread (_diskstream_data_recorded_connection, boost::bind (&MidiTrack::diskstream_data_recorded, this, _1, _2));
 
-       if (diskstream->record_enabled()) {
-               set_meter_point (MeterInput, this);
-       } else {
-               set_meter_point (_saved_meter_point, this);
-       }
+       DiskstreamChanged (); /* EMIT SIGNAL */
+}
 
-       if (_session.get_midi_feedback()) {
-               _midi_rec_enable_control.send_feedback (record_enabled());
-       }
-#endif
+boost::shared_ptr<MidiDiskstream>
+MidiTrack::midi_diskstream() const
+{
+       return boost::dynamic_pointer_cast<MidiDiskstream>(_diskstream);
 }
 
-void
-MidiTrack::set_meter_point (MeterPoint p, void *src)
+int
+MidiTrack::set_state (const XMLNode& node, int version)
 {
-       Route::set_meter_point (p, src);
+       return _set_state (node, version, true);
 }
 
 int
-MidiTrack::set_state (const XMLNode& node)
+MidiTrack::_set_state (const XMLNode& node, int version, bool call_base)
 {
        const XMLProperty *prop;
        XMLNodeConstIterator iter;
-       XMLNodeList midi_kids;
 
-       if (Route::set_state (node)) {
+       if (Route::_set_state (node, version, call_base)) {
                return -1;
        }
 
-       if ((prop = node.property (X_("mode"))) != 0) {
-               if (prop->value() == X_("normal")) {
-                       _mode = Normal;
-               } else if (prop->value() == X_("destructive")) {
-                       _mode = Destructive;
-               } else {
-                       PBD::warning << string_compose ("unknown midi track mode \"%1\" seen and ignored", prop->value()) << endmsg;
-                       _mode = Normal;
-               }
+       // No destructive MIDI tracks (yet?)
+       _mode = Normal;
+
+       if ((prop = node.property (X_("note-mode"))) != 0) {
+               _note_mode = NoteMode (string_2_enum (prop->value(), _note_mode));
        } else {
-               _mode = Normal;
+               _note_mode = Sustained;
        }
 
-       midi_kids = node.children ("MIDI");
-       
-       for (iter = midi_kids.begin(); iter != midi_kids.end(); ++iter) {
-       
-               XMLNodeList kids;
-               XMLNodeConstIterator miter;
-               XMLNode*    child;
-
-               kids = (*iter)->children ();
-
-               for (miter = kids.begin(); miter != kids.end(); ++miter) {
-
-                       child =* miter;
-
-                       if (child->name() == "rec_enable") {
-                       
-                               MIDI::eventType ev = MIDI::on; /* initialize to keep gcc happy */
-                               MIDI::byte additional = 0;  /* ditto */
-                               MIDI::channel_t chn = 0;    /* ditto */
-
-                               if (get_midi_node_info (child, ev, chn, additional)) {
-                                       _midi_rec_enable_control.set_control_type (chn, ev, additional);
-                               } else {
-                                 PBD::error << string_compose(_("MIDI rec_enable control specification for %1 is incomplete, so it has been ignored"), _name) << endmsg;
-                               }
-                       }
-               }
+       if ((prop = node.property ("midi-thru")) != 0) {
+               set_midi_thru (prop->value() == "yes");
        }
 
-       
-       if ((prop = node.property ("diskstream-id")) == 0) {
-               
-               /* some old sessions use the diskstream name rather than the ID */
-
-               if ((prop = node.property ("diskstream")) == 0) {
-                       PBD::fatal << _("programming error: MidiTrack given state without diskstream!") << endmsg;
-                       /*NOTREACHED*/
-                       return -1;
-               }
-
-               if (use_diskstream (prop->value())) {
-                       return -1;
-               }
-
-       } else {
-               
-               id_t id = strtoull (prop->value().c_str(), 0, 10);
-               
-               if (use_diskstream (id)) {
-                       return -1;
-               }
+       if ((prop = node.property ("default-channel")) != 0) {
+               set_default_channel ((uint8_t) atoi (prop->value()));
        }
 
-
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
        XMLNode *child;
 
        nlist = node.children();
+
+       if (version >= 3000) {
+               if ((child = find_named_node (node, X_("Diskstream"))) != 0) {
+                       boost::shared_ptr<MidiDiskstream> ds (new MidiDiskstream (_session, *child));
+                       ds->do_refill_with_alloc ();
+                       set_diskstream (ds);
+               }
+       }
+
+        /* set rec-enable control *AFTER* setting up diskstream, because it may want to operate
+           on the diskstream as it sets its own state
+        */
+
        for (niter = nlist.begin(); niter != nlist.end(); ++niter){
                child = *niter;
 
-               if (child->name() == X_("remote_control")) {
-                       if ((prop = child->property (X_("id"))) != 0) {
-                               int32_t x;
-                               sscanf (prop->value().c_str(), "%d", &x);
-                               set_remote_control_id (x);
-                       }
-               }
+                if (child->name() == Controllable::xml_node_name && (prop = child->property ("name")) != 0) {
+                        if (prop->value() == X_("recenable")) {
+                                _rec_enable_control->set_state (*child, version);
+                        }
+                }
        }
 
        pending_state = const_cast<XMLNode*> (&node);
 
-       _session.StateReady.connect (mem_fun (*this, &MidiTrack::set_state_part_two));
+       if (_session.state_of_the_state() & Session::Loading) {
+               _session.StateReady.connect_same_thread (*this, boost::bind (&MidiTrack::set_state_part_two, this));
+       } else {
+               set_state_part_two ();
+       }
 
        return 0;
 }
 
 XMLNode&
-MidiTrack::get_template ()
-{
-       return state (false);
-}
-
-XMLNode&
-MidiTrack::get_state ()
-{
-       return state (true);
-}
-
-XMLNode& 
 MidiTrack::state(bool full_state)
 {
        XMLNode& root (Route::state(full_state));
        XMLNode* freeze_node;
-       char buf[32];
+       char buf[64];
 
        if (_freeze_record.playlist) {
                XMLNode* inode;
 
                freeze_node = new XMLNode (X_("freeze-info"));
                freeze_node->add_property ("playlist", _freeze_record.playlist->name());
-               snprintf (buf, sizeof (buf), "%d", (int) _freeze_record.state);
-               freeze_node->add_property ("state", buf);
+               freeze_node->add_property ("state", enum_2_string (_freeze_record.state));
 
-               for (vector<FreezeRecordInsertInfo*>::iterator i = _freeze_record.insert_info.begin(); i != _freeze_record.insert_info.end(); ++i) {
-                       inode = new XMLNode (X_("insert"));
-                       snprintf (buf, sizeof (buf), "%" PRIu64, (*i)->id);
+               for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) {
+                       inode = new XMLNode (X_("processor"));
+                       (*i)->id.print (buf, sizeof(buf));
                        inode->add_property (X_("id"), buf);
                        inode->add_child_copy ((*i)->state);
-               
+
                        freeze_node->add_child_nocopy (*inode);
                }
 
                root.add_child_nocopy (*freeze_node);
        }
 
-       /* Alignment: act as a proxy for the diskstream */
-       
-       XMLNode* align_node = new XMLNode (X_("alignment"));
-       switch (diskstream->alignment_style()) {
-       case ExistingMaterial:
-               snprintf (buf, sizeof (buf), X_("existing"));
-               break;
-       case CaptureTime:
-               snprintf (buf, sizeof (buf), X_("capture"));
-               break;
-       }
-       align_node->add_property (X_("style"), buf);
-       root.add_child_nocopy (*align_node);
-
-       /* MIDI control */
-
-       MIDI::channel_t chn;
-       MIDI::eventType ev;
-       MIDI::byte      additional;
-       XMLNode*        midi_node = 0;
-       XMLNode*        child;
-       XMLNodeList     midikids;
-
-       midikids = root.children ("MIDI");
-       if (!midikids.empty()) {
-               midi_node = midikids.front();
-       }
-       else {
-               midi_node = root.add_child ("MIDI");
-       }
-               
-       if (_midi_rec_enable_control.get_control_info (chn, ev, additional) && midi_node) {
-
-               child = midi_node->add_child ("rec_enable");
-               set_midi_node_info (child, ev, chn, additional);
-       }
+       root.add_property (X_("note-mode"), enum_2_string (_note_mode));
+       root.add_child_nocopy (_rec_enable_control->get_state());
+       root.add_child_nocopy (_diskstream->get_state ());
 
-       XMLNode* remote_control_node = new XMLNode (X_("remote_control"));
-       snprintf (buf, sizeof (buf), "%d", _remote_control_id);
-       remote_control_node->add_property (X_("id"), buf);
-       root.add_child_nocopy (*remote_control_node);
-
-       switch (_mode) {
-       case Normal:
-               root.add_property (X_("mode"), X_("normal"));
-               break;
-       case Destructive:
-               root.add_property (X_("mode"), X_("destructive"));
-               break;
-       }
-
-       /* we don't return diskstream state because we don't
-          own the diskstream exclusively. control of the diskstream
-          state is ceded to the Session, even if we create the
-          diskstream.
-       */
-
-       snprintf (buf, sizeof (buf), "%" PRIu64, diskstream->id());
-       root.add_property ("diskstream-id", buf);
+       root.add_property ("step-editing", (_step_editing ? "yes" : "no"));
+       root.add_property ("note-mode", enum_2_string (_note_mode));
+       root.add_property ("midi-thru", (_midi_thru ? "yes" : "no"));
+       snprintf (buf, sizeof (buf), "%d", (int) _default_channel);
+       root.add_property ("default-channel", buf);
 
        return root;
 }
@@ -480,688 +246,415 @@ MidiTrack::set_state_part_two ()
 
        if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) {
 
-               
-               _freeze_record.have_mementos = false;
                _freeze_record.state = Frozen;
-               
-               for (vector<FreezeRecordInsertInfo*>::iterator i = _freeze_record.insert_info.begin(); i != _freeze_record.insert_info.end(); ++i) {
+
+               for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) {
                        delete *i;
                }
-               _freeze_record.insert_info.clear ();
-               
+               _freeze_record.processor_info.clear ();
+
                if ((prop = fnode->property (X_("playlist"))) != 0) {
-                       Playlist* pl = _session.playlist_by_name (prop->value());
+                       boost::shared_ptr<Playlist> pl = _session.playlists->by_name (prop->value());
                        if (pl) {
-                               _freeze_record.playlist = dynamic_cast<MidiPlaylist*> (pl);
+                               _freeze_record.playlist = boost::dynamic_pointer_cast<MidiPlaylist> (pl);
                        } else {
-                               _freeze_record.playlist = 0;
+                               _freeze_record.playlist.reset();
                                _freeze_record.state = NoFreeze;
                        return;
                        }
                }
-               
+
                if ((prop = fnode->property (X_("state"))) != 0) {
-                       _freeze_record.state = (FreezeState) atoi (prop->value().c_str());
+                       _freeze_record.state = FreezeState (string_2_enum (prop->value(), _freeze_record.state));
                }
-               
+
                XMLNodeConstIterator citer;
                XMLNodeList clist = fnode->children();
-               
+
                for (citer = clist.begin(); citer != clist.end(); ++citer) {
-                       if ((*citer)->name() != X_("insert")) {
+                       if ((*citer)->name() != X_("processor")) {
                                continue;
                        }
-                       
+
                        if ((prop = (*citer)->property (X_("id"))) == 0) {
                                continue;
                        }
-                       
-                       FreezeRecordInsertInfo* frii = new FreezeRecordInsertInfo (*((*citer)->children().front()));
-                       frii->insert = 0;
-                       sscanf (prop->value().c_str(), "%" PRIu64, &frii->id);
-                       _freeze_record.insert_info.push_back (frii);
-               }
-       }
-
-       /* Alignment: act as a proxy for the diskstream */
 
-       if ((fnode = find_named_node (*pending_state, X_("alignment"))) != 0) {
-
-               if ((prop = fnode->property (X_("style"))) != 0) {
-                       if (prop->value() == "existing") {
-                               diskstream->set_persistent_align_style (ExistingMaterial);
-                       } else if (prop->value() == "capture") {
-                               diskstream->set_persistent_align_style (CaptureTime);
-                       }
+                       FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()),
+                                                                                  boost::shared_ptr<Processor>());
+                       frii->id = prop->value ();
+                       _freeze_record.processor_info.push_back (frii);
                }
        }
-       return;
-}      
 
-uint32_t
-MidiTrack::n_process_buffers ()
-{
-       return max ((uint32_t) diskstream->n_channels(), redirect_max_outs);
-}
+       if ((fnode = find_named_node (*pending_state, X_("Diskstream"))) != 0) {
+               boost::shared_ptr<MidiDiskstream> ds (new MidiDiskstream (_session, *fnode));
+               ds->do_refill_with_alloc ();
+               ds->set_block_size (_session.get_block_size ());
+               set_diskstream (ds);
+       }
 
-void
-MidiTrack::passthru_silence (jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t nframes, jack_nframes_t offset, int declick, bool meter)
-{
-       uint32_t nbufs = n_process_buffers ();
-       process_output_buffers (_session.get_silent_buffers (nbufs), nbufs, start_frame, end_frame, nframes, offset, true, declick, meter);
+       return;
 }
 
-int 
-MidiTrack::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
-                    bool session_state_changing, bool can_record, bool rec_monitors_input)
+int
+MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick,
+                bool can_record, bool rec_monitors_input, bool& needs_butler)
 {
-       if (n_outputs() == 0) {
+       Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
+       if (!lm.locked()) {
                return 0;
        }
 
-       if (!_active) {
-               silence (nframes, offset);
-               return 0;
-       }
-
-       if (session_state_changing) {
-
-               /* XXX is this safe to do against transport state changes? */
-
-               passthru_silence (start_frame, end_frame, nframes, offset, 0, false);
-               return 0;
-       }
-
-       diskstream->check_record_status (start_frame, nframes, can_record);
-
-       bool send_silence;
-       
-       if (_have_internal_generator) {
-               /* since the instrument has no input streams,
-                  there is no reason to send any signal
-                  into the route.
-               */
-               send_silence = true;
-       } else {
-
-               if (_session.get_auto_input()) {
-                       if (Config->get_use_sw_monitoring()) {
-                               send_silence = false;
-                       } else {
-                               send_silence = true;
-                       }
-               } else {
-                       if (diskstream->record_enabled()) {
-                               if (Config->get_use_sw_monitoring()) {
-                                       send_silence = false;
-                               } else {
-                                       send_silence = true;
-                               }
-                       } else {
-                               send_silence = true;
-                       }
-               }
-       }
-
-       apply_gain_automation = false;
-
-       if (send_silence) {
-               
-               /* if we're sending silence, but we want the meters to show levels for the signal,
-                  meter right here.
-               */
-               
-               if (_have_internal_generator) {
-                       passthru_silence (start_frame, end_frame, nframes, offset, 0, true);
-               } else {
-                       if (_meter_point == MeterInput) {
-                               just_meter_input (start_frame, end_frame, nframes, offset);
-                       }
-                       passthru_silence (start_frame, end_frame, nframes, offset, 0, false);
-               }
-
-       } else {
-       
-               /* we're sending signal, but we may still want to meter the input. 
-                */
-
-               passthru (start_frame, end_frame, nframes, offset, 0, (_meter_point == MeterInput));
-       }
+       int dret;
+       boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
 
-       return 0;
-}
+       automation_snapshot (start_frame);
 
-int
-MidiTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, int declick,
-                 bool can_record, bool rec_monitors_input)
-{
-#if 0
-       int dret;
-       Sample* b;
-       Sample* tmpb;
-       jack_nframes_t transport_frame;
-
-       {
-               Glib::RWLock::ReaderLock lm (redirect_lock, Glib::TRY_LOCK);
-               if (lm.locked()) {
-                       // automation snapshot can also be called from the non-rt context
-                       // and it uses the redirect list, so we take the lock out here
-                       automation_snapshot (start_frame);
-               }
-       }
-       
-       if (n_outputs() == 0 && _redirects.empty()) {
+       if (n_outputs().n_total() == 0 && _processors.empty()) {
                return 0;
        }
 
        if (!_active) {
-               silence (nframes, offset);
+               silence (nframes);
                return 0;
        }
 
-       transport_frame = _session.transport_frame();
+       framepos_t transport_frame = _session.transport_frame();
 
-       if ((nframes = check_initial_delay (nframes, offset, transport_frame)) == 0) {
+       if ((nframes = check_initial_delay (nframes, transport_frame)) == 0) {
                /* need to do this so that the diskstream sets its
                   playback distance to zero, thus causing diskstream::commit
                   to do nothing.
-               */
-               return diskstream->process (transport_frame, 0, 0, can_record, rec_monitors_input);
-       } 
+                  */
+               return diskstream->process (transport_frame, 0, can_record, rec_monitors_input, needs_butler);
+       }
 
        _silent = false;
-       apply_gain_automation = false;
-
-       if ((dret = diskstream->process (transport_frame, nframes, offset, can_record, rec_monitors_input)) != 0) {
-               
-               silence (nframes, offset);
 
+       if ((dret = diskstream->process (transport_frame, nframes, can_record, rec_monitors_input, needs_butler)) != 0) {
+               silence (nframes);
                return dret;
        }
 
        /* special condition applies */
-       
+
        if (_meter_point == MeterInput) {
-               just_meter_input (start_frame, end_frame, nframes, offset);
+               _input->process_input (_meter, start_frame, end_frame, nframes);
        }
 
-       if (diskstream->record_enabled() && !can_record && !_session.get_auto_input()) {
+       if (diskstream->record_enabled() && !can_record && !_session.config.get_auto_input()) {
 
                /* not actually recording, but we want to hear the input material anyway,
                   at least potentially (depending on monitoring options)
-                */
-
-               passthru (start_frame, end_frame, nframes, offset, 0, true);
+               */
 
-       } else if ((b = diskstream->playback_buffer(0)) != 0) {
+               passthru (start_frame, end_frame, nframes, 0);
 
+       } else {
                /*
-                 XXX is it true that the earlier test on n_outputs()
-                 means that we can avoid checking it again here? i think
-                 so, because changing the i/o configuration of an IO
-                 requires holding the AudioEngine lock, which we hold
-                 while in the process() tree.
-               */
+                  XXX is it true that the earlier test on n_outputs()
+                  means that we can avoid checking it again here? i think
+                  so, because changing the i/o configuration of an IO
+                  requires holding the AudioEngine lock, which we hold
+                  while in the process() tree.
+                  */
+
 
-               
                /* copy the diskstream data to all output buffers */
-               
-               vector<Sample*>& bufs = _session.get_passthru_buffers ();
-               uint32_t limit = n_process_buffers ();
-               
-               uint32_t n;
-               uint32_t i;
-
-
-               for (i = 0, n = 1; i < limit; ++i, ++n) {
-                       memcpy (bufs[i], b, sizeof (Sample) * nframes); 
-                       if (n < diskstream->n_channels()) {
-                               tmpb = diskstream->playback_buffer(n);
-                               if (tmpb!=0) {
-                                       b = tmpb;
-                               }
-                       }
-               }
 
-               /* don't waste time with automation if we're recording or we've just stopped (yes it can happen) */
+               //const size_t limit = n_process_buffers().n_audio();
+               BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers());
+               MidiBuffer& mbuf (bufs.get_midi (0));
 
-               if (!diskstream->record_enabled() && _session.transport_rolling()) {
-                       Glib::Mutex::Lock am (automation_lock, Glib::TRY_LOCK);
-                       
-                       if (am.locked() && gain_automation_playback()) {
-                               apply_gain_automation = _gain_automation_curve.rt_safe_get_vector (start_frame, end_frame, _session.gain_automation_buffer(), nframes);
-                       }
-               }
+               /* we are a MIDI track, so we always start the chain with a single-channel diskstream */
+               ChanCount c;
+               c.set_audio (0);
+               c.set_midi (1);
+               bufs.set_count (c);
 
-               process_output_buffers (bufs, limit, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || !_session.get_do_not_record_plugins()), declick, (_meter_point != MeterInput));
-               
-       } else {
-               /* problem with the diskstream; just be quiet for a bit */
-               silence (nframes, offset);
-       }
-#endif
-       return 0;
-}
+               diskstream->get_playback (mbuf, start_frame, end_frame);
 
-int
-MidiTrack::silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
-                        bool can_record, bool rec_monitors_input)
-{
-       if (n_outputs() == 0 && _redirects.empty()) {
-               return 0;
-       }
+               /* append immediate messages to the first MIDI buffer (thus sending it to the first output port) */
 
-       if (!_active) {
-               silence (nframes, offset);
-               return 0;
-       }
+               write_out_of_band_data (bufs, start_frame, end_frame, nframes);
 
-       _silent = true;
-       apply_gain_automation = false;
+               /* final argument: don't waste time with automation if we're recording or we've just stopped (yes it can happen) */
 
-       silence (nframes, offset);
+               process_output_buffers (bufs, start_frame, end_frame, nframes,
+                                       (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick,
+                                        (!diskstream->record_enabled() && !_session.transport_stopped()));
+       }
 
-       return diskstream->process (_session.transport_frame() + offset, nframes, offset, can_record, rec_monitors_input);
-}
+       _main_outs->flush_buffers (nframes, end_frame - start_frame - 1);
 
-void
-MidiTrack::toggle_monitor_input ()
-{
-       for (vector<Port*>::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
-               (*i)->request_monitor_input(!(*i)->monitoring_input());
-       }
+       return 0;
 }
 
 int
-MidiTrack::set_name (string str, void *src)
+MidiTrack::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
+                   bool state_changing, bool can_record, bool rec_monitors_input)
 {
-       int ret;
-
-       if (record_enabled() && _session.actively_recording()) {
-               /* this messes things up if done while recording */
-               return -1;
-       }
+       int ret = Track::no_roll (nframes, start_frame, end_frame, state_changing, can_record, rec_monitors_input);
 
-       if (diskstream->set_name (str, src)) {
-               return -1;
+       if (ret == 0 && _step_editing) {
+               push_midi_input_to_step_edit_ringbuffer (nframes);
        }
 
-       /* save state so that the statefile fully reflects any filename changes */
-
-       if ((ret = IO::set_name (str, src)) == 0) {
-               _session.save_state ("");
-       }
        return ret;
 }
 
-int
-MidiTrack::export_stuff (vector<unsigned char*>& buffers, char * workbuf, uint32_t nbufs, jack_nframes_t start, jack_nframes_t nframes)
+void
+MidiTrack::realtime_handle_transport_stopped ()
 {
-#if 0
-       gain_t  gain_automation[nframes];
-       gain_t  gain_buffer[nframes];
-       float   mix_buffer[nframes];
-       RedirectList::iterator i;
-       bool post_fader_work = false;
-       gain_t this_gain = _gain;
-       vector<Sample*>::iterator bi;
-       Sample * b;
-       
-       Glib::RWLock::ReaderLock rlock (redirect_lock);
-               
-       if (diskstream->playlist()->read (buffers[0], mix_buffer, gain_buffer, workbuf, start, nframes) != nframes) {
-               return -1;
+       Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
+       if (!lm.locked ()) {
+               return;
        }
 
-       uint32_t n=1;
-       bi = buffers.begin();
-       b = buffers[0];
-       ++bi;
-       for (; bi != buffers.end(); ++bi, ++n) {
-               if (n < diskstream->n_channels()) {
-                       if (diskstream->playlist()->read ((*bi), mix_buffer, gain_buffer, workbuf, start, nframes, n) != nframes) {
-                               return -1;
-                       }
-                       b = (*bi);
-               }
-               else {
-                       /* duplicate last across remaining buffers */
-                       memcpy ((*bi), b, sizeof (Sample) * nframes); 
-               }
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               (*i)->realtime_handle_transport_stopped ();
        }
+}
 
+void
+MidiTrack::push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes)
+{
+       PortSet& ports (_input->ports());
 
-       /* note: only run inserts during export. other layers in the machinery
-          will already have checked that there are no external port inserts.
-       */
-       
-       for (i = _redirects.begin(); i != _redirects.end(); ++i) {
-               Insert *insert;
-               
-               if ((insert = dynamic_cast<Insert*>(*i)) != 0) {
-                       switch (insert->placement()) {
-                       case PreFader:
-                               insert->run (buffers, nbufs, nframes, 0);
-                               break;
-                       case PostFader:
-                               post_fader_work = true;
-                               break;
-                       }
-               }
-       }
-       
-       if (_gain_automation_curve.automation_state() == Play) {
-               
-               _gain_automation_curve.get_vector (start, start + nframes, gain_automation, nframes);
-
-               for (bi = buffers.begin(); bi != buffers.end(); ++bi) {
-                       Sample *b = *bi;
-                       for (jack_nframes_t n = 0; n < nframes; ++n) {
-                               b[n] *= gain_automation[n];
-                       }
-               }
+       for (PortSet::iterator p = ports.begin(DataType::MIDI); p != ports.end(DataType::MIDI); ++p) {
 
-       } else {
+               Buffer& b (p->get_buffer (nframes));
+               const MidiBuffer* const mb = dynamic_cast<MidiBuffer*>(&b);
+               assert (mb);
 
-               for (bi = buffers.begin(); bi != buffers.end(); ++bi) {
-                       Sample *b = *bi;
-                       for (jack_nframes_t n = 0; n < nframes; ++n) {
-                               b[n] *= this_gain;
-                       }
+               for (MidiBuffer::const_iterator e = mb->begin(); e != mb->end(); ++e) {
+
+                       const Evoral::MIDIEvent<framepos_t> ev(*e, false);
+
+                        /* note on, since for step edit, note length is determined
+                           elsewhere 
+                        */
+                        
+                        if (ev.is_note_on()) {
+                                /* we don't care about the time for this purpose */
+                                _step_edit_ring_buffer.write (0, ev.type(), ev.size(), ev.buffer());
+                        }
                }
        }
+}
 
-       if (post_fader_work) {
-
-               for (i = _redirects.begin(); i != _redirects.end(); ++i) {
-                       PluginInsert *insert;
-                       
-                       if ((insert = dynamic_cast<PluginInsert*>(*i)) != 0) {
-                               switch ((*i)->placement()) {
-                               case PreFader:
-                                       break;
-                               case PostFader:
-                                       insert->run (buffers, nbufs, nframes, 0);
-                                       break;
-                               }
-                       }
-               }
-       } 
-#endif
-       return 0;
+void
+MidiTrack::write_out_of_band_data (BufferSet& bufs, framepos_t /*start*/, framepos_t /*end*/, framecnt_t nframes)
+{
+       // Append immediate events
+       MidiBuffer& buf (bufs.get_midi (0));
+        if (_immediate_events.read_space()) {
+                DEBUG_TRACE (DEBUG::MidiIO, string_compose ("%1 has %2 of immediate events to deliver\n", 
+                                                            name(), _immediate_events.read_space()));
+        }
+       _immediate_events.read (buf, 0, 1, nframes-1); // all stamps = 0
+        
+       // MIDI thru: send incoming data "through" output
+       if (_midi_thru && _session.transport_speed() != 0.0f && _input->n_ports().n_midi()) {
+               buf.merge_in_place (_input->midi(0)->get_midi_buffer(nframes));
+       }
+}
+
+int
+MidiTrack::export_stuff (BufferSet& /*bufs*/, framecnt_t /*nframes*/, framepos_t /*end_frame*/)
+{
+       return -1;
 }
 
 void
-MidiTrack::set_latency_delay (jack_nframes_t longest_session_latency)
+MidiTrack::set_latency_delay (framecnt_t longest_session_latency)
 {
        Route::set_latency_delay (longest_session_latency);
-       diskstream->set_roll_delay (_roll_delay);
+       _diskstream->set_roll_delay (_roll_delay);
 }
 
-jack_nframes_t
-MidiTrack::update_total_latency ()
+boost::shared_ptr<Region>
+MidiTrack::bounce (InterThreadInfo& /*itt*/)
 {
-       _own_latency = 0;
-
-       for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
-               if ((*i)->active ()) {
-                       _own_latency += (*i)->latency ();
-               }
-       }
+       throw;
+       // vector<MidiSource*> srcs;
+       // return _session.write_one_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
+       return boost::shared_ptr<Region> ();
+}
 
-       set_port_latency (_own_latency);
 
-       return _own_latency;
+boost::shared_ptr<Region>
+MidiTrack::bounce_range (framepos_t /*start*/, framepos_t /*end*/, InterThreadInfo& /*itt*/, bool /*enable_processing*/)
+{
+       throw;
+       //vector<MidiSource*> srcs;
+       //return _session.write_one_track (*this, start, end, false, srcs, itt);
+       return boost::shared_ptr<Region> ();
 }
 
 void
-MidiTrack::bounce (InterThreadInfo& itt)
+MidiTrack::freeze_me (InterThreadInfo& /*itt*/)
 {
-       //vector<MidiSource*> srcs;
-       //_session.write_one_midi_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
 }
 
+void
+MidiTrack::unfreeze ()
+{
+       _freeze_record.state = UnFrozen;
+       FreezeChange (); /* EMIT SIGNAL */
+}
 
 void
-MidiTrack::bounce_range (jack_nframes_t start, jack_nframes_t end, InterThreadInfo& itt)
+MidiTrack::set_note_mode (NoteMode m)
 {
-       //vector<MidiSource*> srcs;
-       //_session.write_one_midi_track (*this, start, end, false, srcs, itt);
+       _note_mode = m;
+       midi_diskstream()->set_note_mode(m);
 }
 
 void
-MidiTrack::freeze (InterThreadInfo& itt)
+MidiTrack::midi_panic()
 {
-#if 0
-       Insert* insert;
-       vector<MidiSource*> srcs;
-       string new_playlist_name;
-       Playlist* new_playlist;
-       string dir;
-       AudioRegion* region;
-       string region_name;
-       
-       if ((_freeze_record.playlist = diskstream->playlist()) == 0) {
-               return;
+        DEBUG_TRACE (DEBUG::MidiIO, string_compose ("%1 delivers panic data\n", name()));
+       for (uint8_t channel = 0; channel <= 0xF; channel++) {
+               uint8_t ev[3] = { MIDI_CMD_CONTROL | channel, MIDI_CTL_SUSTAIN, 0 };
+               write_immediate_event(3, ev);
+               ev[1] = MIDI_CTL_ALL_NOTES_OFF;
+               write_immediate_event(3, ev);
+               ev[1] = MIDI_CTL_RESET_CONTROLLERS;
+               write_immediate_event(3, ev);
        }
+}
 
-       uint32_t n = 1;
-
-       while (n < (UINT_MAX-1)) {
-        
-               string candidate;
-               
-               candidate = string_compose ("<F%2>%1", _freeze_record.playlist->name(), n);
-
-               if (_session.playlist_by_name (candidate) == 0) {
-                       new_playlist_name = candidate;
-                       break;
-               }
-
-               ++n;
-
-       } 
-
-       if (n == (UINT_MAX-1)) {
-         PBD::error << string_compose (X_("There Are too many frozen versions of playlist \"%1\""
-                           " to create another one"), _freeze_record.playlist->name())
-              << endmsg;
-               return;
+/** \return true on success, false on failure (no buffer space left)
+ */
+bool
+MidiTrack::write_immediate_event(size_t size, const uint8_t* buf)
+{
+       if (!Evoral::midi_event_is_valid(buf, size)) {
+               cerr << "WARNING: Ignoring illegal immediate MIDI event" << endl;
+               return false;
        }
+       const uint32_t type = EventTypeMap::instance().midi_event_type(buf[0]);
+       return (_immediate_events.write(0, type, size, buf) == size);
+}
 
-       if (_session.write_one_midi_track (*this, 0, _session.current_end_frame(), true, srcs, itt)) {
-               return;
+void
+MidiTrack::MidiControl::set_value(double val)
+{
+       bool valid = false;
+       if (isinf(val)) {
+               cerr << "MIDIControl value is infinity" << endl;
+       } else if (isnan(val)) {
+               cerr << "MIDIControl value is NaN" << endl;
+       } else if (val < _list->parameter().min()) {
+               cerr << "MIDIControl value is < " << _list->parameter().min() << endl;
+       } else if (val > _list->parameter().max()) {
+               cerr << "MIDIControl value is > " << _list->parameter().max() << endl;
+       } else {
+               valid = true;
        }
 
-       _freeze_record.insert_info.clear ();
-       _freeze_record.have_mementos = true;
-
-       {
-               Glib::RWLock::ReaderLock lm (redirect_lock);
-               
-               for (RedirectList::iterator r = _redirects.begin(); r != _redirects.end(); ++r) {
-                       
-                       if ((insert = dynamic_cast<Insert*>(*r)) != 0) {
-                               
-                               FreezeRecordInsertInfo* frii  = new FreezeRecordInsertInfo ((*r)->get_state());
-                               
-                               frii->insert = insert;
-                               frii->id = insert->id();
-                               frii->memento = (*r)->get_memento();
-                               
-                               _freeze_record.insert_info.push_back (frii);
-                               
-                               /* now deactivate the insert */
-                               
-                               insert->set_active (false, this);
-                       }
-               }
+       if (!valid) {
+               return;
        }
 
-       new_playlist = new MidiPlaylist (_session, new_playlist_name, false);
-       region_name = new_playlist_name;
-
-       /* create a new region from all filesources, keep it private */
-
-       region = new AudioRegion (srcs, 0, srcs[0]->length(), 
-                                 region_name, 0, 
-                                 (AudioRegion::Flag) (AudioRegion::WholeFile|AudioRegion::DefaultFlags),
-                                 false);
-
-       new_playlist->set_orig_diskstream_id (diskstream->id());
-       new_playlist->add_region (*region, 0);
-       new_playlist->set_frozen (true);
-       region->set_locked (true);
-
-       diskstream->use_playlist (dynamic_cast<MidiPlaylist*>(new_playlist));
-       diskstream->set_record_enabled (false, this);
-
-       _freeze_record.state = Frozen;
-       FreezeChange(); /* EMIT SIGNAL */
-}
-
-void
-MidiTrack::unfreeze ()
-{
-       if (_freeze_record.playlist) {
-               diskstream->use_playlist (_freeze_record.playlist);
+       assert(val <= _list->parameter().max());
+       if ( ! automation_playback()) {
+               size_t size = 3;
+               uint8_t ev[3] = { _list->parameter().channel(), int(val), 0 };
+               switch(_list->parameter().type()) {
+               case MidiCCAutomation:
+                       ev[0] += MIDI_CMD_CONTROL;
+                       ev[1] = _list->parameter().id();
+                       ev[2] = int(val);
+                       break;
 
-               if (_freeze_record.have_mementos) {
+               case MidiPgmChangeAutomation:
+                       size = 2;
+                       ev[0] += MIDI_CMD_PGM_CHANGE;
+                       ev[1] = int(val);
+                       break;
 
-                       for (vector<FreezeRecordInsertInfo*>::iterator i = _freeze_record.insert_info.begin(); i != _freeze_record.insert_info.end(); ++i) {
-                               (*i)->memento ();
-                       }
+               case MidiChannelPressureAutomation:
+                       size = 2;
+                       ev[0] += MIDI_CMD_CHANNEL_PRESSURE;
+                       ev[1] = int(val);
+                       break;
 
-               } else {
+               case MidiPitchBenderAutomation:
+                       ev[0] += MIDI_CMD_BENDER;
+                       ev[1] = 0x7F & int(val);
+                       ev[2] = 0x7F & (int(val) >> 7);
+                       break;
 
-                       Glib::RWLock::ReaderLock lm (redirect_lock); // should this be a write lock? jlc
-                       for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
-                               for (vector<FreezeRecordInsertInfo*>::iterator ii = _freeze_record.insert_info.begin(); ii != _freeze_record.insert_info.end(); ++ii) {
-                                       if ((*ii)->id == (*i)->id()) {
-                                               (*i)->set_state (((*ii)->state));
-                                               break;
-                                       }
-                               }
-                       }
+               default:
+                       assert(false);
                }
-               
-               _freeze_record.playlist = 0;
+               _route->write_immediate_event(size,  ev);
        }
-#endif
-       _freeze_record.state = UnFrozen;
-       FreezeChange (); /* EMIT SIGNAL */
-}
 
-MidiTrack::FreezeRecord::~FreezeRecord ()
-{
-       for (vector<FreezeRecordInsertInfo*>::iterator i = insert_info.begin(); i != insert_info.end(); ++i) {
-               delete *i;
-       }
+       AutomationControl::set_value(val);
 }
 
-MidiTrack::FreezeState
-MidiTrack::freeze_state() const
+void
+MidiTrack::set_step_editing (bool yn)
 {
-       return _freeze_record.state;
-}
+        if (_session.record_status() != Session::Disabled) {
+                return;
+        }
 
+        if (yn != _step_editing) {
+                _step_editing = yn;
+                StepEditStatusChange (yn);
+        }
+}
 
 void
-MidiTrack::reset_midi_control (MIDI::Port* port, bool on)
+MidiTrack::set_default_channel (uint8_t chn)
 {
-       MIDI::channel_t chn;
-       MIDI::eventType ev;
-       MIDI::byte extra;
-
-       Route::reset_midi_control (port, on);
-       
-       _midi_rec_enable_control.get_control_info (chn, ev, extra);
-       if (!on) {
-               chn = -1;
-       }
-       _midi_rec_enable_control.midi_rebind (port, chn);
+       _default_channel = std::min ((unsigned int) chn, 15U);
 }
 
 void
-MidiTrack::send_all_midi_feedback ()
+MidiTrack::set_midi_thru (bool yn)
 {
-       if (_session.get_midi_feedback()) {
-
-               Route::send_all_midi_feedback();
-
-               _midi_rec_enable_control.send_feedback (record_enabled());
-       }
+       _midi_thru = yn;
 }
 
-
-MidiTrack::MIDIRecEnableControl::MIDIRecEnableControl (MidiTrack& s,  MIDI::Port* port)
-       : MIDI::Controllable (port, 0), track (s), setting(false)
+boost::shared_ptr<SMFSource>
+MidiTrack::write_source (uint32_t)
 {
-       last_written = false; /* XXX need a good out of bound value */
+       return midi_diskstream()->write_source ();
 }
 
 void
-MidiTrack::MIDIRecEnableControl::set_value (float val)
+MidiTrack::set_channel_mode (ChannelMode mode, uint16_t mask)
 {
-       bool bval = ((val >= 0.5f) ? true: false);
-       
-       setting = true;
-       track.set_record_enable (bval, this);
-       setting = false;
+       midi_diskstream()->set_channel_mode (mode, mask);
 }
 
-void
-MidiTrack::MIDIRecEnableControl::send_feedback (bool value)
+ChannelMode
+MidiTrack::get_channel_mode ()
 {
-
-       if (!setting && get_midi_feedback()) {
-               MIDI::byte val = (MIDI::byte) (value ? 127: 0);
-               MIDI::channel_t ch = 0;
-               MIDI::eventType ev = MIDI::none;
-               MIDI::byte additional = 0;
-               MIDI::EventTwoBytes data;
-           
-               if (get_control_info (ch, ev, additional)) {
-                       data.controller_number = additional;
-                       data.value = val;
-
-                       track._session.send_midi_message (get_port(), ev, ch, data);
-               }
-       }
-       
+       return midi_diskstream()->get_channel_mode ();
 }
 
-MIDI::byte*
-MidiTrack::MIDIRecEnableControl::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool val, bool force)
+uint16_t
+MidiTrack::get_channel_mask ()
 {
-       if (get_midi_feedback()) {
-
-               MIDI::channel_t ch = 0;
-               MIDI::eventType ev = MIDI::none;
-               MIDI::byte additional = 0;
-
-               if (get_control_info (ch, ev, additional)) {
-                       if (val != last_written || force) {
-                               *buf++ = ev & ch;
-                               *buf++ = additional; /* controller number */
-                               *buf++ = (MIDI::byte) (val ? 127: 0);
-                               last_written = val;
-                               bufsize -= 3;
-                       }
-               }
-       }
+       return midi_diskstream()->get_channel_mask ();
+}
 
-       return buf;
+boost::shared_ptr<MidiPlaylist>
+MidiTrack::midi_playlist ()
+{
+       return midi_diskstream()->midi_playlist ();
 }
 
 void
-MidiTrack::set_mode (TrackMode m)
+MidiTrack::diskstream_data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_ptr<MidiSource> src)
 {
-       if (diskstream) {
-               if (_mode != m) {
-                       _mode = m;
-                       diskstream->set_destructive (m == Destructive);
-                       ModeChanged();
-               }
-       }
+       DataRecorded (buf, src); /* EMIT SIGNAL */
 }
+