many important changes to configuration system and specific parameters
[ardour.git] / libs / ardour / audio_diskstream.cc
index 043b2a1c9760d23af169493b536ec32c12a06932..71d16583e00f1cf9945e2eda060e55eaa11a793c 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2003 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis 
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -14,8 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: diskstream.cc 567 2006-06-07 14:54:12Z trutkin $
 */
 
 #include <fstream>
@@ -23,6 +21,7 @@
 #include <unistd.h>
 #include <cmath>
 #include <cerrno>
+#include <cassert>
 #include <string>
 #include <climits>
 #include <fcntl.h>
@@ -35,6 +34,7 @@
 #include <pbd/basename.h>
 #include <glibmm/thread.h>
 #include <pbd/xml++.h>
+#include <pbd/memento_command.h>
 
 #include <ardour/ardour.h>
 #include <ardour/audioengine.h>
 #include <ardour/audiofilesource.h>
 #include <ardour/destructive_filesource.h>
 #include <ardour/send.h>
+#include <ardour/region_factory.h>
 #include <ardour/audioplaylist.h>
 #include <ardour/cycle_timer.h>
 #include <ardour/audioregion.h>
+#include <ardour/source_factory.h>
 
 #include "i18n.h"
 #include <locale.h>
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 
-jack_nframes_t AudioDiskstream::disk_io_chunk_frames;
-
-sigc::signal<void,AudioDiskstream*>    AudioDiskstream::AudioDiskstreamCreated;
-sigc::signal<void,list<AudioFileSource*>*> AudioDiskstream::DeleteSources;
-sigc::signal<void>                AudioDiskstream::DiskOverrun;
-sigc::signal<void>                AudioDiskstream::DiskUnderrun;
+size_t  AudioDiskstream::_working_buffers_size = 0;
+Sample* AudioDiskstream::_mixdown_buffer       = 0;
+gain_t* AudioDiskstream::_gain_buffer          = 0;
 
-AudioDiskstream::AudioDiskstream (Session &sess, const string &name, Flag flag)
-       : _name (name),
-         _session (sess)
+AudioDiskstream::AudioDiskstream (Session &sess, const string &name, Diskstream::Flag flag)
+       : Diskstream(sess, name, flag)
+       , deprecated_io_node(NULL)
 {
        /* prevent any write sources from being created */
 
        in_set_state = true;
 
-       init (flag);
+       init(flag);
        use_new_playlist ();
 
        in_set_state = false;
-
-       AudioDiskstreamCreated (this); /* EMIT SIGNAL */
 }
        
 AudioDiskstream::AudioDiskstream (Session& sess, const XMLNode& node)
-       : _session (sess)
-       
+       : Diskstream(sess, node)
+       , deprecated_io_node(NULL)
 {
        in_set_state = true;
        init (Recordable);
@@ -94,8 +92,6 @@ AudioDiskstream::AudioDiskstream (Session& sess, const XMLNode& node)
        if (destructive()) {
                use_destructive_playlist ();
        }
-
-       AudioDiskstreamCreated (this); /* EMIT SIGNAL */
 }
 
 void
@@ -105,7 +101,6 @@ AudioDiskstream::init_channel (ChannelInfo &chan)
        chan.capture_wrap_buffer = 0;
        chan.speed_buffer = 0;
        chan.peak_power = 0.0f;
-       chan.write_source = 0;
        chan.source = 0;
        chan.current_capture_buffer = 0;
        chan.current_playback_buffer = 0;
@@ -128,44 +123,9 @@ AudioDiskstream::init_channel (ChannelInfo &chan)
 
 
 void
-AudioDiskstream::init (Flag f)
+AudioDiskstream::init (Diskstream::Flag f)
 {
-       _id = new_id();
-       _refcnt = 0;
-       _flags = f;
-       _io = 0;
-       _alignment_style = ExistingMaterial;
-       _persistent_alignment_style = ExistingMaterial;
-       first_input_change = true;
-       _playlist = 0;
-       i_am_the_modifier = 0;
-       g_atomic_int_set (&_record_enabled, 0);
-       was_recording = false;
-       capture_start_frame = 0;
-       capture_captured = 0;
-       _visible_speed = 1.0f;
-       _actual_speed = 1.0f;
-       _buffer_reallocation_required = false;
-       _seek_required = false;
-       first_recordable_frame = max_frames;
-       last_recordable_frame = max_frames;
-       _roll_delay = 0;
-       _capture_offset = 0;
-       _processed = false;
-       _slaved = false;
-       adjust_capture_position = 0;
-       last_possibly_recording = 0;
-       loop_location = 0;
-       wrap_buffer_size = 0;
-       speed_buffer_size = 0;
-       last_phase = 0;
-       phi = (uint64_t) (0x1000000);
-       file_frame = 0;
-       playback_sample = 0;
-       playback_distance = 0;
-       _read_data_count = 0;
-       _write_data_count = 0;
-       deprecated_io_node = 0;
+       Diskstream::init(f);
 
        /* there are no channels at this point, so these
           two calls just get speed_buffer_size and wrap_buffer
@@ -175,21 +135,15 @@ AudioDiskstream::init (Flag f)
        set_block_size (_session.get_block_size());
        allocate_temporary_buffers ();
 
-       pending_overwrite = false;
-       overwrite_frame = 0;
-       overwrite_queued = false;
-       input_change_pending = NoChange;
-
        add_channel ();
-       _n_channels = 1;
+       assert(_n_channels == 1);
 }
 
 void
 AudioDiskstream::destroy_channel (ChannelInfo &chan)
 {
        if (chan.write_source) {
-               chan.write_source->release ();
-               chan.write_source = 0;
+               chan.write_source.reset ();
        }
                
        if (chan.speed_buffer) {
@@ -215,26 +169,30 @@ AudioDiskstream::~AudioDiskstream ()
 {
        Glib::Mutex::Lock lm (state_lock);
 
-       if (_playlist) {
-               _playlist->unref ();
-       }
-
-       for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
+       for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan)
                destroy_channel((*chan));
-       }
        
        channels.clear();
 }
 
 void
-AudioDiskstream::handle_input_change (IOChange change, void *src)
+AudioDiskstream::allocate_working_buffers()
 {
-       Glib::Mutex::Lock lm (state_lock);
+       assert(disk_io_frames() > 0);
 
-       if (!(input_change_pending & change)) {
-               input_change_pending = IOChange (input_change_pending|change);
-               _session.request_input_change_handling ();
-       }
+       _working_buffers_size = disk_io_frames();
+       _mixdown_buffer       = new Sample[_working_buffers_size];
+       _gain_buffer          = new gain_t[_working_buffers_size];
+}
+
+void
+AudioDiskstream::free_working_buffers()
+{
+       delete [] _mixdown_buffer;
+       delete [] _gain_buffer;
+       _working_buffers_size = 0;
+       _mixdown_buffer       = 0;
+       _gain_buffer          = 0;
 }
 
 void
@@ -291,9 +249,8 @@ AudioDiskstream::non_realtime_input_change ()
        /* now refill channel buffers */
 
        if (speed() != 1.0f || speed() != -1.0f) {
-               seek ((jack_nframes_t) (_session.transport_frame() * (double) speed()));
-       }
-       else {
+               seek ((nframes_t) (_session.transport_frame() * (double) speed()));
+       } else {
                seek (_session.transport_frame());
        }
 }
@@ -332,9 +289,9 @@ AudioDiskstream::find_and_use_playlist (const string& name)
        Playlist* pl;
        AudioPlaylist* playlist;
                
-       if ((pl = _session.get_playlist (name)) == 0) {
-               error << string_compose(_("AudioDiskstream: Session doesn't know about a Playlist called \"%1\""), name) << endmsg;
-               return -1;
+       if ((pl = _session.playlist_by_name (name)) == 0) {
+               playlist = new AudioPlaylist(_session, name);
+               pl = playlist;
        }
 
        if ((playlist = dynamic_cast<AudioPlaylist*> (pl)) == 0) {
@@ -346,57 +303,15 @@ AudioDiskstream::find_and_use_playlist (const string& name)
 }
 
 int
-AudioDiskstream::use_playlist (AudioPlaylist* playlist)
+AudioDiskstream::use_playlist (Playlist* playlist)
 {
-       {
-               Glib::Mutex::Lock lm (state_lock);
-
-               if (playlist == _playlist) {
-                       return 0;
-               }
+       assert(dynamic_cast<AudioPlaylist*>(playlist));
 
-               plstate_connection.disconnect();
-               plmod_connection.disconnect ();
-               plgone_connection.disconnect ();
-
-               if (_playlist) {
-                       _playlist->unref();
-               }
-                       
-               _playlist = playlist;
-               _playlist->ref();
-
-               if (!in_set_state && recordable()) {
-                       reset_write_sources (false);
-               }
-               
-               plstate_connection = _playlist->StateChanged.connect (mem_fun (*this, &AudioDiskstream::playlist_changed));
-               plmod_connection = _playlist->Modified.connect (mem_fun (*this, &AudioDiskstream::playlist_modified));
-               plgone_connection = _playlist->GoingAway.connect (mem_fun (*this, &AudioDiskstream::playlist_deleted));
-       }
-
-       if (!overwrite_queued) {
-               _session.request_overwrite_buffer (this);
-               overwrite_queued = true;
-       }
-       
-       PlaylistChanged (); /* EMIT SIGNAL */
-       _session.set_dirty ();
+       Diskstream::use_playlist(playlist);
 
        return 0;
 }
 
-void
-AudioDiskstream::playlist_deleted (Playlist* pl)
-{
-       /* this catches an ordering issue with session destruction. playlists 
-          are destroyed before diskstreams. we have to invalidate any handles
-          we have to the playlist.
-       */
-
-       _playlist = 0;
-}
-
 int
 AudioDiskstream::use_new_playlist ()
 {
@@ -424,6 +339,8 @@ AudioDiskstream::use_new_playlist ()
 int
 AudioDiskstream::use_copy_playlist ()
 {
+       assert(audio_playlist());
+
        if (destructive()) {
                return 0;
        }
@@ -438,7 +355,7 @@ AudioDiskstream::use_copy_playlist ()
 
        newname = Playlist::bump_name (_playlist->name(), _session);
        
-       if ((playlist  = new AudioPlaylist (*_playlist, newname)) != 0) {
+       if ((playlist  = new AudioPlaylist (*audio_playlist(), newname)) != 0) {
                playlist->set_orig_diskstream_id (id());
                return use_playlist (playlist);
        } else { 
@@ -449,7 +366,7 @@ AudioDiskstream::use_copy_playlist ()
 void
 AudioDiskstream::setup_destructive_playlist ()
 {
-       AudioRegion::SourceList srcs;
+       SourceList srcs;
 
        for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
                srcs.push_back ((*chan).write_source);
@@ -457,35 +374,38 @@ AudioDiskstream::setup_destructive_playlist ()
 
        /* a single full-sized region */
 
-       AudioRegion* region = new AudioRegion (srcs, 0, max_frames, _name);
-       _playlist->add_region (*region, 0);             
+       boost::shared_ptr<Region> region (RegionFactory::create (srcs, 0, max_frames - srcs.front()->natural_position(), _name));
+       _playlist->add_region (region, srcs.front()->natural_position());               
 }
 
 void
 AudioDiskstream::use_destructive_playlist ()
 {
-       /* use the sources associated with the single full-extent region */
-       
-       Playlist::RegionList* rl = _playlist->regions_at (0);
+       /* this is called from the XML-based constructor. when its done,
+          we already have a playlist and a region, but we need to
+          set up our sources for write. we use the sources associated 
+          with the (presumed single, full-extent) region.
+       */
 
-       if (rl->empty()) {
+       boost::shared_ptr<Region> rp = _playlist->find_next_region (_session.current_start_frame(), Start, 1);
+
+       if (!rp) {
                reset_write_sources (false, true);
                return;
        }
 
-       AudioRegion* region = dynamic_cast<AudioRegion*> (rl->front());
+       boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (rp);
 
        if (region == 0) {
                throw failed_constructor();
        }
 
-       delete rl;
-
        uint32_t n;
        ChannelList::iterator chan;
 
        for (n = 0, chan = channels.begin(); chan != channels.end(); ++chan, ++n) {
-               (*chan).write_source = dynamic_cast<AudioFileSource*>(&region->source (n));
+               (*chan).write_source = boost::dynamic_pointer_cast<AudioFileSource>(region->source (n));
+               assert((*chan).write_source);
                (*chan).write_source->set_allow_remove_if_empty (false);
        }
 
@@ -493,105 +413,7 @@ AudioDiskstream::use_destructive_playlist ()
 }
 
 void
-AudioDiskstream::set_io (IO& io)
-{
-       _io = &io;
-       set_align_style_from_io ();
-}
-
-int
-AudioDiskstream::set_name (string str, void *src)
-{
-       if (str != _name) {
-               _playlist->set_name (str);
-               _name = str;
-               
-               if (!in_set_state && recordable()) {
-                       /* rename existing capture files so that they have the correct name */
-                       return rename_write_sources ();
-               } else {
-                       return -1;
-               }
-       }
-
-       return 0;
-}
-
-void
-AudioDiskstream::set_speed (double sp)
-{
-       _session.request_diskstream_speed (*this, sp);
-
-       /* to force a rebuffering at the right place */
-       playlist_modified();
-}
-
-bool
-AudioDiskstream::realtime_set_speed (double sp, bool global)
-{
-       bool changed = false;
-       double new_speed = sp * _session.transport_speed();
-       
-       if (_visible_speed != sp) {
-               _visible_speed = sp;
-               changed = true;
-       }
-       
-       if (new_speed != _actual_speed) {
-               
-               jack_nframes_t required_wrap_size = (jack_nframes_t) floor (_session.get_block_size() * 
-                                                                           fabs (new_speed)) + 1;
-               
-               if (required_wrap_size > wrap_buffer_size) {
-                       _buffer_reallocation_required = true;
-               }
-               
-               _actual_speed = new_speed;
-               phi = (uint64_t) (0x1000000 * fabs(_actual_speed));
-       }
-
-       if (changed) {
-               if (!global) {
-                       _seek_required = true;
-               }
-                speed_changed (); /* EMIT SIGNAL */
-       }
-
-       return _buffer_reallocation_required || _seek_required;
-}
-
-void
-AudioDiskstream::non_realtime_set_speed ()
-{
-       if (_buffer_reallocation_required)
-       {
-               Glib::Mutex::Lock lm (state_lock);
-               allocate_temporary_buffers ();
-
-               _buffer_reallocation_required = false;
-       }
-
-       if (_seek_required) {
-               if (speed() != 1.0f || speed() != -1.0f) {
-                       seek ((jack_nframes_t) (_session.transport_frame() * (double) speed()), true);
-               }
-               else {
-                       seek (_session.transport_frame(), true);
-               }
-
-               _seek_required = false;
-       }
-}
-
-void
-AudioDiskstream::prepare ()
-{
-       _processed = false;
-       playback_distance = 0;
-}
-
-void
-AudioDiskstream::check_record_status (jack_nframes_t transport_frame, jack_nframes_t nframes, bool can_record)
+AudioDiskstream::check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record)
 {
        int possibly_recording;
        int rolling;
@@ -641,8 +463,7 @@ AudioDiskstream::check_record_status (jack_nframes_t transport_frame, jack_nfram
 
                        if (_alignment_style == ExistingMaterial) {
 
-
-                               if (!_session.get_punch_in()) {
+                               if (!Config->get_punch_in()) {
 
                                        /* manual punch in happens at the correct transport frame
                                           because the user hit a button. but to get alignment correct 
@@ -671,7 +492,7 @@ AudioDiskstream::check_record_status (jack_nframes_t transport_frame, jack_nfram
 
                        } else {
 
-                               if (_session.get_punch_in()) {
+                               if (Config->get_punch_in()) {
                                        first_recordable_frame += _roll_delay;
                                } else {
                                        capture_start_frame -= _roll_delay;
@@ -716,13 +537,13 @@ AudioDiskstream::check_record_status (jack_nframes_t transport_frame, jack_nfram
 }
 
 int
-AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes, jack_nframes_t offset, bool can_record, bool rec_monitors_input)
+AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input)
 {
        uint32_t n;
        ChannelList::iterator c;
        int ret = -1;
-       jack_nframes_t rec_offset = 0;
-       jack_nframes_t rec_nframes = 0;
+       nframes_t rec_offset = 0;
+       nframes_t rec_nframes = 0;
        bool nominally_recording;
        bool re = record_enabled ();
        bool collect_playback = false;
@@ -753,7 +574,7 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
           returns a non-zero value, in which case, ::commit should not be called.
        */
 
-        // If we can't take the state lock return.
+       // If we can't take the state lock return.
        if (!state_lock.trylock()) {
                return 1;
        }
@@ -765,7 +586,7 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
                (*c).current_playback_buffer  = 0;
        }
 
-       if (nominally_recording || (_session.get_record_enabled() && _session.get_punch_in())) {
+       if (nominally_recording || (_session.get_record_enabled() && Config->get_punch_in())) {
                OverlapType ot;
                
                ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
@@ -841,7 +662,7 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
 
                        } else {
 
-                               jack_nframes_t total = chan.capture_vector.len[0] + chan.capture_vector.len[1];
+                               nframes_t total = chan.capture_vector.len[0] + chan.capture_vector.len[1];
 
                                if (rec_nframes > total) {
                                        DiskOverrun ();
@@ -849,7 +670,7 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
                                }
 
                                Sample* buf = _io->input (n)->get_buffer (nframes) + offset;
-                               jack_nframes_t first = chan.capture_vector.len[0];
+                               nframes_t first = chan.capture_vector.len[0];
 
                                memcpy (chan.capture_wrap_buffer, buf, sizeof (Sample) * first);
                                memcpy (chan.capture_vector.buf[0], buf, sizeof (Sample) * first);
@@ -912,12 +733,12 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
 
                /* we're doing playback */
 
-               jack_nframes_t necessary_samples;
+               nframes_t necessary_samples;
 
                /* no varispeed playback if we're recording, because the output .... TBD */
 
                if (rec_nframes == 0 && _actual_speed != 1.0f) {
-                       necessary_samples = (jack_nframes_t) floor ((nframes * fabs (_actual_speed))) + 1;
+                       necessary_samples = (nframes_t) floor ((nframes * fabs (_actual_speed))) + 1;
                } else {
                        necessary_samples = nframes;
                }
@@ -937,7 +758,7 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
                                chan.current_playback_buffer = chan.playback_vector.buf[0];
 
                        } else {
-                               jack_nframes_t total = chan.playback_vector.len[0] + chan.playback_vector.len[1];
+                               nframes_t total = chan.playback_vector.len[0] + chan.playback_vector.len[1];
                                
                                if (necessary_samples > total) {
                                        DiskUnderrun ();
@@ -958,7 +779,7 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
                if (rec_nframes == 0 && _actual_speed != 1.0f && _actual_speed != -1.0f) {
                        
                        uint64_t phase = last_phase;
-                       jack_nframes_t i = 0;
+                       nframes_t i = 0;
 
                        // Linearly interpolate into the alt buffer
                        // using 40.24 fixp maths (swh)
@@ -971,7 +792,7 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
                                i = 0;
                                phase = last_phase;
 
-                               for (jack_nframes_t outsample = 0; outsample < nframes; ++outsample) {
+                               for (nframes_t outsample = 0; outsample < nframes; ++outsample) {
                                        i = phase >> 24;
                                        fr = (phase & 0xFFFFFF) / 16777216.0f;
                                        chan.speed_buffer[outsample] = 
@@ -1009,15 +830,8 @@ AudioDiskstream::process (jack_nframes_t transport_frame, jack_nframes_t nframes
        return ret;
 }
 
-void
-AudioDiskstream::recover ()
-{
-       state_lock.unlock();
-       _processed = false;
-}
-
 bool
-AudioDiskstream::commit (jack_nframes_t nframes)
+AudioDiskstream::commit (nframes_t nframes)
 {
        bool need_butler = false;
 
@@ -1071,29 +885,27 @@ AudioDiskstream::overwrite_existing_buffers ()
 {
        Sample* mixdown_buffer;
        float* gain_buffer;
-       char * workbuf;
        int ret = -1;
        bool reversed = (_visible_speed * _session.transport_speed()) < 0.0f;
 
        overwrite_queued = false;
 
        /* assume all are the same size */
-       jack_nframes_t size = channels[0].playback_buf->bufsize();
+       nframes_t size = channels[0].playback_buf->bufsize();
        
        mixdown_buffer = new Sample[size];
        gain_buffer = new float[size];
-       workbuf = new char[size*4];
        
        /* reduce size so that we can fill the buffer correctly. */
        size--;
        
        uint32_t n=0;
-       jack_nframes_t start;
+       nframes_t start;
 
        for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan, ++n) {
 
                start = overwrite_frame;
-               jack_nframes_t cnt = size;
+               nframes_t cnt = size;
                
                /* to fill the buffer without resetting the playback sample, we need to
                   do it one or two chunks (normally two).
@@ -1106,10 +918,9 @@ AudioDiskstream::overwrite_existing_buffers ()
                   
                */
                
-               jack_nframes_t to_read = size - overwrite_offset;
+               nframes_t to_read = size - overwrite_offset;
 
-               if (read ((*chan).playback_buf->buffer() + overwrite_offset, mixdown_buffer, gain_buffer, workbuf,
-                         start, to_read, *chan, n, reversed)) {
+               if (read ((*chan).playback_buf->buffer() + overwrite_offset, mixdown_buffer, gain_buffer, start, to_read, *chan, n, reversed)) {
                        error << string_compose(_("AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"),
                                         _id, size, playback_sample) << endmsg;
                        goto out;
@@ -1119,7 +930,7 @@ AudioDiskstream::overwrite_existing_buffers ()
 
                        cnt -= to_read;
                
-                       if (read ((*chan).playback_buf->buffer(), mixdown_buffer, gain_buffer, workbuf,
+                       if (read ((*chan).playback_buf->buffer(), mixdown_buffer, gain_buffer,
                                  start, cnt, *chan, n, reversed)) {
                                error << string_compose(_("AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"),
                                                 _id, size, playback_sample) << endmsg;
@@ -1134,12 +945,11 @@ AudioDiskstream::overwrite_existing_buffers ()
        pending_overwrite = false;
        delete [] gain_buffer;
        delete [] mixdown_buffer;
-       delete [] workbuf;
        return ret;
 }
 
 int
-AudioDiskstream::seek (jack_nframes_t frame, bool complete_refill)
+AudioDiskstream::seek (nframes_t frame, bool complete_refill)
 {
        Glib::Mutex::Lock lm (state_lock);
        uint32_t n;
@@ -1151,20 +961,26 @@ AudioDiskstream::seek (jack_nframes_t frame, bool complete_refill)
                (*chan).capture_buf->reset ();
        }
        
+       /* can't rec-enable in destructive mode if transport is before start */
+
+       if (destructive() && record_enabled() && frame < _session.current_start_frame()) {
+               disengage_record_enable ();
+       }
+
        playback_sample = frame;
        file_frame = frame;
 
        if (complete_refill) {
-               while ((ret = do_refill (0, 0, 0)) > 0);
+               while ((ret = do_refill_with_alloc ()) > 0) ;
        } else {
-               ret = do_refill (0, 0, 0);
+               ret = do_refill_with_alloc ();
        }
 
        return ret;
 }
 
 int
-AudioDiskstream::can_internal_playback_seek (jack_nframes_t distance)
+AudioDiskstream::can_internal_playback_seek (nframes_t distance)
 {
        ChannelList::iterator chan;
 
@@ -1177,7 +993,7 @@ AudioDiskstream::can_internal_playback_seek (jack_nframes_t distance)
 }
 
 int
-AudioDiskstream::internal_playback_seek (jack_nframes_t distance)
+AudioDiskstream::internal_playback_seek (nframes_t distance)
 {
        ChannelList::iterator chan;
 
@@ -1192,15 +1008,15 @@ AudioDiskstream::internal_playback_seek (jack_nframes_t distance)
 }
 
 int
-AudioDiskstream::read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer, char * workbuf, jack_nframes_t& start, jack_nframes_t cnt, 
+AudioDiskstream::read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer, nframes_t& start, nframes_t cnt, 
                  ChannelInfo& channel_info, int channel, bool reversed)
 {
-       jack_nframes_t this_read = 0;
+       nframes_t this_read = 0;
        bool reloop = false;
-       jack_nframes_t loop_end = 0;
-       jack_nframes_t loop_start = 0;
-       jack_nframes_t loop_length = 0;
-       jack_nframes_t offset = 0;
+       nframes_t loop_end = 0;
+       nframes_t loop_start = 0;
+       nframes_t loop_length = 0;
+       nframes_t offset = 0;
        Location *loc = 0;
 
        if (!reversed) {
@@ -1249,7 +1065,7 @@ AudioDiskstream::read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
 
                this_read = min(cnt,this_read);
 
-               if (_playlist->read (buf+offset, mixdown_buffer, gain_buffer, workbuf, start, this_read, channel) != this_read) {
+               if (audio_playlist()->read (buf+offset, mixdown_buffer, gain_buffer, start, this_read, channel) != this_read) {
                        error << string_compose(_("AudioDiskstream %1: cannot read %2 from playlist at frame %3"), _id, this_read, 
                                         start) << endmsg;
                        return -1;
@@ -1283,20 +1099,34 @@ AudioDiskstream::read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
 }
 
 int
-AudioDiskstream::do_refill (Sample* mixdown_buffer, float* gain_buffer, char * workbuf)
+AudioDiskstream::do_refill_with_alloc()
+{
+       Sample* mix_buf  = new Sample[disk_io_chunk_frames];
+       float*  gain_buf = new float[disk_io_chunk_frames];
+
+       int ret = _do_refill(mix_buf, gain_buf);
+       
+       delete [] mix_buf;
+       delete [] gain_buf;
+
+       return ret;
+}
+
+int
+AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer)
 {
        int32_t ret = 0;
-       jack_nframes_t to_read;
+       nframes_t to_read;
        RingBufferNPT<Sample>::rw_vector vector;
-       bool free_mixdown;
-       bool free_gain;
-       bool free_workbuf;
        bool reversed = (_visible_speed * _session.transport_speed()) < 0.0f;
-       jack_nframes_t total_space;
-       jack_nframes_t zero_fill;
+       nframes_t total_space;
+       nframes_t zero_fill;
        uint32_t chan_n;
        ChannelList::iterator i;
-       jack_nframes_t ts;
+       nframes_t ts;
+
+       assert(mixdown_buffer);
+       assert(gain_buffer);
 
        channels.front().playback_buf->get_write_vector (&vector);
        
@@ -1404,42 +1234,15 @@ AudioDiskstream::do_refill (Sample* mixdown_buffer, float* gain_buffer, char * w
                        zero_fill = 0;
                }
        }
-
-       /* Please note: the code to allocate buffers isn't run
-          during normal butler thread operation. Its there
-          for other times when we need to call do_refill()
-          from somewhere other than the butler thread.
-       */
-
-       if (mixdown_buffer == 0) {
-               mixdown_buffer = new Sample[disk_io_chunk_frames];
-               free_mixdown = true;
-       } else {
-               free_mixdown = false;
-       }
-
-       if (gain_buffer == 0) {
-               gain_buffer = new float[disk_io_chunk_frames];
-               free_gain = true;
-       } else {
-               free_gain = false;
-       }
-
-       if (workbuf == 0) {
-               workbuf = new char[disk_io_chunk_frames * 4];
-               free_workbuf = true;
-       } else {
-               free_workbuf = false;
-       }
        
-       jack_nframes_t file_frame_tmp = 0;
+       nframes_t file_frame_tmp = 0;
 
        for (chan_n = 0, i = channels.begin(); i != channels.end(); ++i, ++chan_n) {
 
                ChannelInfo& chan (*i);
                Sample* buf1;
                Sample* buf2;
-               jack_nframes_t len1, len2;
+               nframes_t len1, len2;
 
                chan.playback_buf->get_write_vector (&vector);
 
@@ -1464,7 +1267,7 @@ AudioDiskstream::do_refill (Sample* mixdown_buffer, float* gain_buffer, char * w
 
                if (to_read) {
 
-                       if (read (buf1, mixdown_buffer, gain_buffer, workbuf, file_frame_tmp, to_read, chan, chan_n, reversed)) {
+                       if (read (buf1, mixdown_buffer, gain_buffer, file_frame_tmp, to_read, chan, chan_n, reversed)) {
                                ret = -1;
                                goto out;
                        }
@@ -1482,7 +1285,7 @@ AudioDiskstream::do_refill (Sample* mixdown_buffer, float* gain_buffer, char * w
                           so read some or all of vector.len[1] as well.
                        */
 
-                       if (read (buf2, mixdown_buffer, gain_buffer, workbuf, file_frame_tmp, to_read, chan, chan_n, reversed)) {
+                       if (read (buf2, mixdown_buffer, gain_buffer, file_frame_tmp, to_read, chan, chan_n, reversed)) {
                                ret = -1;
                                goto out;
                        }
@@ -1499,37 +1302,28 @@ AudioDiskstream::do_refill (Sample* mixdown_buffer, float* gain_buffer, char * w
        file_frame = file_frame_tmp;
 
   out:
-       if (free_mixdown) {
-               delete [] mixdown_buffer;
-       }
-       if (free_gain) {
-               delete [] gain_buffer;
-       }
-       if (free_workbuf) {
-               delete [] workbuf;
-       }
 
        return ret;
 }      
 
+/** Flush pending data to disk.
+ *
+ * Important note: this function will write *AT MOST* disk_io_chunk_frames
+ * of data to disk. it will never write more than that.  If it writes that
+ * much and there is more than that waiting to be written, it will return 1,
+ * otherwise 0 on success or -1 on failure.
+ * 
+ * If there is less than disk_io_chunk_frames to be written, no data will be
+ * written at all unless @a force_flush is true.
+ */
 int
-AudioDiskstream::do_flush (char * workbuf, bool force_flush)
+AudioDiskstream::do_flush (Session::RunContext context, bool force_flush)
 {
        uint32_t to_write;
        int32_t ret = 0;
        RingBufferNPT<Sample>::rw_vector vector;
        RingBufferNPT<CaptureTransition>::rw_vector transvec;
-       jack_nframes_t total;
-       
-       /* important note: this function will write *AT MOST* 
-          disk_io_chunk_frames of data to disk. it will never 
-          write more than that. if its writes that much and there 
-          is more than that waiting to be written, it will return 1,
-          otherwise 0 on success or -1 on failure.
-
-          if there is less than disk_io_chunk_frames to be written, 
-          no data will be written at all unless `force_flush' is true.  
-       */
+       nframes_t total;
 
        _write_data_count = 0;
 
@@ -1544,7 +1338,6 @@ AudioDiskstream::do_flush (char * workbuf, bool force_flush)
                        goto out;
                }
 
-               
                /* if there are 2+ chunks of disk i/o possible for
                   this track, let the caller know so that it can arrange
                   for us to be called again, ASAP.
@@ -1560,8 +1353,7 @@ AudioDiskstream::do_flush (char * workbuf, bool force_flush)
                        ret = 1;
                } 
 
-               to_write = min (disk_io_chunk_frames, (jack_nframes_t) vector.len[0]);
-               
+               to_write = min (disk_io_chunk_frames, (nframes_t) vector.len[0]);
                
                // check the transition buffer when recording destructive
                // important that we get this after the capture buf
@@ -1616,7 +1408,7 @@ AudioDiskstream::do_flush (char * workbuf, bool force_flush)
                        }
                }
 
-               if ((!(*chan).write_source) || (*chan).write_source->write (vector.buf[0], to_write, workbuf) != to_write) {
+               if ((!(*chan).write_source) || (*chan).write_source->write (vector.buf[0], to_write) != to_write) {
                        error << string_compose(_("AudioDiskstream %1: cannot write to disk"), _id) << endmsg;
                        return -1;
                }
@@ -1631,9 +1423,9 @@ AudioDiskstream::do_flush (char * workbuf, bool force_flush)
                           of vector.len[1] to be flushed to disk as well.
                        */
                
-                       to_write = min ((jack_nframes_t)(disk_io_chunk_frames - to_write), (jack_nframes_t) vector.len[1]);
+                       to_write = min ((nframes_t)(disk_io_chunk_frames - to_write), (nframes_t) vector.len[1]);
                
-                       if ((*chan).write_source->write (vector.buf[1], to_write, workbuf) != to_write) {
+                       if ((*chan).write_source->write (vector.buf[1], to_write) != to_write) {
                                error << string_compose(_("AudioDiskstream %1: cannot write to disk"), _id) << endmsg;
                                return -1;
                        }
@@ -1649,35 +1441,19 @@ AudioDiskstream::do_flush (char * workbuf, bool force_flush)
        return ret;
 }
 
-void
-AudioDiskstream::playlist_changed (Change ignored)
-{
-       playlist_modified ();
-}
-
-void
-AudioDiskstream::playlist_modified ()
-{
-       if (!i_am_the_modifier && !overwrite_queued) {
-               _session.request_overwrite_buffer (this);
-               overwrite_queued = true;
-       } 
-}
-
 void
 AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_capture)
 {
        uint32_t buffer_position;
        bool more_work = true;
        int err = 0;
-       AudioRegion* region = 0;
-       jack_nframes_t total_capture;
-       AudioRegion::SourceList srcs;
-       AudioRegion::SourceList::iterator src;
+       boost::shared_ptr<AudioRegion> region;
+       nframes_t total_capture;
+       SourceList srcs;
+       SourceList::iterator src;
        ChannelList::iterator chan;
        vector<CaptureInfo*>::iterator ci;
        uint32_t n = 0; 
-       list<AudioFileSource*>* deletion_list;
        bool mark_write_completed = false;
 
        finish_capture (true);
@@ -1687,7 +1463,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
        */
 
        while (more_work && !err) {
-               switch (do_flush ( _session.conversion_buffer(Session::TransportContext), true)) {
+               switch (do_flush (Session::TransportContext, true)) {
                case 0:
                        more_work = false;
                        break;
@@ -1710,18 +1486,17 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                
                ChannelList::iterator chan;
                
-               deletion_list = new list<AudioFileSource*>;
+               list<boost::shared_ptr<Source> >* deletion_list = new list<boost::shared_ptr<Source> >;
 
                for ( chan = channels.begin(); chan != channels.end(); ++chan) {
 
                        if ((*chan).write_source) {
                                
                                (*chan).write_source->mark_for_remove ();
-                               (*chan).write_source->release ();
                                
                                deletion_list->push_back ((*chan).write_source);
 
-                               (*chan).write_source = 0;
+                               (*chan).write_source.reset ();
                        }
                        
                        /* new source set up in "out" below */
@@ -1744,18 +1519,11 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
 
        for (n = 0, chan = channels.begin(); chan != channels.end(); ++chan, ++n) {
 
-               AudioFileSource* s = (*chan).write_source;
+               boost::shared_ptr<AudioFileSource> s = (*chan).write_source;
                
                if (s) {
-
-                       AudioFileSource* fsrc;
-
                        srcs.push_back (s);
-
-                       if ((fsrc = dynamic_cast<AudioFileSource *>(s)) != 0) {
-                               fsrc->update_header (capture_info.front()->start, when, twhen);
-                       }
-
+                       s->update_header (capture_info.front()->start, when, twhen);
                        s->set_captured_for (_name);
                        
                }
@@ -1782,10 +1550,11 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                */
                
                try {
-                       region = new AudioRegion (srcs, channels[0].write_source->last_capture_start_frame(), total_capture, 
-                                                 region_name_from_path (channels[0].write_source->name()), 
-                                                 0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile));
-                       
+                       boost::shared_ptr<Region> rx (RegionFactory::create (srcs, channels[0].write_source->last_capture_start_frame(), total_capture, 
+                                                                            region_name_from_path (channels[0].write_source->name()), 
+                                                                            0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile)));
+
+                       region = boost::dynamic_pointer_cast<AudioRegion> (rx);
                        region->special_set_position (capture_info.front()->start);
                }
                
@@ -1799,7 +1568,7 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
 
                // cerr << _name << ": there are " << capture_info.size() << " capture_info records\n";
                
-               _session.add_undo (_playlist->get_memento());
+                XMLNode &before = _playlist->get_state();
                _playlist->freeze ();
                
                for (buffer_position = channels[0].write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
@@ -1807,10 +1576,11 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                        string region_name;
                        _session.region_name (region_name, channels[0].write_source->name(), false);
                        
-                       // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n";
+                       // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add region " << region_name << endl;
                        
                        try {
-                               region = new AudioRegion (srcs, buffer_position, (*ci)->frames, region_name);
+                               boost::shared_ptr<Region> rx (RegionFactory::create (srcs, buffer_position, (*ci)->frames, region_name));
+                               region = boost::dynamic_pointer_cast<AudioRegion> (rx);
                        }
                        
                        catch (failed_constructor& err) {
@@ -1823,14 +1593,15 @@ AudioDiskstream::transport_stopped (struct tm& when, time_t twhen, bool abort_ca
                        // cerr << "add new region, buffer position = " << buffer_position << " @ " << (*ci)->start << endl;
                        
                        i_am_the_modifier++;
-                       _playlist->add_region (*region, (*ci)->start);
+                       _playlist->add_region (region, (*ci)->start);
                        i_am_the_modifier--;
                        
                        buffer_position += (*ci)->frames;
                }
 
                _playlist->thaw ();
-               _session.add_redo_no_execute (_playlist->get_memento());
+                XMLNode &after = _playlist->get_state();
+               _session.add_command (new MementoCommand<Playlist>(*_playlist, &before, &after));
        }
 
        mark_write_completed = true;
@@ -1896,17 +1667,17 @@ AudioDiskstream::finish_capture (bool rec_monitors_input)
 }
 
 void
-AudioDiskstream::set_record_enabled (bool yn, void* src)
+AudioDiskstream::set_record_enabled (bool yn)
 {
-        bool rolling = _session.transport_speed() != 0.0f;
-
        if (!recordable() || !_session.record_enabling_legal()) {
                return;
        }
-       
-       /* if we're turning on rec-enable, there needs to be an
-          input connection.
-        */
+
+       /* can't rec-enable in destructive mode if transport is before start */
+
+       if (destructive() && yn && _session.transport_frame() < _session.current_start_frame()) {
+               return;
+       }
 
        if (yn && channels[0].source == 0) {
 
@@ -1923,42 +1694,57 @@ AudioDiskstream::set_record_enabled (bool yn, void* src)
 
        if (record_enabled() != yn) {
                if (yn) {
-                       g_atomic_int_set (&_record_enabled, 1);
-                       capturing_sources.clear ();
-                       if (Config->get_use_hardware_monitoring())  {
-                               for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
-                                       if ((*chan).source) {
-                                               (*chan).source->request_monitor_input (!(_session.get_auto_input() && rolling));
-                                       }
-                                       capturing_sources.push_back ((*chan).write_source);
-                               }
-                       } else {
-                               for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
-                                       capturing_sources.push_back ((*chan).write_source);
-                               }
-                       }
-
+                       engage_record_enable ();
                } else {
-                       g_atomic_int_set (&_record_enabled, 0);
-                       if (Config->get_use_hardware_monitoring()) {
-                               for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
-                                       if ((*chan).source) {
-                                               (*chan).source->request_monitor_input (false);
-                                       }
-                               }
+                       disengage_record_enable ();
+               }
+       }
+}
+
+void
+AudioDiskstream::engage_record_enable ()
+{
+    bool rolling = _session.transport_speed() != 0.0f;
+
+       g_atomic_int_set (&_record_enabled, 1);
+       capturing_sources.clear ();
+       if (Config->get_monitoring_model() == HardwareMonitoring) {
+               for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
+                       if ((*chan).source) {
+                               (*chan).source->ensure_monitor_input (!(Config->get_auto_input() && rolling));
                        }
-                       capturing_sources.clear ();
+                       capturing_sources.push_back ((*chan).write_source);
                }
+       } else {
+               for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
+                       capturing_sources.push_back ((*chan).write_source);
+               }
+       }
 
-               record_enable_changed (src); /* EMIT SIGNAL */
+       RecordEnableChanged (); /* EMIT SIGNAL */
+}
+
+void
+AudioDiskstream::disengage_record_enable ()
+{
+       g_atomic_int_set (&_record_enabled, 0);
+       if (Config->get_monitoring_model() == HardwareMonitoring) {
+               for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
+                       if ((*chan).source) {
+                               (*chan).source->ensure_monitor_input (false);
+                       }
+               }
        }
+       capturing_sources.clear ();
+       RecordEnableChanged (); /* EMIT SIGNAL */
 }
+               
 
 XMLNode&
 AudioDiskstream::get_state ()
 {
        XMLNode* node = new XMLNode ("AudioDiskstream");
-       char buf[64];
+       char buf[64] = "";
        LocaleGuard lg (X_("POSIX"));
 
        snprintf (buf, sizeof(buf), "0x%x", _flags);
@@ -1973,7 +1759,7 @@ AudioDiskstream::get_state ()
        node->add_property ("speed", buf);
 
        node->add_property("name", _name);
-       snprintf (buf, sizeof(buf), "%" PRIu64, id());
+       id().print (buf);
        node->add_property("id", buf);
 
        if (!capturing_sources.empty() && _session.get_record_enabled()) {
@@ -1981,7 +1767,7 @@ AudioDiskstream::get_state ()
                XMLNode* cs_child = new XMLNode (X_("CapturingSources"));
                XMLNode* cs_grandchild;
 
-               for (vector<AudioFileSource*>::iterator i = capturing_sources.begin(); i != capturing_sources.end(); ++i) {
+               for (vector<boost::shared_ptr<AudioFileSource> >::iterator i = capturing_sources.begin(); i != capturing_sources.end(); ++i) {
                        cs_grandchild = new XMLNode (X_("file"));
                        cs_grandchild->add_property (X_("path"), (*i)->path());
                        cs_child->add_child_nocopy (*cs_grandchild);
@@ -1991,7 +1777,7 @@ AudioDiskstream::get_state ()
 
                Location* pi;
 
-               if (_session.get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) {
+               if (Config->get_punch_in() && ((pi = _session.locations()->auto_punch_location()) != 0)) {
                        snprintf (buf, sizeof (buf), "%" PRIu32, pi->start());
                } else {
                        snprintf (buf, sizeof (buf), "%" PRIu32, _session.transport_frame());
@@ -2040,11 +1826,11 @@ AudioDiskstream::set_state (const XMLNode& node)
 
        if (deprecated_io_node) {
                if ((prop = deprecated_io_node->property ("id")) != 0) {
-                       sscanf (prop->value().c_str(), "%" PRIu64, &_id);
+                       _id = prop->value ();
                }
        } else {
                if ((prop = node.property ("id")) != 0) {
-                       sscanf (prop->value().c_str(), "%" PRIu64, &_id);
+                       _id = prop->value ();
                }
        }
 
@@ -2057,8 +1843,7 @@ AudioDiskstream::set_state (const XMLNode& node)
        }
        
        // create necessary extra channels
-       // we are always constructed with one
-       // and we always need one
+       // we are always constructed with one and we always need one
 
        if (nchans > _n_channels) {
 
@@ -2149,13 +1934,11 @@ AudioDiskstream::use_new_write_source (uint32_t n)
        
        if (chan.write_source) {
 
-               if (AudioFileSource::is_empty (chan.write_source->path())) {
+               if (AudioFileSource::is_empty (_session, chan.write_source->path())) {
                        chan.write_source->mark_for_remove ();
-                       chan.write_source->release();
-                       delete chan.write_source;
+                       chan.write_source.reset ();
                } else {
-                       chan.write_source->release();
-                       chan.write_source = 0;
+                       chan.write_source.reset ();
                }
        }
 
@@ -2167,12 +1950,10 @@ AudioDiskstream::use_new_write_source (uint32_t n)
 
        catch (failed_constructor &err) {
                error << string_compose (_("%1:%2 new capture file not initialized correctly"), _name, n) << endmsg;
-               chan.write_source = 0;
+               chan.write_source.reset ();
                return -1;
        }
 
-       chan.write_source->use ();
-
        /* do not remove destructive files even if they are empty */
 
        chan.write_source->set_allow_remove_if_empty (!destructive());
@@ -2186,6 +1967,8 @@ AudioDiskstream::reset_write_sources (bool mark_write_complete, bool force)
        ChannelList::iterator chan;
        uint32_t n;
 
+       cerr << _name << " RWS\n";
+
        if (!recordable()) {
                return;
        }
@@ -2240,7 +2023,7 @@ AudioDiskstream::rename_write_sources ()
 }
 
 void
-AudioDiskstream::set_block_size (jack_nframes_t nframes)
+AudioDiskstream::set_block_size (nframes_t nframes)
 {
        if (_session.get_block_size() > speed_buffer_size) {
                speed_buffer_size = _session.get_block_size();
@@ -2262,7 +2045,7 @@ AudioDiskstream::allocate_temporary_buffers ()
        */
 
        double sp = max (fabsf (_actual_speed), 1.2f);
-       jack_nframes_t required_wrap_size = (jack_nframes_t) floor (_session.get_block_size() * sp) + 1;
+       nframes_t required_wrap_size = (nframes_t) floor (_session.get_block_size() * sp) + 1;
 
        if (required_wrap_size > wrap_buffer_size) {
 
@@ -2283,28 +2066,11 @@ AudioDiskstream::monitor_input (bool yn)
        for (ChannelList::iterator chan = channels.begin(); chan != channels.end(); ++chan) {
                
                if ((*chan).source) {
-                       (*chan).source->request_monitor_input (yn);
+                       (*chan).source->ensure_monitor_input (yn);
                }
        }
 }
 
-void
-AudioDiskstream::set_capture_offset ()
-{
-       if (_io == 0) {
-               /* can't capture, so forget it */
-               return;
-       }
-
-       _capture_offset = _io->input_latency();
-}
-
-void
-AudioDiskstream::set_persistent_align_style (AlignStyle a)
-{
-       _persistent_alignment_style = a;
-}
-
 void
 AudioDiskstream::set_align_style_from_io ()
 {
@@ -2330,20 +2096,6 @@ AudioDiskstream::set_align_style_from_io ()
        }
 }
 
-void
-AudioDiskstream::set_align_style (AlignStyle a)
-{
-       if (record_enabled() && _session.actively_recording()) {
-               return;
-       }
-
-
-       if (a != _alignment_style) {
-               _alignment_style = a;
-               AlignmentStyleChanged ();
-       }
-}
-
 int
 AudioDiskstream::add_channel ()
 {
@@ -2394,68 +2146,16 @@ AudioDiskstream::capture_buffer_load () const
                        (double) channels.front().capture_buf->bufsize());
 }
 
-int
-AudioDiskstream::set_loop (Location *location)
-{
-       if (location) {
-               if (location->start() >= location->end()) {
-                       error << string_compose(_("Location \"%1\" not valid for track loop (start >= end)"), location->name()) << endl;
-                       return -1;
-               }
-       }
-
-       loop_location = location;
-
-        LoopSet (location); /* EMIT SIGNAL */
-       return 0;
-}
-
-jack_nframes_t
-AudioDiskstream::get_capture_start_frame (uint32_t n)
-{
-       Glib::Mutex::Lock lm (capture_info_lock);
-
-       if (capture_info.size() > n) {
-               return capture_info[n]->start;
-       }
-       else {
-               return capture_start_frame;
-       }
-}
-
-jack_nframes_t
-AudioDiskstream::get_captured_frames (uint32_t n)
-{
-       Glib::Mutex::Lock lm (capture_info_lock);
-
-       if (capture_info.size() > n) {
-               return capture_info[n]->frames;
-       }
-       else {
-               return capture_captured;
-       }
-}
-
-void
-AudioDiskstream::punch_in ()
-{
-}
-
-void
-AudioDiskstream::punch_out ()
-{
-}
-
 int
 AudioDiskstream::use_pending_capture_data (XMLNode& node)
 {
        const XMLProperty* prop;
        XMLNodeList nlist = node.children();
        XMLNodeIterator niter;
-       AudioFileSource* fs;
-       AudioFileSource* first_fs = 0;
-       AudioRegion::SourceList pending_sources;
-       jack_nframes_t position;
+       boost::shared_ptr<AudioFileSource> fs;
+       boost::shared_ptr<AudioFileSource> first_fs;
+       SourceList pending_sources;
+       nframes_t position;
 
        if ((prop = node.property (X_("at"))) == 0) {
                return -1;
@@ -2473,10 +2173,7 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
                        }
 
                        try {
-                               fs = new SndFileSource (prop->value(), 
-                                                       Config->get_native_file_data_format(),
-                                                       Config->get_native_file_header_format(),
-                                                       _session.frame_rate());
+                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (_session, prop->value(), false, _session.frame_rate()));
                        }
 
                        catch (failed_constructor& err) {
@@ -2507,13 +2204,12 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
                return -1;
        }
 
-       AudioRegion* region;
+       boost::shared_ptr<AudioRegion> region;
        
        try {
-               region = new AudioRegion (pending_sources, 0, first_fs->length(),
-                                         region_name_from_path (first_fs->name()), 
-                                         0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile));
-               
+               region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (pending_sources, 0, first_fs->length(),
+                                                                                         region_name_from_path (first_fs->name()), 
+                                                                                         0, AudioRegion::Flag (AudioRegion::DefaultFlags|AudioRegion::Automatic|AudioRegion::WholeFile)));
                region->special_set_position (0);
        }
 
@@ -2526,7 +2222,7 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
        }
 
        try {
-               region = new AudioRegion (pending_sources, 0, first_fs->length(), region_name_from_path (first_fs->name()));
+               region = boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (pending_sources, 0, first_fs->length(), region_name_from_path (first_fs->name())));
        }
 
        catch (failed_constructor& err) {
@@ -2537,26 +2233,7 @@ AudioDiskstream::use_pending_capture_data (XMLNode& node)
                return -1;
        }
 
-       _playlist->add_region (*region, position);
+       _playlist->add_region (region, position);
 
        return 0;
 }
-
-void
-AudioDiskstream::set_roll_delay (jack_nframes_t nframes)
-{
-       _roll_delay = nframes;
-}
-
-void
-AudioDiskstream::set_destructive (bool yn)
-{
-       if (yn != destructive()) {
-               reset_write_sources (true, true);
-               if (yn) {
-                       _flags |= Destructive;
-               } else {
-                       _flags &= ~Destructive;
-               }
-       }
-}