remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths...
[ardour.git] / libs / ardour / audio_track.cc
index 8e68eb014077c22e9045144c5a27962dfbc228fa..fcc6da2ad07a6f6c8e889fcd66ff896ef6b57aeb 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002 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
 
 */
 
-#include <sigc++/retype.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/bind.h>
+#include <boost/scoped_array.hpp>
 
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
+#include "pbd/boost_debug.h"
 
 #include "evoral/Curve.hpp"
 
@@ -44,6 +43,9 @@
 #include "ardour/route_group_specialized.h"
 #include "ardour/session.h"
 #include "ardour/utils.h"
+#include "ardour/session_playlists.h"
+#include "ardour/delivery.h"
+#include "ardour/meter.h"
 #include "i18n.h"
 
 using namespace std;
@@ -53,13 +55,6 @@ using namespace PBD;
 AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode mode)
        : Track (sess, name, flag, mode)
 {
-       use_new_diskstream ();
-}
-
-AudioTrack::AudioTrack (Session& sess, const XMLNode& node)
-       : Track (sess, node)
-{
-       _set_state (node, false);
 }
 
 AudioTrack::~AudioTrack ()
@@ -82,13 +77,44 @@ AudioTrack::use_new_diskstream ()
        } else if (_mode == NonLayered){
                dflags = AudioDiskstream::Flag(dflags | AudioDiskstream::NonLayered);
        }
-    
 
-       boost::shared_ptr<AudioDiskstream> ds (new AudioDiskstream (_session, name(), dflags));
-       
-       _session.add_diskstream (ds);
+       AudioDiskstream* dsp (new AudioDiskstream (_session, name(), dflags));
+       boost::shared_ptr<AudioDiskstream> ds (dsp);
+
+       ds->do_refill_with_alloc ();
+       ds->set_block_size (_session.get_block_size ());
+
+       set_diskstream (ds);
+}
+
+void
+AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
+{
+       Track::set_diskstream (ds);
+
+        _diskstream->set_track (this);
+       _diskstream->set_destructive (_mode == Destructive);
+       _diskstream->set_non_layered (_mode == NonLayered);
+
+       if (audio_diskstream()->deprecated_io_node) {
+
+               if (!IO::connecting_legal) {
+                       IO::ConnectingLegal.connect_same_thread (*this, boost::bind (&AudioTrack::deprecated_use_diskstream_connections, this));
+               } else {
+                       deprecated_use_diskstream_connections ();
+               }
+       }
+
+       _diskstream->set_record_enabled (false);
+       _diskstream->monitor_input (false);
+
+       DiskstreamChanged (); /* EMIT SIGNAL */
+}
 
-       set_diskstream (boost::dynamic_pointer_cast<AudioDiskstream> (ds), this);
+boost::shared_ptr<AudioDiskstream>
+AudioTrack::audio_diskstream() const
+{
+       return boost::dynamic_pointer_cast<AudioDiskstream>(_diskstream);
 }
 
 int
@@ -99,10 +125,10 @@ AudioTrack::set_mode (TrackMode m)
                if (_diskstream->set_destructive (m == Destructive)) {
                        return -1;
                }
-               
+
                _diskstream->set_non_layered (m == NonLayered);
                _mode = m;
-               
+
                TrackModeChanged (); /* EMIT SIGNAL */
        }
 
@@ -117,7 +143,7 @@ AudioTrack::can_use_mode (TrackMode m, bool& bounce_required)
        case Normal:
                bounce_required = false;
                return true;
-               
+
        case Destructive:
        default:
                return _diskstream->can_become_destructive (bounce_required);
@@ -146,16 +172,16 @@ AudioTrack::deprecated_use_diskstream_connections ()
 
        if ((prop = node.property ("input-connection")) != 0) {
                boost::shared_ptr<Bundle> c = _session.bundle_by_name (prop->value());
-               
+
                if (c == 0) {
-                       error << string_compose(_("Unknown bundle \"%1\" listed for input of %2"), prop->value(), _name) << endmsg;
-                       
+                       error << string_compose(_("Unknown bundle \"%1\" listed for input of %2"), prop->value(), _name) << endmsg;
+
                        if ((c = _session.bundle_by_name (_("in 1"))) == 0) {
-                               error << _("No input bundles available as a replacement")
+                               error << _("No input bundles available as a replacement")
                                << endmsg;
                                return -1;
                        } else {
-                               info << string_compose (_("Bundle %1 was not available - \"in 1\" used instead"), prop->value())
+                               info << string_compose (_("Bundle %1 was not available - \"in 1\" used instead"), prop->value())
                               << endmsg;
                        }
                }
@@ -164,88 +190,28 @@ AudioTrack::deprecated_use_diskstream_connections ()
 
        } else if ((prop = node.property ("inputs")) != 0) {
                if (_input->set_ports (prop->value())) {
-                       error << string_compose(_("improper input channel list in XML node (%1)"), prop->value()) << endmsg;
+                       error << string_compose(_("improper input channel list in XML node (%1)"), prop->value()) << endmsg;
                        return -1;
                }
        }
-       
-       return 0;
-}
-
-int
-AudioTrack::set_diskstream (boost::shared_ptr<AudioDiskstream> ds, void * /*src*/)
-{
-       _diskstream = ds;
-       _diskstream->set_route (*this);
-       _diskstream->set_destructive (_mode == Destructive);
-       _diskstream->set_non_layered (_mode == NonLayered);
-
-       if (audio_diskstream()->deprecated_io_node) {
-
-               if (!IO::connecting_legal) {
-                       IO::ConnectingLegal.connect (mem_fun (*this, &AudioTrack::deprecated_use_diskstream_connections));
-               } else {
-                       deprecated_use_diskstream_connections ();
-               }
-       }
-
-       _diskstream->set_record_enabled (false);
-       _diskstream->monitor_input (false);
-
-       ic_connection.disconnect();
-       ic_connection = _input->changed.connect (mem_fun (*_diskstream, &Diskstream::handle_input_change));
-
-       DiskstreamChanged (); /* EMIT SIGNAL */
 
        return 0;
-}      
-
-int 
-AudioTrack::use_diskstream (string name)
-{
-       boost::shared_ptr<AudioDiskstream> dstream;
-
-       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);
-}
-
-int 
-AudioTrack::use_diskstream (const PBD::ID& id)
-{
-       boost::shared_ptr<AudioDiskstream> dstream;
-
-       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);
-}
-
-boost::shared_ptr<AudioDiskstream>
-AudioTrack::audio_diskstream() const
-{
-       return boost::dynamic_pointer_cast<AudioDiskstream>(_diskstream);
 }
 
 int
-AudioTrack::set_state (const XMLNode& node)
+AudioTrack::set_state (const XMLNode& node, int version)
 {
-       return _set_state (node, true);
+       return _set_state (node, version, true);
 }
 
 int
-AudioTrack::_set_state (const XMLNode& node, bool call_base)
+AudioTrack::_set_state (const XMLNode& node, int version, bool call_base)
 {
        const XMLProperty *prop;
        XMLNodeConstIterator iter;
 
        if (call_base) {
-               if (Route::_set_state (node, call_base)) {
+               if (Route::_set_state (node, version, call_base)) {
                        return -1;
                }
        }
@@ -256,41 +222,6 @@ AudioTrack::_set_state (const XMLNode& node, bool call_base)
                _mode = Normal;
        }
 
-       if ((prop = node.property ("diskstream-id")) == 0) {
-               
-               /* some old sessions use the diskstream name rather than the ID */
-
-               if ((prop = node.property ("diskstream")) == 0) {
-                       fatal << _("programming error: AudioTrack given state without diskstream!") << endmsg;
-                       /*NOTREACHED*/
-                       return -1;
-               }
-
-               if (use_diskstream (prop->value())) {
-                       return -1;
-               }
-
-       } else {
-               
-               PBD::ID id (prop->value());
-               PBD::ID zero ("0");
-               
-               /* this wierd hack is used when creating tracks from a template. there isn't
-                  a particularly good time to interpose between setting the first part of
-                  the track state (notably Route::set_state() and the track mode), and the
-                  second part (diskstream stuff). So, we have a special ID for the diskstream
-                  that means "you should create a new diskstream here, not look for
-                  an old one.
-               */
-               
-               if (id == zero) {
-                       use_new_diskstream ();
-               } else if (use_diskstream (id)) {
-                       return -1;
-               }
-       }
-
-
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
        XMLNode *child;
@@ -300,15 +231,23 @@ AudioTrack::_set_state (const XMLNode& node, bool call_base)
                child = *niter;
 
                if (child->name() == X_("recenable")) {
-                       _rec_enable_control->set_state (*child);
+                       _rec_enable_control->set_state (*child, version);
                        _session.add_controllable (_rec_enable_control);
                }
        }
 
+       if (version >= 3000) {
+               if ((child = find_named_node (node, X_("Diskstream"))) != 0) {
+                       boost::shared_ptr<AudioDiskstream> ds (new AudioDiskstream (_session, *child));
+                       ds->do_refill_with_alloc ();
+                       set_diskstream (ds);
+               }
+       }
+
        pending_state = const_cast<XMLNode*> (&node);
 
        if (_session.state_of_the_state() & Session::Loading) {
-               _session.StateReady.connect (mem_fun (*this, &AudioTrack::set_state_part_two));
+               _session.StateReady.connect_same_thread (*this, boost::bind (&AudioTrack::set_state_part_two, this));
        } else {
                set_state_part_two ();
        }
@@ -316,8 +255,8 @@ AudioTrack::_set_state (const XMLNode& node, bool call_base)
        return 0;
 }
 
-XMLNode& 
-AudioTrack::state(bool full_state)
+XMLNode&
+AudioTrack::state (bool full_state)
 {
        XMLNode& root (Route::state(full_state));
        XMLNode* freeze_node;
@@ -335,32 +274,16 @@ AudioTrack::state(bool full_state)
                        (*i)->id.print (buf, sizeof (buf));
                        inode->add_property (X_("id"), buf);
                        inode->add_child_copy ((*i)->state);
-               
+
                        freeze_node->add_child_nocopy (*inode);
                }
 
                root.add_child_nocopy (*freeze_node);
        }
 
-       /* Alignment: act as a proxy for the diskstream */
-       
-       XMLNode* align_node = new XMLNode (X_("Alignment"));
-       AlignStyle as = _diskstream->alignment_style ();
-       align_node->add_property (X_("style"), enum_2_string (as));
-       root.add_child_nocopy (*align_node);
-
        root.add_property (X_("mode"), enum_2_string (_mode));
-
-       /* we don't return diskstream state because we don't
-          own the diskstream exclusively. control of the diskstream
-          state is ceded to the Session, even if we create the
-          diskstream.
-       */
-
-       _diskstream->id().print (buf, sizeof (buf));
-       root.add_property ("diskstream-id", buf);
-
        root.add_child_nocopy (_rec_enable_control->get_state());
+       root.add_child_nocopy (_diskstream->get_state ());
 
        return root;
 }
@@ -383,14 +306,14 @@ AudioTrack::set_state_part_two ()
        if ((fnode = find_named_node (*pending_state, X_("freeze-info"))) != 0) {
 
                _freeze_record.state = Frozen;
-               
+
                for (vector<FreezeRecordProcessorInfo*>::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) {
                        delete *i;
                }
                _freeze_record.processor_info.clear ();
-               
+
                if ((prop = fnode->property (X_("playlist"))) != 0) {
-                       boost::shared_ptr<Playlist> pl = _session.playlist_by_name (prop->value());
+                       boost::shared_ptr<Playlist> pl = _session.playlists->by_name (prop->value());
                        if (pl) {
                                _freeze_record.playlist = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
                        } else {
@@ -399,81 +322,54 @@ AudioTrack::set_state_part_two ()
                        return;
                        }
                }
-               
+
                if ((prop = fnode->property (X_("state"))) != 0) {
                        _freeze_record.state = FreezeState (string_2_enum (prop->value(), _freeze_record.state));
                }
-               
+
                XMLNodeConstIterator citer;
                XMLNodeList clist = fnode->children();
-               
+
                for (citer = clist.begin(); citer != clist.end(); ++citer) {
                        if ((*citer)->name() != X_("processor")) {
                                continue;
                        }
-                       
+
                        if ((prop = (*citer)->property (X_("id"))) == 0) {
                                continue;
                        }
-                       
+
                        FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()),
                                                                                   boost::shared_ptr<Processor>());
                        frii->id = prop->value ();
                        _freeze_record.processor_info.push_back (frii);
                }
        }
-
-       /* Alignment: act as a proxy for the diskstream */
-
-       if ((fnode = find_named_node (*pending_state, X_("Alignment"))) != 0) {
-
-               if ((prop = fnode->property (X_("style"))) != 0) {
-
-                       /* fix for older sessions from before EnumWriter */
-
-                       string pstr;
-
-                       if (prop->value() == "capture") {
-                               pstr = "CaptureTime";
-                       } else if (prop->value() == "existing") {
-                               pstr = "ExistingMaterial";
-                       } else {
-                               pstr = prop->value();
-                       }
-
-                       AlignStyle as = AlignStyle (string_2_enum (pstr, as));
-                       _diskstream->set_persistent_align_style (as);
-               }
-       }
-       return;
-}      
+}
 
 int
 AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, int declick,
-                 bool can_record, bool rec_monitors_input)
+                 bool can_record, bool rec_monitors_input, bool& need_butler)
 {
+       Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
+       if (!lm.locked()) {
+               return 0;
+       }
+
        int dret;
        Sample* b;
        Sample* tmpb;
        nframes_t transport_frame;
        boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
-       
-       {
-               Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
-               if (lm.locked()) {
-                       // automation snapshot can also be called from the non-rt context
-                       // and it uses the redirect list, so we take the lock out here
-                       automation_snapshot (start_frame, false);
-               }
-       }
+        
+       automation_snapshot (start_frame, false);
 
-       
        if (n_outputs().n_total() == 0 && _processors.empty()) {
                return 0;
        }
 
        if (!_active) {
-               silence (nframes);
+                silence (nframes);
                return 0;
        }
 
@@ -485,19 +381,19 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                   playback distance to zero, thus causing diskstream::commit
                   to do nothing.
                */
-               return diskstream->process (transport_frame, 0, can_record, rec_monitors_input);
-       } 
+               return diskstream->process (transport_frame, 0, can_record, rec_monitors_input, need_butler);
+       }
 
        _silent = false;
        _amp->apply_gain_automation(false);
 
-       if ((dret = diskstream->process (transport_frame, nframes, can_record, rec_monitors_input)) != 0) {
+       if ((dret = diskstream->process (transport_frame, nframes, can_record, rec_monitors_input, need_butler)) != 0) {
                silence (nframes);
                return dret;
        }
 
        /* special condition applies */
-       
+
        if (_meter_point == MeterInput) {
                _input->process_input (_meter, start_frame, end_frame, nframes);
        }
@@ -520,10 +416,10 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                  while in the process() tree.
                */
 
-               
+
                /* copy the diskstream data to all output buffers */
 
-               size_t limit = n_process_buffers().n_audio();
+               size_t limit = input_streams ().n_audio();
                BufferSet& bufs = _session.get_scratch_buffers ();
                const size_t blimit = bufs.count().n_audio();
 
@@ -536,19 +432,19 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                           but loaded with an 8 channel file. there are only
                           2 passthrough buffers, but n_process_buffers() will
                           return 8.
-                          
+
                           arbitrary decision: map all channels in the diskstream
                           to the outputs available.
                        */
 
                        float scaling = limit/blimit;
-                       
+
                        for (i = 0, n = 1; i < blimit; ++i, ++n) {
 
-                               /* first time through just copy a channel into 
+                               /* first time through just copy a channel into
                                   the output buffer.
                                */
-                               
+
                                Sample* bb = bufs.get_audio (i).data();
 
                                for (nframes_t xx = 0; xx < nframes; ++xx) {
@@ -564,27 +460,27 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                        }
 
                        for (;i < limit; ++i, ++n) {
-                               
+
                                /* for all remaining channels, sum with existing
-                                  data in the output buffers 
+                                  data in the output buffers
                                */
-                               
+
                                bufs.get_audio (i%blimit).accumulate_with_gain_from (b, nframes, 0, scaling);
-                               
+
                                if (n < diskstream->n_channels().n_audio()) {
                                        tmpb = diskstream->playback_buffer(n);
                                        if (tmpb!=0) {
                                                b = tmpb;
                                        }
                                }
-                               
+
                        }
 
                        limit = blimit;
 
                } else {
                        for (i = 0, n = 1; i < limit; ++i, ++n) {
-                               memcpy (bufs.get_audio (i).data(), b, sizeof (Sample) * nframes); 
+                               memcpy (bufs.get_audio (i).data(), b, sizeof (Sample) * nframes);
                                if (n < diskstream->n_channels().n_audio()) {
                                        tmpb = diskstream->playback_buffer(n);
                                        if (tmpb!=0) {
@@ -594,7 +490,7 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                        }
 
                        /* try to leave any MIDI buffers alone */
-                       
+
                        ChanCount chn;
                        chn.set_audio (limit);
                        chn.set_midi (_input->n_ports().n_midi());
@@ -606,7 +502,7 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                if (!diskstream->record_enabled() && _session.transport_rolling()) {
 #ifdef XXX_MOVE_THIS_TO_AMP
                        Glib::Mutex::Lock am (data().control_lock(), Glib::TRY_LOCK);
-                       
+
                        if (am.locked() && gain_control()->automation_playback()) {
                                _amp->apply_gain_automation(
                                                gain_control()->list()->curve().rt_safe_get_vector (
@@ -616,7 +512,7 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
                }
 
                process_output_buffers (bufs, start_frame, end_frame, nframes, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick);
-               
+
        } else {
                /* problem with the diskstream; just be quiet for a bit */
                silence (nframes);
@@ -628,11 +524,10 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame,
 int
 AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes, bool enable_processing)
 {
-       gain_t  gain_buffer[nframes];
-       float   mix_buffer[nframes];
-       ProcessorList::iterator i;
+       boost::scoped_array<gain_t> gain_buffer (new gain_t[nframes]);
+       boost::scoped_array<Sample> mix_buffer (new Sample[nframes]);
        boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
-       
+
        Glib::RWLock::ReaderLock rlock (_processor_lock);
 
        boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist());
@@ -640,7 +535,7 @@ AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes
 
        assert(buffers.get_audio(0).capacity() >= nframes);
 
-       if (apl->read (buffers.get_audio(0).data(), mix_buffer, gain_buffer, start, nframes) != nframes) {
+       if (apl->read (buffers.get_audio(0).data(), mix_buffer.get(), gain_buffer.get(), start, nframes) != nframes) {
                return -1;
        }
 
@@ -651,14 +546,14 @@ AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes
        ++bi;
        for ( ; bi != buffers.audio_end(); ++bi, ++n) {
                if (n < diskstream->n_channels().n_audio()) {
-                       if (apl->read (bi->data(), mix_buffer, gain_buffer, start, nframes, n) != nframes) {
+                       if (apl->read (bi->data(), mix_buffer.get(), gain_buffer.get(), start, nframes, n) != nframes) {
                                return -1;
                        }
                        b = bi->data();
                }
                else {
                        /* duplicate last across remaining buffers */
-                       memcpy (bi->data(), b, sizeof (Sample) * nframes); 
+                       memcpy (bi->data(), b, sizeof (Sample) * nframes);
                }
        }
 
@@ -669,15 +564,20 @@ AudioTrack::export_stuff (BufferSet& buffers, sframes_t start, nframes_t nframes
 
        /* note: only run processors during export. other layers in the machinery
           will already have checked that there are no external port processors.
+          Also, don't run deliveries that write to real output ports, and don't
+          run meters.
        */
-       
-       for (i = _processors.begin(); i != _processors.end(); ++i) {
-               boost::shared_ptr<Processor> processor;
-               if ((processor = boost::dynamic_pointer_cast<Processor>(*i)) != 0) {
-                       processor->run (buffers, start, start+nframes, nframes);
+
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               boost::shared_ptr<Processor> processor = boost::dynamic_pointer_cast<Processor> (*i);
+               boost::shared_ptr<Delivery> delivery = boost::dynamic_pointer_cast<Delivery> (*i);
+               boost::shared_ptr<PeakMeter> meter = boost::dynamic_pointer_cast<PeakMeter> (*i);
+               
+               if (processor && (!delivery || !Delivery::role_requires_output_ports (delivery->role())) && !meter) {
+                       processor->run (buffers, start, start+nframes, nframes, true);
                }
        }
-       
+
        return 0;
 }
 
@@ -696,7 +596,7 @@ AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt,
 }
 
 void
-AudioTrack::freeze (InterThreadInfo& itt)
+AudioTrack::freeze_me (InterThreadInfo& itt)
 {
        vector<boost::shared_ptr<Source> > srcs;
        string new_playlist_name;
@@ -704,7 +604,7 @@ AudioTrack::freeze (InterThreadInfo& itt)
        string dir;
        string region_name;
        boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
-       
+
        if ((_freeze_record.playlist = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist())) == 0) {
                return;
        }
@@ -712,23 +612,23 @@ AudioTrack::freeze (InterThreadInfo& itt)
        uint32_t n = 1;
 
        while (n < (UINT_MAX-1)) {
-        
+
                string candidate;
-               
+
                candidate = string_compose ("<F%2>%1", _freeze_record.playlist->name(), n);
 
-               if (_session.playlist_by_name (candidate) == 0) {
+               if (_session.playlists->by_name (candidate) == 0) {
                        new_playlist_name = candidate;
                        break;
                }
 
                ++n;
 
-       } 
+       }
 
        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())
+                           " to create another one"), _freeze_record.playlist->name())
               << endmsg;
                return;
        }
@@ -743,21 +643,21 @@ AudioTrack::freeze (InterThreadInfo& itt)
 
        {
                Glib::RWLock::ReaderLock lm (_processor_lock);
-               
+
                for (ProcessorList::iterator r = _processors.begin(); r != _processors.end(); ++r) {
-                       
+
                        boost::shared_ptr<Processor> processor;
 
                        if ((processor = boost::dynamic_pointer_cast<Processor>(*r)) != 0) {
-                               
+
                                FreezeRecordProcessorInfo* frii  = new FreezeRecordProcessorInfo ((*r)->get_state(), processor);
-                               
+
                                frii->id = processor->id();
 
                                _freeze_record.processor_info.push_back (frii);
-                               
+
                                /* now deactivate the processor */
-                               
+
                                processor->deactivate ();
                                _session.set_dirty ();
                        }
@@ -766,21 +666,22 @@ AudioTrack::freeze (InterThreadInfo& itt)
 
        new_playlist = PlaylistFactory::create (DataType::AUDIO, _session, new_playlist_name, false);
 
-       _freeze_record.gain = _amp->gain();
-       _freeze_record.gain_automation_state = _amp->gain_control()->automation_state();
        /* XXX need main outs automation state _freeze_record.pan_automation_state = _mainpanner->automation_state(); */
 
        region_name = new_playlist_name;
 
        /* create a new region from all filesources, keep it private */
 
-       boost::shared_ptr<Region> region (RegionFactory::create (srcs, 0,
-                       srcs[0]->length(srcs[0]->timeline_position()), 
-                       region_name, 0,
-                       (Region::Flag) (Region::WholeFile|Region::DefaultFlags),
-                       false));
+       PropertyList plist;
+       
+       plist.add (Properties::start, 0);
+       plist.add (Properties::length, srcs[0]->length(srcs[0]->timeline_position()));
+       plist.add (Properties::name, region_name);
+       plist.add (Properties::whole_file, true);
+
+       boost::shared_ptr<Region> region (RegionFactory::create (srcs, plist, false));
 
-       new_playlist->set_orig_diskstream_id (diskstream->id());
+       new_playlist->set_orig_diskstream_id (_diskstream->id());
        new_playlist->add_region (region, _session.current_start_frame());
        new_playlist->set_frozen (true);
        region->set_locked (true);
@@ -789,7 +690,7 @@ AudioTrack::freeze (InterThreadInfo& itt)
        diskstream->set_record_enabled (false);
 
        /* reset stuff that has already been accounted for in the freeze process */
-       
+
        set_gain (1.0, this);
        _amp->gain_control()->set_automation_state (Off);
        /* XXX need to use _main_outs _panner->set_automation_state (Off); */
@@ -809,16 +710,14 @@ AudioTrack::unfreeze ()
                        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                                for (vector<FreezeRecordProcessorInfo*>::iterator ii = _freeze_record.processor_info.begin(); ii != _freeze_record.processor_info.end(); ++ii) {
                                        if ((*ii)->id == (*i)->id()) {
-                                               (*i)->set_state (((*ii)->state));
+                                               (*i)->set_state (((*ii)->state), Stateful::current_state_version);
                                                break;
                                        }
                                }
                        }
                }
-               
+
                _freeze_record.playlist.reset ();
-               set_gain (_freeze_record.gain, this);
-               _amp->gain_control()->set_automation_state (_freeze_record.gain_automation_state);
                /* XXX need to use _main_outs _panner->set_automation_state (_freeze_record.pan_automation_state); */
        }
 
@@ -826,3 +725,11 @@ AudioTrack::unfreeze ()
        FreezeChange (); /* EMIT SIGNAL */
 }
 
+boost::shared_ptr<AudioFileSource>
+AudioTrack::write_source (uint32_t n)
+{
+       boost::shared_ptr<AudioDiskstream> ds = boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream);
+       assert (ds);
+       return ds->write_source (n);
+}
+