Merged with trunk R846
[ardour.git] / libs / ardour / audio_track.cc
index f8817a254466a564a115d48ef483597c3ddbb29a..7a44be9b54f7767dde9ca5593822ef14ab5ccb94 100644 (file)
 #include <sigc++/bind.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/audioregion.h>
+#include <ardour/audiosource.h>
 #include <ardour/route_group_specialized.h>
 #include <ardour/insert.h>
 #include <ardour/audioplaylist.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());
 }
 
 AudioTrack::~AudioTrack ()
 {
-       if (diskstream) {
-               diskstream->unref();
-       }
 }
 
 int
 AudioTrack::deprecated_use_diskstream_connections ()
 {
+       boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
+
        if (diskstream->deprecated_io_node == 0) {
                return 0;
        }
@@ -141,16 +126,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;
+       _diskstream->set_io (*this);
+       _diskstream->set_destructive (_mode == Destructive);
 
-       diskstream = &ds.ref();
-       diskstream->set_io (*this);
-
-       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 +141,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,84 +155,33 @@ 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);
+       return set_diskstream (dstream, this);
 }
 
-bool
-AudioTrack::record_enabled () const
+boost::shared_ptr<AudioDiskstream>
+AudioTrack::audio_diskstream() const
 {
-       return diskstream->record_enabled ();
-}
-
-void
-AudioTrack::set_record_enable (bool yn, void *src)
-{
-       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);
-       }
-}
-
-void
-AudioTrack::set_meter_point (MeterPoint p, void *src)
-{
-       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 boost::dynamic_pointer_cast<AudioDiskstream>(_diskstream);
 }
 
 int
@@ -258,42 +189,24 @@ AudioTrack::set_state (const XMLNode& node)
 {
        const XMLProperty *prop;
        XMLNodeConstIterator iter;
-       XMLNodeList midi_kids;
 
        if (Route::set_state (node)) {
                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) {
+               if (prop->value() == X_("normal")) {
+                       _mode = Normal;
+               } else if (prop->value() == X_("destructive")) {
+                       _mode = Destructive;
+               } else {
+                       warning << string_compose ("unknown audio track mode \"%1\" seen and ignored", prop->value()) << endmsg;
+                       _mode = Normal;
                }
+       } else {
+               _mode = Normal;
        }
 
-       
        if ((prop = node.property ("diskstream-id")) == 0) {
                
                /* some old sessions use the diskstream name rather than the ID */
@@ -310,13 +223,31 @@ 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_("remote_control")) {
+                       if ((prop = child->property (X_("id"))) != 0) {
+                               int32_t x;
+                               sscanf (prop->value().c_str(), "%d", &x);
+                               set_remote_control_id (x);
+                       }
+               }
+       }
+
        pending_state = const_cast<XMLNode*> (&node);
 
        _session.StateReady.connect (mem_fun (*this, &AudioTrack::set_state_part_two));
@@ -325,11 +256,11 @@ 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;
@@ -341,7 +272,7 @@ AudioTrack::get_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);
+                       (*i)->id.print (buf);
                        inode->add_property (X_("id"), buf);
                        inode->add_child_copy ((*i)->state);
                
@@ -354,7 +285,7 @@ AudioTrack::get_state()
        /* Alignment: act as a proxy for the diskstream */
        
        XMLNode* align_node = new XMLNode (X_("alignment"));
-       switch (diskstream->alignment_style()) {
+       switch (_diskstream->alignment_style()) {
        case ExistingMaterial:
                snprintf (buf, sizeof (buf), X_("existing"));
                break;
@@ -365,30 +296,29 @@ AudioTrack::get_state()
        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;
+       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);
 
-       midikids = root.children ("MIDI");
-       if (!midikids.empty()) {
-               midi_node = midikids.front();
-       }
-       else {
-               midi_node = root.add_child ("MIDI");
+       switch (_mode) {
+       case Normal:
+               root.add_property (X_("mode"), X_("normal"));
+               break;
+       case Destructive:
+               root.add_property (X_("mode"), X_("destructive"));
+               break;
        }
-               
-       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);
-       }
+       /* 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.
+       */
+
+       _diskstream->id().print (buf);
+       root.add_property ("diskstream-id", buf);
 
-       
        return root;
 }
 
@@ -445,9 +375,9 @@ AudioTrack::set_state_part_two ()
                                continue;
                        }
                        
-                       FreezeRecordInsertInfo* frii = new FreezeRecordInsertInfo (*((*citer)->children().front()));
-                       frii->insert = 0;
-                       sscanf (prop->value().c_str(), "%" PRIu64, &frii->id);
+                       FreezeRecordInsertInfo* frii = new FreezeRecordInsertInfo (*((*citer)->children().front()),
+                                                                                  boost::shared_ptr<Insert>());
+                       frii->id = prop->value ();
                        _freeze_record.insert_info.push_back (frii);
                }
        }
@@ -458,33 +388,26 @@ AudioTrack::set_state_part_two ()
 
                if ((prop = fnode->property (X_("style"))) != 0) {
                        if (prop->value() == "existing") {
-                               diskstream->set_persistent_align_style (ExistingMaterial);
+                               _diskstream->set_persistent_align_style (ExistingMaterial);
                        } else if (prop->value() == "capture") {
-                               diskstream->set_persistent_align_style (CaptureTime);
+                               _diskstream->set_persistent_align_style (CaptureTime);
                        }
                }
        }
        return;
 }      
 
-uint32_t
+ChanCount
 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);
+       return max (_diskstream->n_channels(), redirect_max_outs);
 }
 
 int 
 AudioTrack::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)
 {
-       if (n_outputs() == 0) {
+       if (n_outputs().get_total() == 0) {
                return 0;
        }
 
@@ -501,7 +424,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;
        
@@ -514,17 +437,17 @@ AudioTrack::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nf
        } else {
 
                if (_session.get_auto_input()) {
-                       if (Config->get_no_sw_monitoring()) {
-                               send_silence = true;
-                       } else {
+                       if (Config->get_use_sw_monitoring()) {
                                send_silence = false;
+                       } else {
+                               send_silence = true;
                        }
                } else {
-                       if (diskstream->record_enabled()) {
-                               if (Config->get_no_sw_monitoring()) {
-                                       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;
@@ -568,10 +491,18 @@ AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nfram
        Sample* b;
        Sample* tmpb;
        jack_nframes_t transport_frame;
-
-       automation_snapshot (start_frame);
-
-       if (n_outputs() == 0 && _redirects.empty()) {
+       boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
+       
+       {
+               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().get_total() == 0 && _redirects.empty()) {
                return 0;
        }
 
@@ -627,16 +558,15 @@ 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 ();
+               const size_t limit = n_process_buffers().get(DataType::AUDIO);
+               BufferSet& bufs = _session.get_scratch_buffers (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()) {
+                       memcpy (bufs.get_audio(i).data(nframes), b, sizeof (Sample) * nframes); 
+                       if (n < diskstream->n_channels().get(DataType::AUDIO)) {
                                tmpb = diskstream->playback_buffer(n);
                                if (tmpb!=0) {
                                        b = tmpb;
@@ -644,16 +574,17 @@ AudioTrack::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nfram
                        }
                }
 
-               /* 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 (automation_lock, Glib::TRY_LOCK);
                        
-                       if (gain_automation_playback()) {
+                       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);
                        }
                }
 
-               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() || !_session.get_do_not_record_plugins()), declick, (_meter_point != MeterInput));
                
        } else {
                /* problem with the diskstream; just be quiet for a bit */
@@ -667,7 +598,7 @@ int
 AudioTrack::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()) {
+       if (n_outputs().get_total() == 0 && _redirects.empty()) {
                return 0;
        }
 
@@ -678,34 +609,14 @@ 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, jack_nframes_t start, jack_nframes_t nframes)
 {
        gain_t  gain_automation[nframes];
        gain_t  gain_buffer[nframes];
@@ -713,29 +624,34 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes
        RedirectList::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 (redirect_lock);
+
+       // FIXME
+       AudioPlaylist* const apl = dynamic_cast<AudioPlaylist*>(diskstream->playlist());
+       assert(apl);
+
+       if (apl->read (buffers.get_audio(nframes).data(nframes),
+                       mix_buffer, gain_buffer, start, nframes) != nframes) {
                return -1;
        }
 
+       assert(buffers.count().get(DataType::AUDIO) >= 1);
        uint32_t n=1;
-       bi = buffers.begin();
-       b = buffers[0];
+       Sample* b = buffers.get_audio(0).data(nframes);
+       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().get(DataType::AUDIO)) {
+                       if (apl->read (bi->data(nframes), mix_buffer, gain_buffer, start, nframes, n) != nframes) {
                                return -1;
                        }
-                       b = (*bi);
+                       b = bi->data(nframes);
                }
                else {
                        /* duplicate last across remaining buffers */
-                       memcpy ((*bi), b, sizeof (Sample) * nframes); 
+                       memcpy (bi->data(nframes), b, sizeof (Sample) * nframes); 
                }
        }
 
@@ -745,12 +661,12 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes
        */
        
        for (i = _redirects.begin(); i != _redirects.end(); ++i) {
-               Insert *insert;
+               boost::shared_ptr<Insert> insert;
                
-               if ((insert = dynamic_cast<Insert*>(*i)) != 0) {
+               if ((insert = boost::dynamic_pointer_cast<Insert>(*i)) != 0) {
                        switch (insert->placement()) {
                        case PreFader:
-                               insert->run (buffers, nbufs, nframes, 0);
+                               insert->run (buffers, start, start+nframes, nframes, 0);
                                break;
                        case PostFader:
                                post_fader_work = true;
@@ -763,8 +679,8 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes
                
                _gain_automation_curve.get_vector (start, start + nframes, gain_automation, nframes);
 
-               for (bi = buffers.begin(); bi != buffers.end(); ++bi) {
-                       Sample *b = *bi;
+               for (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) {
+                       Sample *b = bi->data(nframes);
                        for (jack_nframes_t n = 0; n < nframes; ++n) {
                                b[n] *= gain_automation[n];
                        }
@@ -772,8 +688,8 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes
 
        } else {
 
-               for (bi = buffers.begin(); bi != buffers.end(); ++bi) {
-                       Sample *b = *bi;
+               for (BufferSet::audio_iterator bi = buffers.audio_begin(); bi != buffers.audio_end(); ++bi) {
+                       Sample *b = bi->data(nframes);
                        for (jack_nframes_t n = 0; n < nframes; ++n) {
                                b[n] *= this_gain;
                        }
@@ -783,14 +699,14 @@ 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;
+                       boost::shared_ptr<PluginInsert> insert;
                        
-                       if ((insert = dynamic_cast<PluginInsert*>(*i)) != 0) {
+                       if ((insert = boost::dynamic_pointer_cast<PluginInsert>(*i)) != 0) {
                                switch ((*i)->placement()) {
                                case PreFader:
                                        break;
                                case PostFader:
-                                       insert->run (buffers, nbufs, nframes, 0);
+                                       insert->run (buffers, start, start+nframes, nframes, 0);
                                        break;
                                }
                        }
@@ -800,34 +716,11 @@ 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
 AudioTrack::bounce (InterThreadInfo& itt)
 {
        vector<Source*> srcs;
-       _session.write_one_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
+       _session.write_one_audio_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
 }
 
 
@@ -835,27 +728,27 @@ void
 AudioTrack::bounce_range (jack_nframes_t start, jack_nframes_t end, InterThreadInfo& itt)
 {
        vector<Source*> srcs;
-       _session.write_one_track (*this, start, end, false, srcs, itt);
+       _session.write_one_audio_track (*this, start, end, false, srcs, itt);
 }
 
 void
 AudioTrack::freeze (InterThreadInfo& itt)
 {
-       Insert* insert;
        vector<Source*> srcs;
        string new_playlist_name;
        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 = dynamic_cast<AudioPlaylist*>(diskstream->playlist())) == 0) {
                return;
        }
 
        uint32_t n = 1;
 
-       while (n < (ULONG_MAX-1)) {
+       while (n < (UINT_MAX-1)) {
         
                string candidate;
                
@@ -870,14 +763,14 @@ 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)) {
+       if (_session.write_one_audio_track (*this, 0, _session.current_end_frame(), true, srcs, itt)) {
                return;
        }
 
@@ -885,15 +778,16 @@ AudioTrack::freeze (InterThreadInfo& itt)
        _freeze_record.have_mementos = true;
 
        {
-               LockMonitor lm (redirect_lock, __LINE__, __FILE__);
+               Glib::RWLock::ReaderLock lm (redirect_lock);
                
                for (RedirectList::iterator r = _redirects.begin(); r != _redirects.end(); ++r) {
                        
-                       if ((insert = dynamic_cast<Insert*>(*r)) != 0) {
+                       boost::shared_ptr<Insert> insert;
+
+                       if ((insert = boost::dynamic_pointer_cast<Insert>(*r)) != 0) {
                                
-                               FreezeRecordInsertInfo* frii  = new FreezeRecordInsertInfo ((*r)->get_state());
+                               FreezeRecordInsertInfo* frii  = new FreezeRecordInsertInfo ((*r)->get_state(), insert);
                                
-                               frii->insert = insert;
                                frii->id = insert->id();
                                frii->memento = (*r)->get_memento();
                                
@@ -922,7 +816,7 @@ AudioTrack::freeze (InterThreadInfo& itt)
        region->set_locked (true);
 
        diskstream->use_playlist (dynamic_cast<AudioPlaylist*>(new_playlist));
-       diskstream->set_record_enabled (false, this);
+       diskstream->set_record_enabled (false);
 
        _freeze_record.state = Frozen;
        FreezeChange(); /* EMIT SIGNAL */
@@ -932,7 +826,7 @@ 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) {
 
@@ -942,7 +836,7 @@ AudioTrack::unfreeze ()
 
                } else {
 
-                       LockMonitor lm (redirect_lock, __LINE__, __FILE__);
+                       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()) {
@@ -960,104 +854,3 @@ AudioTrack::unfreeze ()
        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;
-}