Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...
[ardour.git] / libs / ardour / audio_track.cc
index f8817a254466a564a115d48ef483597c3ddbb29a..816f08cbd5ec99b8b55c282152738185e78b39e4 100644 (file)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
-#include <pbd/error.h>
+
 #include <sigc++/retype.h>
 #include <sigc++/retype_return.h>
 #include <sigc++/bind.h>
 
+#include <pbd/error.h>
+#include <pbd/enumwriter.h>
+
 #include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/session.h>
-#include <ardour/redirect.h>
+#include <ardour/io_processor.h>
 #include <ardour/audioregion.h>
+#include <ardour/audiosource.h>
+#include <ardour/region_factory.h>
 #include <ardour/route_group_specialized.h>
-#include <ardour/insert.h>
+#include <ardour/processor.h>
+#include <ardour/plugin_insert.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/playlist_factory.h>
 #include <ardour/panner.h>
 #include <ardour/utils.h>
-
-
-
+#include <ardour/buffer_set.h>
 #include "i18n.h"
 
 using namespace std;
-//using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 
-AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag)
-       : Route (sess, name, 1, -1, -1, -1, flag),
-         diskstream (0),
-         _midi_rec_enable_control (*this, _session.midi_port())
+AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode mode)
+       : Track (sess, name, flag, mode)
 {
-       DiskStream::Flag dflags = DiskStream::Flag (0);
+       AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0);
 
        if (_flags & Hidden) {
-               dflags = DiskStream::Flag (dflags | DiskStream::Hidden);
+               dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Hidden);
        } else {
-               dflags = DiskStream::Flag (dflags | DiskStream::Recordable);
+               dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Recordable);
        }
 
-       DiskStream* ds = new DiskStream (_session, name, dflags);
-       
-       set_diskstream (*ds, this);
-       
-       _declickable = true;
-       _freeze_record.state = NoFreeze;
-       _saved_meter_point = _meter_point;
+       if (mode == Destructive) {
+               dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Destructive);
+       }
 
-       // we do this even though Route already did it in it's init
-       reset_midi_control (_session.midi_port(), _session.get_midi_control());
+       boost::shared_ptr<AudioDiskstream> ds (new AudioDiskstream (_session, name, dflags));
        
+       _session.add_diskstream (ds);
+
+       set_diskstream (boost::dynamic_pointer_cast<AudioDiskstream> (ds), this);
 }
 
 AudioTrack::AudioTrack (Session& sess, const XMLNode& node)
-       : Route (sess, "to be renamed", 0, 0, -1, -1),
-         diskstream (0),
-         _midi_rec_enable_control (*this, _session.midi_port())
+       : Track (sess, node)
 {
-       _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());
+       _set_state (node, false);
 }
 
 AudioTrack::~AudioTrack ()
 {
-       if (diskstream) {
-               diskstream->unref();
+}
+
+int
+AudioTrack::set_mode (TrackMode m)
+{
+       if (m != _mode) {
+
+               if (_diskstream->set_destructive (m == Destructive)) {
+                       return -1;
+               }
+
+               _mode = m;
+               
+               TrackModeChanged (); /* EMIT SIGNAL */
+       }
+
+       return 0;
+}
+
+bool
+AudioTrack::can_use_mode (TrackMode m, bool& bounce_required)
+{
+       switch (m) {
+       case Normal:
+               bounce_required = false;
+               return true;
+               
+       case Destructive:
+       default:
+               return _diskstream->can_become_destructive (bounce_required);
        }
 }
 
 int
 AudioTrack::deprecated_use_diskstream_connections ()
 {
+       boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
+
        if (diskstream->deprecated_io_node == 0) {
                return 0;
        }
@@ -102,10 +124,10 @@ AudioTrack::deprecated_use_diskstream_connections ()
 
        diskstream->deprecated_io_node = 0;
 
-       set_input_minimum (-1);
-       set_input_maximum (-1);
-       set_output_minimum (-1);
-       set_output_maximum (-1);
+       set_input_minimum (ChanCount::ZERO);
+       set_input_maximum (ChanCount::INFINITE);
+       set_output_minimum (ChanCount::ZERO);
+       set_output_maximum (ChanCount::INFINITE);
        
        if ((prop = node.property ("gain")) != 0) {
                set_gain (atof (prop->value().c_str()), this);
@@ -113,22 +135,22 @@ AudioTrack::deprecated_use_diskstream_connections ()
        }
 
        if ((prop = node.property ("input-connection")) != 0) {
-               Connection* c = _session.connection_by_name (prop->value());
+               boost::shared_ptr<Bundle> c = _session.bundle_by_name (prop->value());
                
                if (c == 0) {
-                       error << string_compose(_("Unknown connection \"%1\" listed for input of %2"), prop->value(), _name) << endmsg;
+                       error << string_compose(_("Unknown bundle \"%1\" listed for input of %2"), prop->value(), _name) << endmsg;
                        
-                       if ((c = _session.connection_by_name (_("in 1"))) == 0) {
-                               error << _("No input connections available as a replacement")
+                       if ((c = _session.bundle_by_name (_("in 1"))) == 0) {
+                               error << _("No input bundles available as a replacement")
                                << endmsg;
                                return -1;
                        } else {
-                               info << string_compose (_("Connection %1 was not available - \"in 1\" used instead"), prop->value())
+                               info << string_compose (_("Bundle %1 was not available - \"in 1\" used instead"), prop->value())
                               << endmsg;
                        }
                }
 
-               use_input_connection (*c, this);
+               connect_input_ports_to_bundle (c, this);
 
        } else if ((prop = node.property ("inputs")) != 0) {
                if (set_inputs (prop->value())) {
@@ -141,16 +163,13 @@ AudioTrack::deprecated_use_diskstream_connections ()
 }
 
 int
-AudioTrack::set_diskstream (DiskStream& ds, void *src)
+AudioTrack::set_diskstream (boost::shared_ptr<AudioDiskstream> ds, void *src)
 {
-       if (diskstream) {
-               diskstream->unref();
-       }
-
-       diskstream = &ds.ref();
-       diskstream->set_io (*this);
+       _diskstream = ds;
+       _diskstream->set_io (*this);
+       _diskstream->set_destructive (_mode == Destructive);
 
-       if (diskstream->deprecated_io_node) {
+       if (audio_diskstream()->deprecated_io_node) {
 
                if (!connecting_legal) {
                        ConnectingLegal.connect (mem_fun (*this, &AudioTrack::deprecated_use_diskstream_connections));
@@ -159,13 +178,13 @@ AudioTrack::set_diskstream (DiskStream& ds, void *src)
                }
        }
 
-       diskstream->set_record_enabled (false, this);
-       diskstream->monitor_input (false);
+       _diskstream->set_record_enabled (false);
+       _diskstream->monitor_input (false);
 
        ic_connection.disconnect();
-       ic_connection = input_changed.connect (mem_fun (*diskstream, &DiskStream::handle_input_change));
+       ic_connection = input_changed.connect (mem_fun (*_diskstream, &Diskstream::handle_input_change));
 
-       diskstream_changed (src); /* EMIT SIGNAL */
+       DiskstreamChanged (); /* EMIT SIGNAL */
 
        return 0;
 }      
@@ -173,127 +192,59 @@ AudioTrack::set_diskstream (DiskStream& ds, void *src)
 int 
 AudioTrack::use_diskstream (string name)
 {
-       DiskStream *dstream;
+       boost::shared_ptr<AudioDiskstream> dstream;
 
-       if ((dstream = _session.diskstream_by_name (name)) == 0) {
-         error << string_compose(_("AudioTrack: diskstream \"%1\" not known by session"), name) << endmsg;
+       if ((dstream = boost::dynamic_pointer_cast<AudioDiskstream>(_session.diskstream_by_name (name))) == 0) {
+               error << string_compose(_("AudioTrack: audio diskstream \"%1\" not known by session"), name) << endmsg;
                return -1;
        }
        
-       return set_diskstream (*dstream, this);
+       return set_diskstream (dstream, this);
 }
 
 int 
-AudioTrack::use_diskstream (id_t id)
+AudioTrack::use_diskstream (const PBD::ID& id)
 {
-       DiskStream *dstream;
+       boost::shared_ptr<AudioDiskstream> dstream;
 
-       if ((dstream = _session.diskstream_by_id (id)) == 0) {
-               error << string_compose(_("AudioTrack: diskstream \"%1\" not known by session"), id) << endmsg;
+       if ((dstream = boost::dynamic_pointer_cast<AudioDiskstream> (_session.diskstream_by_id (id))) == 0) {
+               error << string_compose(_("AudioTrack: audio diskstream \"%1\" not known by session"), id) << endmsg;
                return -1;
        }
        
-       return set_diskstream (*dstream, this);
-}
-
-bool
-AudioTrack::record_enabled () const
-{
-       return diskstream->record_enabled ();
+       return set_diskstream (dstream, this);
 }
 
-void
-AudioTrack::set_record_enable (bool yn, void *src)
+boost::shared_ptr<AudioDiskstream>
+AudioTrack::audio_diskstream() const
 {
-       if (_freeze_record.state == Frozen) {
-               return;
-       }
-
-       if (_mix_group && src != _mix_group && _mix_group->is_active()) {
-               _mix_group->apply (&AudioTrack::set_record_enable, yn, _mix_group);
-               return;
-       }
-
-       /* keep track of the meter point as it was before we rec-enabled */
-
-       if (!diskstream->record_enabled()) {
-               _saved_meter_point = _meter_point;
-       }
-       
-       diskstream->set_record_enabled (yn, src);
-
-       if (diskstream->record_enabled()) {
-               set_meter_point (MeterInput, this);
-       } else {
-               set_meter_point (_saved_meter_point, this);
-       }
+       return boost::dynamic_pointer_cast<AudioDiskstream>(_diskstream);
 }
 
-void
-AudioTrack::set_meter_point (MeterPoint p, void *src)
+int
+AudioTrack::set_state (const XMLNode& node)
 {
-       Route::set_meter_point (p, src);
-}
-
-XMLNode&
-AudioTrack::state(bool full_state)
-{
-       XMLNode& track_state (Route::state (full_state));
-       char buf[64];
-
-       /* 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());
-       track_state.add_property ("diskstream-id", buf);
-
-       return track_state;
+       return _set_state (node, true);
 }
 
 int
-AudioTrack::set_state (const XMLNode& node)
+AudioTrack::_set_state (const XMLNode& node, bool call_base)
 {
        const XMLProperty *prop;
        XMLNodeConstIterator iter;
-       XMLNodeList midi_kids;
 
-       if (Route::set_state (node)) {
-               return -1;
+       if (call_base) {
+               if (Route::_set_state (node, call_base)) {
+                       return -1;
+               }
        }
 
-       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 {
-                                 error << string_compose(_("MIDI rec_enable control specification for %1 is incomplete, so it has been ignored"), _name) << endmsg;
-                               }
-                       }
-               }
+       if ((prop = node.property (X_("mode"))) != 0) {
+               _mode = TrackMode (string_2_enum (prop->value(), _mode));
+       } else {
+               _mode = Normal;
        }
 
-       
        if ((prop = node.property ("diskstream-id")) == 0) {
                
                /* some old sessions use the diskstream name rather than the ID */
@@ -310,13 +261,28 @@ AudioTrack::set_state (const XMLNode& node)
 
        } else {
                
-               id_t id = strtoull (prop->value().c_str(), 0, 10);
+               PBD::ID id (prop->value());
                
                if (use_diskstream (id)) {
                        return -1;
                }
        }
 
+
+       XMLNodeList nlist;
+       XMLNodeConstIterator niter;
+       XMLNode *child;
+
+       nlist = node.children();
+       for (niter = nlist.begin(); niter != nlist.end(); ++niter){
+               child = *niter;
+
+               if (child->name() == X_("recenable")) {
+                       _rec_enable_control->set_state (*child);
+                       _session.add_controllable (_rec_enable_control);
+               }
+       }
+
        pending_state = const_cast<XMLNode*> (&node);
 
        _session.StateReady.connect (mem_fun (*this, &AudioTrack::set_state_part_two));
@@ -325,23 +291,22 @@ AudioTrack::set_state (const XMLNode& node)
 }
 
 XMLNode& 
-AudioTrack::get_state()
+AudioTrack::state(bool full_state)
 {
-       XMLNode& root (Route::get_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);
                
@@ -354,41 +319,23 @@ AudioTrack::get_state()
        /* 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);
+       AlignStyle as = _diskstream->alignment_style ();
+       align_node->add_property (X_("style"), enum_2_string (as));
        root.add_child_nocopy (*align_node);
 
-       /* MIDI control */
+       root.add_property (X_("mode"), enum_2_string (_mode));
 
-       MIDI::channel_t chn;
-       MIDI::eventType ev;
-       MIDI::byte      additional;
-       XMLNode*        midi_node = 0;
-       XMLNode*        child;
-       XMLNodeList     midikids;
+       /* 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.
+       */
 
-       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) {
+       _diskstream->id().print (buf, sizeof (buf));
+       root.add_property ("diskstream-id", buf);
 
-               child = midi_node->add_child ("rec_enable");
-               set_midi_node_info (child, ev, chn, additional);
-       }
+       root.add_child_nocopy (_rec_enable_control->get_state());
 
-       
        return root;
 }
 
@@ -413,31 +360,31 @@ AudioTrack::set_state_part_two ()
                _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.playlist_by_name (prop->value());
                        if (pl) {
-                               _freeze_record.playlist = dynamic_cast<AudioPlaylist*> (pl);
+                               _freeze_record.playlist = boost::dynamic_pointer_cast<AudioPlaylist> (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;
                        }
                        
@@ -445,10 +392,10 @@ AudioTrack::set_state_part_two ()
                                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);
+                       FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()),
+                                                                                  boost::shared_ptr<Processor>());
+                       frii->id = prop->value ();
+                       _freeze_record.processor_info.push_back (frii);
                }
        }
 
@@ -457,34 +404,31 @@ AudioTrack::set_state_part_two ()
        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);
+
+                       /* fix for older sessions from before EnumWriter */
+
+                       string pstr;
+
+                       if (prop->value() == "capture") {
+                               pstr = "CaptureTime";
+                       } else if (prop->value() == "existing") {
+                               pstr = "ExistingMaterial";
+                       } else {
+                               pstr = prop->value();
                        }
+
+                       AlignStyle as = AlignStyle (string_2_enum (pstr, as));
+                       _diskstream->set_persistent_align_style (as);
                }
        }
        return;
 }      
 
-uint32_t
-AudioTrack::n_process_buffers ()
-{
-       return max ((uint32_t) diskstream->n_channels(), redirect_max_outs);
-}
-
-void
-AudioTrack::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);
-}
-
 int 
-AudioTrack::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
+AudioTrack::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() == 0) {
+       if (n_outputs().n_total() == 0) {
                return 0;
        }
 
@@ -501,7 +445,7 @@ AudioTrack::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nf
                return 0;
        }
 
-       diskstream->check_record_status (start_frame, nframes, can_record);
+       audio_diskstream()->check_record_status (start_frame, nframes, can_record);
 
        bool send_silence;
        
@@ -513,19 +457,24 @@ AudioTrack::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nf
                send_silence = true;
        } else {
 
-               if (_session.get_auto_input()) {
-                       if (Config->get_no_sw_monitoring()) {
-                               send_silence = true;
-                       } else {
+               if (!Config->get_tape_machine_mode()) {
+                       /* 
+                          ADATs work in a strange way.. 
+                          they monitor input always when stopped.and auto-input is engaged. 
+                       */
+                       if ((Config->get_monitoring_model() == SoftwareMonitoring) && (Config->get_auto_input () || _diskstream->record_enabled())) {
                                send_silence = false;
+                       } else {
+                               send_silence = true;
                        }
                } else {
-                       if (diskstream->record_enabled()) {
-                               if (Config->get_no_sw_monitoring()) {
-                                       send_silence = true;
-                               } else {
-                                       send_silence = false;
-                               }
+                       /* 
+                          Other machines switch to input on stop if the track is record enabled,
+                          regardless of the auto input setting (auto input only changes the 
+                          monitoring state when the transport is rolling) 
+                       */
+                       if ((Config->get_monitoring_model() == SoftwareMonitoring) && _diskstream->record_enabled()) {
+                               send_silence = false;
                        } else {
                                send_silence = true;
                        }
@@ -561,17 +510,26 @@ AudioTrack::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nf
 }
 
 int
-AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, int declick,
+AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, int declick,
                  bool can_record, bool rec_monitors_input)
 {
        int dret;
        Sample* b;
        Sample* tmpb;
-       jack_nframes_t transport_frame;
-
-       automation_snapshot (start_frame);
+       nframes_t transport_frame;
+       boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
+       
+       {
+               Glib::RWLock::ReaderLock lm (_processor_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, false);
+               }
+       }
 
-       if (n_outputs() == 0 && _redirects.empty()) {
+       
+       if (n_outputs().n_total() == 0 && _processors.empty()) {
                return 0;
        }
 
@@ -582,6 +540,8 @@ AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nfram
 
        transport_frame = _session.transport_frame();
 
+       prepare_inputs( nframes, offset );
+
        if ((nframes = check_initial_delay (nframes, offset, transport_frame)) == 0) {
                /* need to do this so that the diskstream sets its
                   playback distance to zero, thus causing diskstream::commit
@@ -606,7 +566,7 @@ AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nfram
                just_meter_input (start_frame, end_frame, nframes, offset);
        }
 
-       if (diskstream->record_enabled() && !can_record && !_session.get_auto_input()) {
+       if (diskstream->record_enabled() && !can_record && !Config->get_auto_input()) {
 
                /* not actually recording, but we want to hear the input material anyway,
                   at least potentially (depending on monitoring options)
@@ -626,34 +586,89 @@ AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nfram
 
                
                /* copy the diskstream data to all output buffers */
-               
-               vector<Sample*>& bufs = _session.get_passthru_buffers ();
-               uint32_t limit = n_process_buffers ();
-               
+
+               size_t limit = n_process_buffers().n_audio();
+               BufferSet& bufs = _session.get_scratch_buffers ();
+               const size_t blimit = bufs.count().n_audio();
+
                uint32_t n;
                uint32_t i;
 
+               if (limit > blimit) {
+
+                       /* example case: auditioner configured for stereo output,
+                          but loaded with an 8 channel file. there are only
+                          2 passthrough buffers, but n_process_buffers() will
+                          return 8.
+                          
+                          arbitrary decision: map all channels in the diskstream
+                          to the outputs available.
+                       */
+
+                       float scaling = limit/blimit;
+                       
+                       for (i = 0, n = 1; i < blimit; ++i, ++n) {
+
+                               /* first time through just copy a channel into 
+                                  the output buffer.
+                               */
+                               
+                               Sample* bb = bufs.get_audio (i).data();
+
+                               for (nframes_t xx = 0; xx < nframes; ++xx) {
+                                       bb[xx] = b[xx] * scaling;
+                               }
 
-               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;
+                               if (n < diskstream->n_channels().n_audio()) {
+                                       tmpb = diskstream->playback_buffer(n);
+                                       if (tmpb!=0) {
+                                               b = tmpb;
+                                       }
+                               }
+                       }
+
+                       for (;i < limit; ++i, ++n) {
+                               
+                               /* for all remaining channels, sum with existing
+                                  data in the output buffers 
+                               */
+                               
+                               bufs.get_audio (i%blimit).accumulate_with_gain_from (b, nframes, 0, scaling);
+                               
+                               if (n < diskstream->n_channels().n_audio()) {
+                                       tmpb = diskstream->playback_buffer(n);
+                                       if (tmpb!=0) {
+                                               b = tmpb;
+                                       }
+                               }
+                               
+                       }
+
+                       limit = blimit;
+
+               } else {
+                       for (i = 0, n = 1; i < limit; ++i, ++n) {
+                               memcpy (bufs.get_audio (i).data(), b, sizeof (Sample) * nframes); 
+                               if (n < diskstream->n_channels().n_audio()) {
+                                       tmpb = diskstream->playback_buffer(n);
+                                       if (tmpb!=0) {
+                                               b = tmpb;
+                                       }
                                }
                        }
                }
 
-               /* don't waste time with automation if we're recording */
+               /* don't waste time with automation if we're recording or we've just stopped (yes it can happen) */
 
-               if (!diskstream->record_enabled()) {
+               if (!diskstream->record_enabled() && _session.transport_rolling()) {
+                       Glib::Mutex::Lock am (data().control_lock(), Glib::TRY_LOCK);
                        
-                       if (gain_automation_playback()) {
-                               apply_gain_automation = _gain_automation_curve.rt_safe_get_vector (start_frame, end_frame, _session.gain_automation_buffer(), nframes);
+                       if (am.locked() && gain_control()->automation_playback()) {
+                               apply_gain_automation = gain_control()->list()->curve().rt_safe_get_vector (start_frame, end_frame, _session.gain_automation_buffer(), nframes);
                        }
                }
 
-               process_output_buffers (bufs, limit, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || _session.get_recording_plugins()), declick, (_meter_point != MeterInput));
+               process_output_buffers (bufs, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, (_meter_point != MeterInput));
                
        } else {
                /* problem with the diskstream; just be quiet for a bit */
@@ -664,10 +679,10 @@ AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nfram
 }
 
 int
-AudioTrack::silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
+AudioTrack::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, 
                         bool can_record, bool rec_monitors_input)
 {
-       if (n_outputs() == 0 && _redirects.empty()) {
+       if (n_outputs().n_total() == 0 && _processors.empty()) {
                return 0;
        }
 
@@ -678,79 +693,64 @@ AudioTrack::silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jac
 
        _silent = true;
        apply_gain_automation = false;
-       
-       silence (nframes, offset);
 
-       return diskstream->process (_session.transport_frame() + offset, nframes, offset, can_record, rec_monitors_input);
-}
-
-void
-AudioTrack::toggle_monitor_input ()
-{
-       for (vector<Port*>::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
-               (*i)->request_monitor_input(!(*i)->monitoring_input());
-       }
-}
-
-int
-AudioTrack::set_name (string str, void *src)
-{
-       if (record_enabled() && _session.actively_recording()) {
-               /* this messes things up if done while recording */
-               return -1;
-       }
+       silence (nframes, offset);
 
-       diskstream->set_name (str, src);
-       return IO::set_name (str, src);
+       return audio_diskstream()->process (_session.transport_frame() + offset, nframes, offset, can_record, rec_monitors_input);
 }
 
 int
-AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes_t start, jack_nframes_t nframes)
+AudioTrack::export_stuff (BufferSet& buffers, nframes_t start, nframes_t nframes)
 {
        gain_t  gain_automation[nframes];
        gain_t  gain_buffer[nframes];
        float   mix_buffer[nframes];
-       RedirectList::iterator i;
+       ProcessorList::iterator i;
        bool post_fader_work = false;
        gain_t this_gain = _gain;
-       vector<Sample*>::iterator bi;
-       Sample * b;
+       boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
        
-       LockMonitor rlock (redirect_lock, __LINE__, __FILE__);
-               
-       if (diskstream->playlist()->read (buffers[0], mix_buffer, gain_buffer, start, nframes) != nframes) {
+       Glib::RWLock::ReaderLock rlock (_processor_lock);
+
+       boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist());
+       assert(apl);
+
+       assert(buffers.get_audio(0).capacity() >= nframes);
+
+       if (apl->read (buffers.get_audio(0).data(), mix_buffer, gain_buffer, start, nframes) != nframes) {
                return -1;
        }
 
+       assert(buffers.count().n_audio() >= 1);
        uint32_t n=1;
-       bi = buffers.begin();
-       b = buffers[0];
+       Sample* b = buffers.get_audio(0).data();
+       BufferSet::audio_iterator bi = buffers.audio_begin();
        ++bi;
-       for (; bi != buffers.end(); ++bi, ++n) {
-               if (n < diskstream->n_channels()) {
-                       if (diskstream->playlist()->read ((*bi), mix_buffer, gain_buffer, start, nframes, n) != nframes) {
+       for ( ; bi != buffers.audio_end(); ++bi, ++n) {
+               if (n < diskstream->n_channels().n_audio()) {
+                       if (apl->read (bi->data(), mix_buffer, gain_buffer, start, nframes, n) != nframes) {
                                return -1;
                        }
-                       b = (*bi);
+                       b = bi->data();
                }
                else {
                        /* duplicate last across remaining buffers */
-                       memcpy ((*bi), b, sizeof (Sample) * nframes); 
+                       memcpy (bi->data(), b, sizeof (Sample) * nframes); 
                }
        }
 
 
-       /* note: only run inserts during export. other layers in the machinery
-          will already have checked that there are no external port inserts.
+       /* note: only run processors during export. other layers in the machinery
+          will already have checked that there are no external port processors.
        */
        
-       for (i = _redirects.begin(); i != _redirects.end(); ++i) {
-               Insert *insert;
+       for (i = _processors.begin(); i != _processors.end(); ++i) {
+               boost::shared_ptr<Processor> processor;
                
-               if ((insert = dynamic_cast<Insert*>(*i)) != 0) {
-                       switch (insert->placement()) {
+               if ((processor = boost::dynamic_pointer_cast<Processor>(*i)) != 0) {
+                       switch (processor->placement()) {
                        case PreFader:
-                               insert->run (buffers, nbufs, nframes, 0);
+                               processor->run_in_place (buffers, start, start+nframes, nframes, 0);
                                break;
                        case PostFader:
                                post_fader_work = true;
@@ -759,22 +759,22 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes
                }
        }
        
-       if (_gain_automation_curve.automation_state() == Play) {
+       if (gain_control()->automation_state() == Play) {
                
-               _gain_automation_curve.get_vector (start, start + nframes, gain_automation, nframes);
+               gain_control()->list()->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) {
+               for (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) {
+                       Sample *b = bi->data();
+                       for (nframes_t n = 0; n < nframes; ++n) {
                                b[n] *= gain_automation[n];
                        }
                }
 
        } else {
 
-               for (bi = buffers.begin(); bi != buffers.end(); ++bi) {
-                       Sample *b = *bi;
-                       for (jack_nframes_t n = 0; n < nframes; ++n) {
+               for (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) {
+                       Sample *b = bi->data();
+                       for (nframes_t n = 0; n < nframes; ++n) {
                                b[n] *= this_gain;
                        }
                }
@@ -782,15 +782,15 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes
 
        if (post_fader_work) {
 
-               for (i = _redirects.begin(); i != _redirects.end(); ++i) {
-                       PluginInsert *insert;
+               for (i = _processors.begin(); i != _processors.end(); ++i) {
+                       boost::shared_ptr<PluginInsert> processor;
                        
-                       if ((insert = dynamic_cast<PluginInsert*>(*i)) != 0) {
+                       if ((processor = boost::dynamic_pointer_cast<PluginInsert>(*i)) != 0) {
                                switch ((*i)->placement()) {
                                case PreFader:
                                        break;
                                case PostFader:
-                                       insert->run (buffers, nbufs, nframes, 0);
+                                       processor->run_in_place (buffers, start, start+nframes, nframes, 0);
                                        break;
                                }
                        }
@@ -800,62 +800,37 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes
        return 0;
 }
 
-void
-AudioTrack::set_latency_delay (jack_nframes_t longest_session_latency)
-{
-       Route::set_latency_delay (longest_session_latency);
-       diskstream->set_roll_delay (_roll_delay);
-}
-
-jack_nframes_t
-AudioTrack::update_total_latency ()
-{
-       _own_latency = 0;
-
-       for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
-               if ((*i)->active ()) {
-                       _own_latency += (*i)->latency ();
-               }
-       }
-
-       set_port_latency (_own_latency);
-
-       return _own_latency;
-}
-
-void
+boost::shared_ptr<Region>
 AudioTrack::bounce (InterThreadInfo& itt)
 {
-       vector<Source*> srcs;
-       _session.write_one_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
+       vector<boost::shared_ptr<Source> > srcs;
+       return _session.write_one_track (*this, _session.current_start_frame(), _session.current_end_frame(), false, srcs, itt);
 }
 
-
-void
-AudioTrack::bounce_range (jack_nframes_t start, jack_nframes_t end, InterThreadInfo& itt)
+boost::shared_ptr<Region>
+AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt)
 {
-       vector<Source*> srcs;
-       _session.write_one_track (*this, start, end, false, srcs, itt);
+       vector<boost::shared_ptr<Source> > srcs;
+       return _session.write_one_track (*this, start, end, false, srcs, itt);
 }
 
 void
 AudioTrack::freeze (InterThreadInfo& itt)
 {
-       Insert* insert;
-       vector<Source*> srcs;
+       vector<boost::shared_ptr<Source> > srcs;
        string new_playlist_name;
-       Playlist* new_playlist;
+       boost::shared_ptr<Playlist> new_playlist;
        string dir;
-       AudioRegion* region;
        string region_name;
+       boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
        
-       if ((_freeze_record.playlist = diskstream->playlist()) == 0) {
+       if ((_freeze_record.playlist = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist())) == 0) {
                return;
        }
 
        uint32_t n = 1;
 
-       while (n < (ULONG_MAX-1)) {
+       while (n < (UINT_MAX-1)) {
         
                string candidate;
                
@@ -870,59 +845,73 @@ AudioTrack::freeze (InterThreadInfo& itt)
 
        } 
 
-       if (n == (ULONG_MAX-1)) {
-         error << string_compose (X_("There Are too many frozen versions of playlist \"%1\""
+       if (n == (UINT_MAX-1)) {
+         error << string_compose (X_("There are too many frozen versions of playlist \"%1\""
                            " to create another one"), _freeze_record.playlist->name())
               << endmsg;
                return;
        }
 
-       if (_session.write_one_track (*this, 0, _session.current_end_frame(), true, srcs, itt)) {
+       boost::shared_ptr<Region> res;
+
+       if ((res = _session.write_one_track (*this, _session.current_start_frame(), _session.current_end_frame(), true, srcs, itt)) == 0) {
                return;
        }
 
-       _freeze_record.insert_info.clear ();
+       _freeze_record.processor_info.clear ();
        _freeze_record.have_mementos = true;
 
        {
-               LockMonitor lm (redirect_lock, __LINE__, __FILE__);
+               Glib::RWLock::ReaderLock lm (_processor_lock);
                
-               for (RedirectList::iterator r = _redirects.begin(); r != _redirects.end(); ++r) {
+               for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) {
                        
-                       if ((insert = dynamic_cast<Insert*>(*r)) != 0) {
-                               
-                               FreezeRecordInsertInfo* frii  = new FreezeRecordInsertInfo ((*r)->get_state());
+                       boost::shared_ptr<Processor> processor;
+
+                       if ((processor = boost::dynamic_pointer_cast<Processor>(*r)) != 0) {
                                
-                               frii->insert = insert;
-                               frii->id = insert->id();
-                               frii->memento = (*r)->get_memento();
+                               FreezeRecordProcessorInfo* frii  = new FreezeRecordProcessorInfo ((*r)->get_state(), processor);
                                
-                               _freeze_record.insert_info.push_back (frii);
+                               frii->id = processor->id();
+
+                               _freeze_record.processor_info.push_back (frii);
                                
-                               /* now deactivate the insert */
+                               /* now deactivate the processor */
                                
-                               insert->set_active (false, this);
+                               processor->set_active (false);
+                               _session.set_dirty ();
                        }
                }
        }
 
-       new_playlist = new AudioPlaylist (_session, new_playlist_name, false);
+       new_playlist = PlaylistFactory::create (DataType::AUDIO, _session, new_playlist_name, false);
+
+       _freeze_record.gain = _gain;
+       _freeze_record.gain_automation_state = _gain_control->automation_state();
+       _freeze_record.pan_automation_state = _panner->automation_state();
+
        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);
+       boost::shared_ptr<Region> region (RegionFactory::create (srcs, 0, srcs[0]->length(), 
+                                                                region_name, 0, 
+                                                                (Region::Flag) (Region::WholeFile|Region::DefaultFlags),
+                                                                false));
 
        new_playlist->set_orig_diskstream_id (diskstream->id());
-       new_playlist->add_region (*region, 0);
+       new_playlist->add_region (region, _session.current_start_frame());
        new_playlist->set_frozen (true);
        region->set_locked (true);
 
-       diskstream->use_playlist (dynamic_cast<AudioPlaylist*>(new_playlist));
-       diskstream->set_record_enabled (false, this);
+       diskstream->use_playlist (boost::dynamic_pointer_cast<AudioPlaylist>(new_playlist));
+       diskstream->set_record_enabled (false);
+
+       /* reset stuff that has already been accounted for in the freeze process */
+       
+       set_gain (1.0, this);
+       _gain_control->set_automation_state (Off);
+       _panner->set_automation_state (Off);
 
        _freeze_record.state = Frozen;
        FreezeChange(); /* EMIT SIGNAL */
@@ -932,19 +921,19 @@ void
 AudioTrack::unfreeze ()
 {
        if (_freeze_record.playlist) {
-               diskstream->use_playlist (_freeze_record.playlist);
+               audio_diskstream()->use_playlist (_freeze_record.playlist);
 
                if (_freeze_record.have_mementos) {
 
-                       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) {
                                (*i)->memento ();
                        }
 
                } else {
 
-                       LockMonitor lm (redirect_lock, __LINE__, __FILE__);
-                       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) {
+                       Glib::RWLock::ReaderLock lm (_processor_lock); // should this be a write lock? jlc
+                       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+                               for (vector<FreezeRecordProcessorInfo*>::iterator ii = _freeze_record.processor_info.begin(); ii != _freeze_record.processor_info.end(); ++ii) {
                                        if ((*ii)->id == (*i)->id()) {
                                                (*i)->set_state (((*ii)->state));
                                                break;
@@ -953,111 +942,13 @@ AudioTrack::unfreeze ()
                        }
                }
                
-               _freeze_record.playlist = 0;
+               _freeze_record.playlist.reset ();
+               set_gain (_freeze_record.gain, this);
+               _gain_control->set_automation_state (_freeze_record.gain_automation_state);
+               _panner->set_automation_state (_freeze_record.pan_automation_state);
        }
 
        _freeze_record.state = UnFrozen;
        FreezeChange (); /* EMIT SIGNAL */
 }
 
-AudioTrack::FreezeRecord::~FreezeRecord ()
-{
-       for (vector<FreezeRecordInsertInfo*>::iterator i = insert_info.begin(); i != insert_info.end(); ++i) {
-               delete *i;
-       }
-}
-
-AudioTrack::FreezeState
-AudioTrack::freeze_state() const
-{
-       return _freeze_record.state;
-}
-
-
-void
-AudioTrack::reset_midi_control (MIDI::Port* port, bool on)
-{
-       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);
-}
-
-void
-AudioTrack::send_all_midi_feedback ()
-{
-       if (_session.get_midi_feedback()) {
-
-               Route::send_all_midi_feedback();
-
-               _midi_rec_enable_control.send_feedback (record_enabled());
-       }
-}
-
-
-AudioTrack::MIDIRecEnableControl::MIDIRecEnableControl (AudioTrack& s,  MIDI::Port* port)
-       : MIDI::Controllable (port, 0), track (s), setting(false)
-{
-       last_written = false; /* XXX need a good out of bound value */
-}
-
-void
-AudioTrack::MIDIRecEnableControl::set_value (float val)
-{
-       bool bval = ((val >= 0.5f) ? true: false);
-       
-       setting = true;
-       track.set_record_enable (bval, this);
-       setting = false;
-}
-
-void
-AudioTrack::MIDIRecEnableControl::send_feedback (bool value)
-{
-
-       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);
-               }
-       }
-       
-}
-
-MIDI::byte*
-AudioTrack::MIDIRecEnableControl::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool val, bool force)
-{
-       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 buf;
-}