(1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state...
[ardour.git] / libs / ardour / midi_track.cc
index 1000e68ba67bec35f0fe60541f331b8e53088440..9409e9f1439b14b0fb2c5e73c9947f82cf0da8fa 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 <pbd/enumwriter.h>
-#include <midi++/events.h>
-
-#include <ardour/midi_track.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/session.h>
-#include <ardour/io_processor.h>
-#include <ardour/midi_region.h>
-#include <ardour/midi_source.h>
-#include <ardour/route_group_specialized.h>
-#include <ardour/processor.h>
-#include <ardour/midi_playlist.h>
-#include <ardour/panner.h>
-#include <ardour/utils.h>
-#include <ardour/buffer_set.h>
-#include <ardour/meter.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/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"
 
@@ -48,75 +51,71 @@ using namespace PBD;
 MidiTrack::MidiTrack (Session& sess, string name, Route::Flag flag, TrackMode mode)
        : 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);
-       }
-
-       assert(mode != Destructive);
-
-       boost::shared_ptr<MidiDiskstream> ds (new MidiDiskstream (_session, name, dflags));
-       _session.add_diskstream (ds);
+       use_new_diskstream ();
 
-       set_diskstream (boost::dynamic_pointer_cast<MidiDiskstream> (ds));
-       
        _declickable = true;
        _freeze_record.state = NoFreeze;
        _saved_meter_point = _meter_point;
        _mode = mode;
-
-       set_input_minimum(ChanCount(DataType::MIDI, 1));
-       set_input_maximum(ChanCount(DataType::MIDI, 1));
-       set_output_minimum(ChanCount(DataType::MIDI, 1));
-       set_output_maximum(ChanCount(DataType::MIDI, 1));
-
-       PortCountChanged(ChanCount(DataType::MIDI, 2)); /* EMIT SIGNAL */
 }
 
-MidiTrack::MidiTrack (Session& sess, const XMLNode& node)
-       : Track (sess, node)
+MidiTrack::MidiTrack (Session& sess, const XMLNode& node, int /*version*/)
+       : Track (sess, node, 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)
 {
-       _set_state(node, false);
-       
-       set_input_minimum(ChanCount(DataType::MIDI, 1));
-       set_input_maximum(ChanCount(DataType::MIDI, 1));
-       set_output_minimum(ChanCount(DataType::MIDI, 1));
-       set_output_maximum(ChanCount(DataType::MIDI, 1));
-       
-       PortCountChanged(ChanCount(DataType::MIDI, 2)); /* EMIT SIGNAL */
+       _set_state (node, Stateful::loading_state_version, false);
 }
 
 MidiTrack::~MidiTrack ()
 {
 }
 
+void
+MidiTrack::use_new_diskstream ()
+{
+       MidiDiskstream::Flag dflags = MidiDiskstream::Flag (0);
+
+       if (_flags & Hidden) {
+               dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Hidden);
+       } else {
+               dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Recordable);
+       }
+
+       assert(_mode != Destructive);
+
+       boost::shared_ptr<MidiDiskstream> ds (new MidiDiskstream (_session, name(), dflags));
+       _session.add_diskstream (ds);
+
+       set_diskstream (boost::dynamic_pointer_cast<MidiDiskstream> (ds));
+}
 
 int
 MidiTrack::set_diskstream (boost::shared_ptr<MidiDiskstream> ds)
 {
        _diskstream = ds;
-       _diskstream->set_io (*this);
+       _diskstream->set_route (*this);
        _diskstream->set_destructive (_mode == Destructive);
 
        _diskstream->set_record_enabled (false);
        //_diskstream->monitor_input (false);
 
-       ic_connection.disconnect();
-       ic_connection = input_changed.connect (mem_fun (*_diskstream, &MidiDiskstream::handle_input_change));
-
        DiskstreamChanged (); /* EMIT SIGNAL */
 
        return 0;
-}      
+}
 
-int 
+int
 MidiTrack::use_diskstream (string name)
 {
        boost::shared_ptr<MidiDiskstream> dstream;
@@ -125,20 +124,20 @@ MidiTrack::use_diskstream (string name)
                error << string_compose(_("MidiTrack: midi diskstream \"%1\" not known by session"), name) << endmsg;
                return -1;
        }
-       
+
        return set_diskstream (dstream);
 }
 
-int 
+int
 MidiTrack::use_diskstream (const PBD::ID& id)
 {
        boost::shared_ptr<MidiDiskstream> dstream;
 
        if ((dstream = boost::dynamic_pointer_cast<MidiDiskstream> (_session.diskstream_by_id (id))) == 0) {
-               error << string_compose(_("MidiTrack: midi diskstream \"%1\" not known by session"), id) << endmsg;
+               error << string_compose(_("MidiTrack: midi diskstream \"%1\" not known by session"), id) << endmsg;
                return -1;
        }
-       
+
        return set_diskstream (dstream);
 }
 
@@ -149,32 +148,40 @@ MidiTrack::midi_diskstream() const
 }
 
 int
-MidiTrack::set_state (const XMLNode& node)
+MidiTrack::set_state (const XMLNode& node, int version)
 {
-       return _set_state (node, true);
+       return _set_state (node, version, true);
 }
 
 int
-MidiTrack::_set_state (const XMLNode& node, bool call_base)
+MidiTrack::_set_state (const XMLNode& node, int version, bool call_base)
 {
        const XMLProperty *prop;
        XMLNodeConstIterator iter;
 
-       if (Route::_set_state (node, call_base)) {
+       if (Route::_set_state (node, version, call_base)) {
                return -1;
        }
-       
+
        // 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 {
                _note_mode = Sustained;
        }
 
+       if ((prop = node.property ("midi-thru")) != 0) {
+               set_midi_thru (prop->value() == "yes");
+       }
+
+       if ((prop = node.property ("default-channel")) != 0) {
+               set_default_channel ((uint8_t) atoi (prop->value()));
+       }
+
        if ((prop = node.property ("diskstream-id")) == 0) {
-               
+
                /* some old sessions use the diskstream name rather than the ID */
 
                if ((prop = node.property ("diskstream")) == 0) {
@@ -188,15 +195,25 @@ MidiTrack::_set_state (const XMLNode& node, bool call_base)
                }
 
        } else {
-               
+
                PBD::ID id (prop->value());
-               
-               if (use_diskstream (id)) {
+               PBD::ID zero ("0");
+
+               /* this wierd hack is used when creating tracks from a template. there isn't
+                  a particularly good time to interpose between setting the first part of
+                  the track state (notably Route::set_state() and the track mode), and the
+                  second part (diskstream stuff). So, we have a special ID for the diskstream
+                  that means "you should create a new diskstream here, not look for
+                  an old one.
+               */
+
+               if (id == zero) {
+                       use_new_diskstream ();
+               } else if (use_diskstream (id)) {
                        return -1;
                }
        }
 
-
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
        XMLNode *child;
@@ -206,19 +223,23 @@ MidiTrack::_set_state (const XMLNode& node, bool call_base)
                child = *niter;
 
                if (child->name() == X_("recenable")) {
-                       _rec_enable_control->set_state (*child);
+                       _rec_enable_control->set_state (*child, version);
                        _session.add_controllable (_rec_enable_control);
                }
        }
 
        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& 
+XMLNode&
 MidiTrack::state(bool full_state)
 {
        XMLNode& root (Route::state(full_state));
@@ -237,7 +258,7 @@ MidiTrack::state(bool full_state)
                        (*i)->id.print (buf, sizeof(buf));
                        inode->add_property (X_("id"), buf);
                        inode->add_child_copy ((*i)->state);
-               
+
                        freeze_node->add_child_nocopy (*inode);
                }
 
@@ -245,14 +266,14 @@ MidiTrack::state(bool full_state)
        }
 
        /* Alignment: act as a proxy for the diskstream */
-       
-       XMLNode* align_node = new XMLNode (X_("alignment"));
+
+       XMLNode* align_node = new XMLNode (X_("Alignment"));
        AlignStyle as = _diskstream->alignment_style ();
        align_node->add_property (X_("style"), enum_2_string (as));
        root.add_child_nocopy (*align_node);
 
        root.add_property (X_("note-mode"), enum_2_string (_note_mode));
-       
+
        /* 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
@@ -261,9 +282,15 @@ MidiTrack::state(bool full_state)
 
        _diskstream->id().print (buf, sizeof(buf));
        root.add_property ("diskstream-id", buf);
-       
+
        root.add_child_nocopy (_rec_enable_control->get_state());
 
+       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;
 }
 
@@ -284,17 +311,15 @@ 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<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) {
                        delete *i;
                }
                _freeze_record.processor_info.clear ();
-               
+
                if ((prop = fnode->property (X_("playlist"))) != 0) {
-                       boost::shared_ptr<Playlist> pl = _session.playlist_by_name (prop->value());
+                       boost::shared_ptr<Playlist> pl = _session.playlists->by_name (prop->value());
                        if (pl) {
                                _freeze_record.playlist = boost::dynamic_pointer_cast<MidiPlaylist> (pl);
                        } else {
@@ -303,23 +328,23 @@ MidiTrack::set_state_part_two ()
                        return;
                        }
                }
-               
+
                if ((prop = fnode->property (X_("state"))) != 0) {
                        _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_("processor")) {
                                continue;
                        }
-                       
+
                        if ((prop = (*citer)->property (X_("id"))) == 0) {
                                continue;
                        }
-                       
+
                        FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()),
                                                                                   boost::shared_ptr<Processor>());
                        frii->id = prop->value ();
@@ -329,7 +354,7 @@ MidiTrack::set_state_part_two ()
 
        /* Alignment: act as a proxy for the diskstream */
 
-       if ((fnode = find_named_node (*pending_state, X_("alignment"))) != 0) {
+       if ((fnode = find_named_node (*pending_state, X_("Alignment"))) != 0) {
 
                if ((prop = fnode->property (X_("style"))) != 0) {
 
@@ -350,94 +375,15 @@ MidiTrack::set_state_part_two ()
                }
        }
        return;
-}      
-
-int 
-MidiTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, 
-                    bool session_state_changing, bool can_record, bool rec_monitors_input)
-{
-       if (n_outputs().n_midi() == 0) {
-               return 0;
-       }
-
-       if (!_active) {
-               silence (nframes, offset);
-       }
-
-       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;
-       }
-
-       midi_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 (Config->get_auto_input()) {
-                       if (Config->get_monitoring_model() == SoftwareMonitoring) {
-                               send_silence = false;
-                       } else {
-                               send_silence = true;
-                       }
-               } else {
-                       if (_diskstream->record_enabled()) {
-                               if (Config->get_monitoring_model() == SoftwareMonitoring) {
-                                       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));
-       }
-
-       return 0;
 }
 
 int
-MidiTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, int declick,
-                 bool can_record, bool rec_monitors_input)
+MidiTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, int declick,
+                bool can_record, bool rec_monitors_input)
 {
        int dret;
        boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
-       
+
        {
                Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
                if (lm.locked()) {
@@ -452,42 +398,41 @@ MidiTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
        }
 
        if (!_active) {
-               silence (nframes, offset);
+               silence (nframes);
                return 0;
        }
 
        nframes_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);
+       }
 
        _silent = 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)) != 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 && !Config->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);
+               passthru (start_frame, end_frame, nframes, 0);
 
        } else {
                /*
@@ -503,153 +448,83 @@ MidiTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
 
                //const size_t limit = n_process_buffers().n_audio();
                BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers());
+               MidiBuffer& mbuf (bufs.get_midi (0));
+
+               diskstream->get_playback (mbuf, start_frame, end_frame);
+
+               /* append immediate messages to the first MIDI buffer (thus sending it to the first output port) */
 
-               diskstream->get_playback(bufs.get_midi(0), start_frame, end_frame);
+               write_out_of_band_data (bufs, start_frame, end_frame, nframes);
+
+               process_output_buffers (bufs, start_frame, end_frame, nframes,
+                                       (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick);
 
-               process_output_buffers (bufs, start_frame, end_frame, nframes, offset,
-                               (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, (_meter_point != MeterInput));
-       
        }
 
+       _main_outs->flush (nframes, end_frame - start_frame - 1);
+
        return 0;
 }
 
 int
-MidiTrack::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, 
-                        bool can_record, bool rec_monitors_input)
+MidiTrack::no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
+                   bool state_changing, bool can_record, bool rec_monitors_input)
 {
-       if (n_outputs().n_midi() == 0 && _processors.empty()) {
-               return 0;
-       }
+       int ret = Track::no_roll (nframes, start_frame, end_frame, state_changing, can_record, rec_monitors_input);
 
-       if (!_active) {
-               silence (nframes, offset);
-               return 0;
+       if (ret == 0 && diskstream()->record_enabled() && _step_editing) {
+               push_midi_input_to_step_edit_ringbuffer (nframes);
        }
 
-       _silent = true;
-       apply_gain_automation = false;
-
-       silence (nframes, offset);
-
-       return midi_diskstream()->process (_session.transport_frame() + offset, nframes, offset, can_record, rec_monitors_input);
+       return ret;
 }
 
 void
-MidiTrack::process_output_buffers (BufferSet& bufs,
-                              nframes_t start_frame, nframes_t end_frame, 
-                              nframes_t nframes, nframes_t offset, bool with_processors, int declick,
-                              bool meter)
+MidiTrack::handle_transport_stopped (bool abort, bool did_locate, bool flush_processors)
 {
-       /* There's no such thing as a MIDI bus for the time being.
-        * We'll do all the MIDI route work here for now, but the long-term goal is to have
-        * Route::process_output_buffers handle everything */
-       
-       if (meter && (_meter_point == MeterInput || _meter_point == MeterPreFader)) {
-               _meter->run_in_place(bufs, start_frame, end_frame, nframes, offset);
-       }
-
-       // Run all processors
-       if (with_processors) {
-               Glib::RWLock::ReaderLock rm (_processor_lock, Glib::TRY_LOCK);
-               if (rm.locked()) {
-                       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-                               (*i)->run_in_place (bufs, start_frame, end_frame, nframes, offset);
-                       }
-               } 
-       }
-       
-       if (meter && (_meter_point == MeterPostFader)) {
-               _meter->run_in_place(bufs, start_frame, end_frame, nframes, offset);
-       }
-       
-       // Main output stage
-       if (muted()) {
-               IO::silence(nframes, offset);
-       } else {
 
-               // Write 'automation' controllers (e.g. CC events from a UI slider)
-               write_controller_messages(bufs.get_midi(0), start_frame, end_frame, nframes, offset);
-               
-               deliver_output(bufs, start_frame, end_frame, nframes, offset);
-       }
+       _main_outs->transport_stopped ();
+       Route::handle_transport_stopped (abort, did_locate, flush_processors);
 }
 
+
 void
-MidiTrack::write_controller_messages(MidiBuffer& output_buf, nframes_t start_frame, nframes_t end_frame, 
-                              nframes_t nframes, nframes_t offset)
+MidiTrack::push_midi_input_to_step_edit_ringbuffer (nframes_t nframes)
 {
-#if 0
-       BufferSet& mix_buffers = _session.get_mix_buffers(ChanCount(DataType::MIDI, 2));
-
-       /* FIXME: this could be more realtimey */
-
-       // Write immediate events (UI controls)
-       MidiBuffer& cc_buf = mix_buffers.get_midi(0);
-       cc_buf.silence(nframes, offset);
-       
-       uint8_t buf[3]; // CC = 3 bytes
-       buf[0] = MIDI_CMD_CONTROL;
-       MIDI::Event ev(0, 3, buf, false);
-
-       // Write track controller automation
-       // This now lives in MidiModel.  Any need for track automation like this?
-       // Relative Velocity?
-       if (_session.transport_rolling()) {
-               for (Controls::const_iterator i = _controls.begin(); i != _controls.end(); ++i) {
-                       const boost::shared_ptr<AutomationList> list = (*i).second->list();
-
-                       if ( (!list->automation_playback())
-                                       || (list->parameter().type() != MidiCCAutomation))
-                               continue;
+       PortSet& ports (_input->ports());
 
-                       double start = start_frame;
-                       double x, y;
-                       while ((*i).second->list()->rt_safe_earliest_event(start, end_frame, x, y)) {
-                               assert(x >= start_frame);
-                               assert(x <= end_frame);
+       for (PortSet::iterator p = ports.begin(DataType::MIDI); p != ports.end(DataType::MIDI); ++p) {
 
-                               const nframes_t stamp = (nframes_t)floor(x - start_frame);
-                               assert(stamp < nframes);
+               Buffer& b (p->get_buffer (nframes));
+               const MidiBuffer* const mb = dynamic_cast<MidiBuffer*>(&b);
+               assert (mb);
 
-                               assert(y >= 0.0);
-                               assert(y <= 127.0);
+               for (MidiBuffer::const_iterator e = mb->begin(); e != mb->end(); ++e) {
 
-                               ev.time() = stamp;
-                               ev.buffer()[1] = (uint8_t)list->parameter().id();
-                               ev.buffer()[2] = (uint8_t)y;
+                       const Evoral::MIDIEvent<nframes_t> ev(*e, false);
 
-                               cc_buf.push_back(ev);
+                       /* we don't care about the time for this purpose */
 
-                               start = x + 1; // FIXME?  maybe?
-                       }
+                       _step_edit_ring_buffer.write (0, ev.type(), ev.size(), ev.buffer());
                }
        }
+}
 
-       /* FIXME: too much copying! */
-
-       // Merge cc buf into output
-       if (cc_buf.size() > 0) {
-
-               // Both CC and route, must merge
-               if (output_buf.size() > 0) {
-
-                       MidiBuffer& mix_buf = mix_buffers.get_midi(1);
-                       mix_buf.merge(output_buf, cc_buf);
-                       output_buf.copy(mix_buf);
+void
+MidiTrack::write_out_of_band_data (BufferSet& bufs, sframes_t /*start*/, sframes_t /*end*/, nframes_t nframes)
+{
+       // Append immediate events
+       MidiBuffer& buf (bufs.get_midi (0));
+       _immediate_events.read (buf, 0, 0, nframes - 1); // all stamps = 0
 
-               } else {
-                       output_buf.copy(cc_buf);
-               }
+       // 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));
        }
-#endif
-
-       // Append immediate events (UI controls)
-       _immediate_events.read(output_buf, 0, 0, offset + nframes-1); // all stamps = 0
 }
 
 int
-MidiTrack::export_stuff (BufferSet& bufs, nframes_t nframes, nframes_t end_frame)
+MidiTrack::export_stuff (BufferSet& /*bufs*/, nframes_t /*nframes*/, sframes_t /*end_frame*/)
 {
        return -1;
 }
@@ -661,25 +536,27 @@ MidiTrack::set_latency_delay (nframes_t longest_session_latency)
        _diskstream->set_roll_delay (_roll_delay);
 }
 
-void
-MidiTrack::bounce (InterThreadInfo& itt)
+boost::shared_ptr<Region>
+MidiTrack::bounce (InterThreadInfo& /*itt*/)
 {
        throw;
-       //vector<MidiSource*> srcs;
-       //_session.write_one_midi_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
+       // vector<MidiSource*> srcs;
+       // return _session.write_one_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
+       return boost::shared_ptr<Region> ();
 }
 
 
-void
-MidiTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt)
+boost::shared_ptr<Region>
+MidiTrack::bounce_range (nframes_t /*start*/, nframes_t /*end*/, InterThreadInfo& /*itt*/, bool /*enable_processing*/)
 {
        throw;
        //vector<MidiSource*> srcs;
-       //_session.write_one_midi_track (*this, start, end, false, srcs, itt);
+       //return _session.write_one_track (*this, start, end, false, srcs, itt);
+       return boost::shared_ptr<Region> ();
 }
 
 void
-MidiTrack::freeze (InterThreadInfo& itt)
+MidiTrack::freeze_me (InterThreadInfo& /*itt*/)
 {
 }
 
@@ -693,13 +570,12 @@ MidiTrack::unfreeze ()
 void
 MidiTrack::set_note_mode (NoteMode m)
 {
-       cout << _name << " SET NOTE MODE " << m << endl;
        _note_mode = m;
        midi_diskstream()->set_note_mode(m);
 }
 
 void
-MidiTrack::midi_panic() 
+MidiTrack::midi_panic()
 {
        for (uint8_t channel = 0; channel <= 0xF; channel++) {
                uint8_t ev[3] = { MIDI_CMD_CONTROL | channel, MIDI_CTL_SUSTAIN, 0 };
@@ -716,48 +592,63 @@ MidiTrack::midi_panic()
 bool
 MidiTrack::write_immediate_event(size_t size, const uint8_t* buf)
 {
-       printf("Write immediate event: ");
-       for (size_t i=0; i < size; ++i) {
-               printf("%X ", buf[i]);
+       if (!Evoral::midi_event_is_valid(buf, size)) {
+               cerr << "WARNING: Ignoring illegal immediate MIDI event" << endl;
+               return false;
        }
-       printf("\n");
-       return (_immediate_events.write(0, size, buf) == size);
+       const uint32_t type = EventTypeMap::instance().midi_event_type(buf[0]);
+       return (_immediate_events.write(0, type, size, buf) == size);
 }
 
 void
 MidiTrack::MidiControl::set_value(float val)
 {
-       assert(val >= _list->parameter().min());
-       assert(val <= _list->parameter().max());
-       size_t size = 3;
+       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;
+       }
+
+       if (!valid) {
+               return;
+       }
 
-       if ( ! _list->automation_playback()) {
-               uint8_t ev[3] = { _list->parameter().channel(), int(val), 0.0 };
+       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;
-                       
+
                case MidiPgmChangeAutomation:
                        size = 2;
                        ev[0] += MIDI_CMD_PGM_CHANGE;
                        ev[1] = int(val);
                        break;
-                       
-               case MidiChannelAftertouchAutomation:
+
+               case MidiChannelPressureAutomation:
                        size = 2;
                        ev[0] += MIDI_CMD_CHANNEL_PRESSURE;
                        ev[1] = int(val);
                        break;
-                       
+
                case MidiPitchBenderAutomation:
                        ev[0] += MIDI_CMD_BENDER;
                        ev[1] = 0x7F & int(val);
                        ev[2] = 0x7F & (int(val) >> 7);
                        break;
-                       
+
                default:
                        assert(false);
                }
@@ -765,5 +656,22 @@ MidiTrack::MidiControl::set_value(float val)
        }
 
        AutomationControl::set_value(val);
-} 
+}
 
+void
+MidiTrack::set_step_editing (bool yn)
+{
+       _step_editing = yn;
+}
+
+void
+MidiTrack::set_default_channel (uint8_t chn)
+{
+       _default_channel = std::min ((unsigned int) chn, 15U);
+}
+
+void
+MidiTrack::set_midi_thru (bool yn)
+{
+       _midi_thru = yn;
+}