PluginInfo::type added to copy constructor. But why is the copy constructor defined...
[ardour.git] / libs / ardour / audio_track.cc
index 677c9a04972082d1609daad5db604376dba839e1..95099676e76256044b34ac3d6f9b13f9ad8d35ed 100644 (file)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
-#include <pbd/error.h>
+
 #include <sigc++/retype.h>
 #include <sigc++/retype_return.h>
 #include <sigc++/bind.h>
 
+#include <pbd/error.h>
+#include <pbd/enumwriter.h>
+
 #include <ardour/audio_track.h>
 #include <ardour/audio_diskstream.h>
 #include <ardour/session.h>
 #include <ardour/route_group_specialized.h>
 #include <ardour/insert.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/playlist_factory.h>
 #include <ardour/panner.h>
 #include <ardour/utils.h>
+#include <ardour/mix.h>
 
 #include "i18n.h"
 
@@ -43,6 +47,22 @@ 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 ()
+{
+}
+
+void
+AudioTrack::use_new_diskstream ()
 {
        AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0);
 
@@ -52,24 +72,46 @@ AudioTrack::AudioTrack (Session& sess, string name, Route::Flag flag, TrackMode
                dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Recordable);
        }
 
-       if (mode == Destructive) {
+       if (_mode == Destructive) {
                dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Destructive);
        }
 
-       boost::shared_ptr<AudioDiskstream> ds (new AudioDiskstream (_session, name, dflags));
+       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)
-       : Track (sess, node)
+int
+AudioTrack::set_mode (TrackMode m)
 {
-       set_state (node);
+       if (m != _mode) {
+
+               if (_diskstream->set_destructive (m == Destructive)) {
+                       return -1;
+               }
+
+               _mode = m;
+               
+               TrackModeChanged (); /* EMIT SIGNAL */
+       }
+
+       return 0;
 }
 
-AudioTrack::~AudioTrack ()
+bool
+AudioTrack::can_use_mode (TrackMode m, bool& bounce_required)
 {
+       switch (m) {
+       case Normal:
+               bounce_required = false;
+               return true;
+               
+       case Destructive:
+       default:
+               return _diskstream->can_become_destructive (bounce_required);
+       }
 }
 
 int
@@ -103,14 +145,22 @@ AudioTrack::deprecated_use_diskstream_connections ()
                
                if (c == 0) {
                        error << string_compose(_("Unknown connection \"%1\" listed for input of %2"), prop->value(), _name) << endmsg;
+
+                       string replacement_connection;
+
+                       if (prop->value().find ('+') != string::npos) {
+                               replacement_connection = _("in 1+2");
+                       } else {
+                               replacement_connection = _("in 1");
+                       }
                        
-                       if ((c = _session.connection_by_name (_("in 1"))) == 0) {
+                       if ((c = _session.connection_by_name (replacement_connection)) == 0) {
                                error << _("No input connections available as a replacement")
                                << endmsg;
                                return -1;
                        } else {
-                               info << string_compose (_("Connection %1 was not available - \"in 1\" used instead"), prop->value())
-                              << endmsg;
+                               info << string_compose (_("Connection %1 was not available - \"%2\" used instead"), prop->value(), replacement_connection)
+                                    << endmsg;
                        }
                }
 
@@ -187,23 +237,24 @@ AudioTrack::audio_diskstream() const
 
 int
 AudioTrack::set_state (const XMLNode& node)
+{
+       return _set_state (node, true);
+}
+
+int
+AudioTrack::_set_state (const XMLNode& node, bool call_base)
 {
        const XMLProperty *prop;
        XMLNodeConstIterator iter;
 
-       if (Route::set_state (node)) {
-               return -1;
+       if (call_base) {
+               if (Route::_set_state (node, call_base)) {
+                       return -1;
+               }
        }
 
        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;
-               }
+               _mode = TrackMode (string_2_enum (prop->value(), _mode));
        } else {
                _mode = Normal;
        }
@@ -225,8 +276,19 @@ AudioTrack::set_state (const XMLNode& node)
        } else {
                
                PBD::ID id (prop->value());
-               
-               if (use_diskstream (id)) {
+               PBD::ID zero ("0");
+
+               /* this wierd hack is used when creating tracks from a template. there isn't
+                  a particularly good time to interpose between setting the first part of
+                  the track state (notably Route::set_state() and the track mode), and the
+                  second part (diskstream stuff). So, we have a special ID for the diskstream
+                  that means "you should create a new diskstream here, not look for
+                  an old one.
+               */
+
+               if (id == zero) {
+                       use_new_diskstream ();
+               } else if (use_diskstream (id)) {
                        return -1;
                }
        }
@@ -240,14 +302,7 @@ AudioTrack::set_state (const XMLNode& node)
        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);
-                       }
-
-               } else if (child->name() == X_("recenable")) {
+               if (child->name() == X_("recenable")) {
                        _rec_enable_control.set_state (*child);
                        _session.add_controllable (&_rec_enable_control);
                }
@@ -255,7 +310,11 @@ AudioTrack::set_state (const XMLNode& node)
 
        pending_state = const_cast<XMLNode*> (&node);
 
-       _session.StateReady.connect (mem_fun (*this, &AudioTrack::set_state_part_two));
+       if (_session.state_of_the_state() & Session::Loading) {
+               _session.StateReady.connect (mem_fun (*this, &AudioTrack::set_state_part_two));
+       } else {
+               set_state_part_two ();
+       }
 
        return 0;
 }
@@ -272,8 +331,7 @@ AudioTrack::state(bool full_state)
 
                freeze_node = new XMLNode (X_("freeze-info"));
                freeze_node->add_property ("playlist", _freeze_record.playlist->name());
-               snprintf (buf, sizeof (buf), "%d", (int) _freeze_record.state);
-               freeze_node->add_property ("state", buf);
+               freeze_node->add_property ("state", enum_2_string (_freeze_record.state));
 
                for (vector<FreezeRecordInsertInfo*>::iterator i = _freeze_record.insert_info.begin(); i != _freeze_record.insert_info.end(); ++i) {
                        inode = new XMLNode (X_("insert"));
@@ -290,30 +348,11 @@ AudioTrack::state(bool full_state)
        /* Alignment: act as a proxy for the diskstream */
        
        XMLNode* align_node = new XMLNode (X_("alignment"));
-       switch (_diskstream->alignment_style()) {
-       case ExistingMaterial:
-               snprintf (buf, sizeof (buf), X_("existing"));
-               break;
-       case CaptureTime:
-               snprintf (buf, sizeof (buf), X_("capture"));
-               break;
-       }
-       align_node->add_property (X_("style"), buf);
+       AlignStyle as = _diskstream->alignment_style ();
+       align_node->add_property (X_("style"), enum_2_string (as));
        root.add_child_nocopy (*align_node);
 
-       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);
-
-       switch (_mode) {
-       case Normal:
-               root.add_property (X_("mode"), X_("normal"));
-               break;
-       case Destructive:
-               root.add_property (X_("mode"), X_("destructive"));
-               break;
-       }
+       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
@@ -336,8 +375,11 @@ AudioTrack::set_state_part_two ()
        XMLProperty* prop;
        LocaleGuard lg (X_("POSIX"));
 
-       /* This is called after all session state has been restored but before
-          have been made ports and connections are established.
+       /* During session loading: this is called after all session state has been restored but before
+          ports have been created and connections are established.
+
+          During creation from templates: this is called after ports have been created, and connections
+          are established.
        */
 
        if (pending_state == 0) {
@@ -356,18 +398,18 @@ AudioTrack::set_state_part_two ()
                _freeze_record.insert_info.clear ();
                
                if ((prop = fnode->property (X_("playlist"))) != 0) {
-                       Playlist* pl = _session.playlist_by_name (prop->value());
+                       boost::shared_ptr<Playlist> pl = _session.playlist_by_name (prop->value());
                        if (pl) {
-                               _freeze_record.playlist = dynamic_cast<AudioPlaylist*> (pl);
+                               _freeze_record.playlist = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
                        } else {
-                               _freeze_record.playlist = 0;
+                               _freeze_record.playlist.reset ();
                                _freeze_record.state = NoFreeze;
                        return;
                        }
                }
                
                if ((prop = fnode->property (X_("state"))) != 0) {
-                       _freeze_record.state = (FreezeState) atoi (prop->value().c_str());
+                       _freeze_record.state = FreezeState (string_2_enum (prop->value(), _freeze_record.state));
                }
                
                XMLNodeConstIterator citer;
@@ -394,11 +436,21 @@ AudioTrack::set_state_part_two ()
        if ((fnode = find_named_node (*pending_state, X_("alignment"))) != 0) {
 
                if ((prop = fnode->property (X_("style"))) != 0) {
-                       if (prop->value() == "existing") {
-                               _diskstream->set_persistent_align_style (ExistingMaterial);
-                       } else if (prop->value() == "capture") {
-                               _diskstream->set_persistent_align_style (CaptureTime);
+
+                       /* fix for older sessions from before EnumWriter */
+
+                       string pstr;
+
+                       if (prop->value() == "capture") {
+                               pstr = "CaptureTime";
+                       } else if (prop->value() == "existing") {
+                               pstr = "ExistingMaterial";
+                       } else {
+                               pstr = prop->value();
                        }
+
+                       AlignStyle as = AlignStyle (string_2_enum (pstr, as));
+                       _diskstream->set_persistent_align_style (as);
                }
        }
        return;
@@ -411,14 +463,15 @@ AudioTrack::n_process_buffers ()
 }
 
 void
-AudioTrack::passthru_silence (nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset, int declick, bool meter)
+AudioTrack::passthru_silence (nframes_t start_frame, nframes_t end_frame, nframes_t nframes, 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);
+
+       process_output_buffers (_session.get_silent_buffers (nbufs), nbufs, start_frame, end_frame, nframes, true, declick, meter);
 }
 
 int 
-AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, 
+AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
                     bool session_state_changing, bool can_record, bool rec_monitors_input)
 {
        if (n_outputs() == 0) {
@@ -426,7 +479,7 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra
        }
 
        if (!_active) {
-               silence (nframes, offset);
+               silence (nframes);
                return 0;
        }
 
@@ -434,7 +487,7 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra
 
                /* XXX is this safe to do against transport state changes? */
 
-               passthru_silence (start_frame, end_frame, nframes, offset, 0, false);
+               passthru_silence (start_frame, end_frame, nframes, 0, false);
                return 0;
        }
 
@@ -450,19 +503,24 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra
                send_silence = true;
        } else {
 
-               if (Config->get_auto_input()) {
-                       if (Config->get_monitoring_model() == SoftwareMonitoring) {
+               if (!Config->get_tape_machine_mode()) {
+                       /* 
+                          ADATs work in a strange way.. 
+                          they monitor input always when stopped.and auto-input is engaged. 
+                       */
+                       if ((Config->get_monitoring_model() == SoftwareMonitoring) && (Config->get_auto_input () || _diskstream->record_enabled())) {
                                send_silence = false;
                        } else {
                                send_silence = true;
                        }
                } else {
-                       if (_diskstream->record_enabled()) {
-                               if (Config->get_monitoring_model() == SoftwareMonitoring) {
-                                       send_silence = false;
-                               } else {
-                                       send_silence = true;
-                               }
+                       /* 
+                          Other machines switch to input on stop if the track is record enabled,
+                          regardless of the auto input setting (auto input only changes the 
+                          monitoring state when the transport is rolling) 
+                       */
+                       if ((Config->get_monitoring_model() == SoftwareMonitoring) && _diskstream->record_enabled()) {
+                               send_silence = false;
                        } else {
                                send_silence = true;
                        }
@@ -478,12 +536,12 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra
                */
                
                if (_have_internal_generator) {
-                       passthru_silence (start_frame, end_frame, nframes, offset, 0, true);
+                       passthru_silence (start_frame, end_frame, nframes, 0, true);
                } else {
                        if (_meter_point == MeterInput) {
-                               just_meter_input (start_frame, end_frame, nframes, offset);
+                               just_meter_input (start_frame, end_frame, nframes);
                        }
-                       passthru_silence (start_frame, end_frame, nframes, offset, 0, false);
+                       passthru_silence (start_frame, end_frame, nframes, 0, false);
                }
 
        } else {
@@ -491,14 +549,14 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra
                /* we're sending signal, but we may still want to meter the input. 
                 */
 
-               passthru (start_frame, end_frame, nframes, offset, 0, (_meter_point == MeterInput));
+               passthru (start_frame, end_frame, nframes, 0, (_meter_point == MeterInput));
        }
 
        return 0;
 }
 
 int
-AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, int declick,
+AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, int declick,
                  bool can_record, bool rec_monitors_input)
 {
        int dret;
@@ -506,32 +564,44 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
        Sample* tmpb;
        nframes_t transport_frame;
        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, false);
+               }
+       }
+
        
        if (n_outputs() == 0 && _redirects.empty()) {
                return 0;
        }
 
        if (!_active) {
-               silence (nframes, offset);
+               silence (nframes);
                return 0;
        }
 
        transport_frame = _session.transport_frame();
 
-       if ((nframes = check_initial_delay (nframes, offset, transport_frame)) == 0) {
-               /* need to do this so that the diskstream sets its
-                  playback distance to zero, thus causing diskstream::commit
-                  to do nothing.
-               */
-               return diskstream->process (transport_frame, 0, 0, can_record, rec_monitors_input);
-       } 
+       if (!can_record || !diskstream->record_enabled()) {
+               if ((nframes = check_initial_delay (nframes, transport_frame)) == 0) {
+                       /* need to do this so that the diskstream sets its
+                          playback distance to zero, thus causing diskstream::commit
+                          to do nothing.
+                       */
+                       return diskstream->process (transport_frame, 0, can_record, rec_monitors_input);
+               } 
+       }
 
        _silent = false;
        apply_gain_automation = false;
 
-       if ((dret = diskstream->process (transport_frame, nframes, offset, can_record, rec_monitors_input)) != 0) {
+       if ((dret = diskstream->process (transport_frame, nframes, can_record, rec_monitors_input)) != 0) {
                
-               silence (nframes, offset);
+               silence (nframes);
 
                return dret;
        }
@@ -539,7 +609,7 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
        /* special condition applies */
        
        if (_meter_point == MeterInput) {
-               just_meter_input (start_frame, end_frame, nframes, offset);
+               just_meter_input (start_frame, end_frame, nframes);
        }
 
        if (diskstream->record_enabled() && !can_record && !Config->get_auto_input()) {
@@ -548,7 +618,7 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
                   at least potentially (depending on monitoring options)
                 */
 
-               passthru (start_frame, end_frame, nframes, offset, 0, true);
+               passthru (start_frame, end_frame, nframes, 0, true);
 
        } else if ((b = diskstream->playback_buffer(0)) != 0) {
 
@@ -564,18 +634,70 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
                /* copy the diskstream data to all output buffers */
                
                vector<Sample*>& bufs = _session.get_passthru_buffers ();
+               vector<Sample*>::size_type blimit = bufs.size();
                uint32_t limit = n_process_buffers ();
                
                uint32_t n;
                uint32_t i;
 
+               if (limit > blimit) {
+
+                       /* example case: auditioner configured for stereo output,
+                          but loaded with an 8 channel file. there are only
+                          2 passthrough buffers, but n_process_buffers() will
+                          return 8.
+                          
+                          arbitrary decision: map all channels in the diskstream
+                          to the outputs available.
+                       */
+
+                       float scaling = limit/blimit;
+                       
+                       for (i = 0, n = 1; i < blimit; ++i, ++n) {
+
+                               /* first time through just copy a channel into 
+                                  the output buffer.
+                               */
+                               
+                               for (nframes_t xx = 0; xx < nframes; ++xx) {
+                                       bufs[i][xx] = b[xx] * scaling;
+                               }
+
+                               if (n < diskstream->n_channels()) {
+                                       tmpb = diskstream->playback_buffer(n);
+                                       if (tmpb!=0) {
+                                               b = tmpb;
+                                       }
+                               }
+                       }
+
+                       for (;i < limit; ++i, ++n) {
+                               
+                               /* for all remaining channels, sum with existing
+                                  data in the output buffers 
+                               */
+                               
+                               Session::mix_buffers_with_gain (bufs[i%blimit], b, nframes, scaling);
 
-               for (i = 0, n = 1; i < limit; ++i, ++n) {
-                       memcpy (bufs[i], b, sizeof (Sample) * nframes); 
-                       if (n < diskstream->n_channels()) {
-                               tmpb = diskstream->playback_buffer(n);
-                               if (tmpb!=0) {
-                                       b = tmpb;
+                               if (n < diskstream->n_channels()) {
+                                       tmpb = diskstream->playback_buffer(n);
+                                       if (tmpb!=0) {
+                                               b = tmpb;
+                                       }
+                               }
+                               
+                       }
+
+                       limit = blimit;
+
+               } else {
+                       for (i = 0, n = 1; i < limit; ++i, ++n) {
+                               memcpy (bufs[i], b, sizeof (Sample) * nframes); 
+                               if (n < diskstream->n_channels()) {
+                                       tmpb = diskstream->playback_buffer(n);
+                                       if (tmpb!=0) {
+                                               b = tmpb;
+                                       }
                                }
                        }
                }
@@ -590,18 +712,18 @@ AudioTrack::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
                        }
                }
 
-               process_output_buffers (bufs, limit, start_frame, end_frame, nframes, offset, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, (_meter_point != MeterInput));
+               process_output_buffers (bufs, limit, start_frame, end_frame, nframes, (!_session.get_record_enabled() || !Config->get_do_not_record_plugins()), declick, (_meter_point != MeterInput));
                
        } else {
                /* problem with the diskstream; just be quiet for a bit */
-               silence (nframes, offset);
+               silence (nframes);
        }
 
        return 0;
 }
 
 int
-AudioTrack::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, 
+AudioTrack::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
                         bool can_record, bool rec_monitors_input)
 {
        if (n_outputs() == 0 && _redirects.empty()) {
@@ -609,20 +731,20 @@ AudioTrack::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end
        }
 
        if (!_active) {
-               silence (nframes, offset);
+               silence (nframes);
                return 0;
        }
 
        _silent = true;
        apply_gain_automation = false;
 
-       silence (nframes, offset);
+       silence (nframes);
 
-       return audio_diskstream()->process (_session.transport_frame() + offset, nframes, offset, can_record, rec_monitors_input);
+       return audio_diskstream()->process (_session.transport_frame(), nframes, can_record, rec_monitors_input);
 }
 
 int
-AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t start, nframes_t nframes)
+AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t start, nframes_t nframes, bool enable_processing)
 {
        gain_t  gain_automation[nframes];
        gain_t  gain_buffer[nframes];
@@ -636,8 +758,7 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t st
        
        Glib::RWLock::ReaderLock rlock (redirect_lock);
 
-       // FIXME
-       AudioPlaylist* const apl = dynamic_cast<AudioPlaylist*>(diskstream->playlist());
+       boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist());
        assert(apl);
 
        if (apl->read (buffers[0], mix_buffer, gain_buffer, start, nframes) != nframes) {
@@ -661,6 +782,9 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t st
                }
        }
 
+       // If no processing is required, there's no need to go any further.
+       if (!enable_processing)
+               return 0;
 
        /* note: only run inserts during export. other layers in the machinery
           will already have checked that there are no external port inserts.
@@ -672,7 +796,7 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t st
                if ((insert = boost::dynamic_pointer_cast<Insert>(*i)) != 0) {
                        switch (insert->placement()) {
                        case PreFader:
-                               insert->run (buffers, nbufs, nframes, 0);
+                               insert->run (buffers, nbufs, nframes);
                                break;
                        case PostFader:
                                post_fader_work = true;
@@ -695,10 +819,7 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t st
        } else {
 
                for (bi = buffers.begin(); bi != buffers.end(); ++bi) {
-                       Sample *b = *bi;
-                       for (nframes_t n = 0; n < nframes; ++n) {
-                               b[n] *= this_gain;
-                       }
+                       apply_gain_to_buffer(*bi, nframes, this_gain);
                }
        }
 
@@ -712,7 +833,7 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t st
                                case PreFader:
                                        break;
                                case PostFader:
-                                       insert->run (buffers, nbufs, nframes, 0);
+                                       insert->run (buffers, nbufs, nframes);
                                        break;
                                }
                        }
@@ -722,19 +843,20 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, nframes_t st
        return 0;
 }
 
-void
+boost::shared_ptr<Region>
 AudioTrack::bounce (InterThreadInfo& itt)
 {
        vector<boost::shared_ptr<AudioSource> > srcs;
-       _session.write_one_audio_track (*this, 0, _session.current_end_frame(), false, srcs, itt);
+       return _session.write_one_audio_track (*this, _session.current_start_frame(), _session.current_end_frame(), 
+                                              false, srcs, itt);
 }
 
 
-void
-AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt)
+boost::shared_ptr<Region>
+AudioTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt, bool enable_processing)
 {
        vector<boost::shared_ptr<AudioSource> > srcs;
-       _session.write_one_audio_track (*this, start, end, false, srcs, itt);
+       return _session.write_one_audio_track (*this, start, end, false, srcs, itt, enable_processing);
 }
 
 void
@@ -742,12 +864,12 @@ AudioTrack::freeze (InterThreadInfo& itt)
 {
        vector<boost::shared_ptr<AudioSource> > srcs;
        string new_playlist_name;
-       Playlist* new_playlist;
+       boost::shared_ptr<Playlist> new_playlist;
        string dir;
        string region_name;
        boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
        
-       if ((_freeze_record.playlist = dynamic_cast<AudioPlaylist*>(diskstream->playlist())) == 0) {
+       if ((_freeze_record.playlist = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist())) == 0) {
                return;
        }
 
@@ -775,7 +897,9 @@ AudioTrack::freeze (InterThreadInfo& itt)
                return;
        }
 
-       if (_session.write_one_audio_track (*this, 0, _session.current_end_frame(), true, srcs, itt)) {
+       boost::shared_ptr<Region> res;
+
+       if ((res = _session.write_one_audio_track (*this, _session.current_start_frame(), _session.current_end_frame(), true, srcs, itt)) == 0) {
                return;
        }
 
@@ -794,8 +918,7 @@ AudioTrack::freeze (InterThreadInfo& itt)
                                FreezeRecordInsertInfo* frii  = new FreezeRecordInsertInfo ((*r)->get_state(), insert);
                                
                                frii->id = insert->id();
-                               frii->memento = (*r)->get_memento();
-                               
+
                                _freeze_record.insert_info.push_back (frii);
                                
                                /* now deactivate the insert */
@@ -805,7 +928,11 @@ AudioTrack::freeze (InterThreadInfo& itt)
                }
        }
 
-       new_playlist = new AudioPlaylist (_session, new_playlist_name, false);
+       _freeze_record.gain = _gain;
+       _freeze_record.gain_automation_state = _gain_automation_curve.automation_state();
+       _freeze_record.pan_automation_state = _panner->automation_state();
+
+       new_playlist = PlaylistFactory::create (_session, new_playlist_name, false);
        region_name = new_playlist_name;
 
        /* create a new region from all filesources, keep it private */
@@ -816,13 +943,19 @@ AudioTrack::freeze (InterThreadInfo& itt)
                                                                 false));
 
        new_playlist->set_orig_diskstream_id (diskstream->id());
-       new_playlist->add_region (region, 0);
+       new_playlist->add_region (region, _session.current_start_frame());
        new_playlist->set_frozen (true);
        region->set_locked (true);
 
-       diskstream->use_playlist (dynamic_cast<AudioPlaylist*>(new_playlist));
+       diskstream->use_playlist (boost::dynamic_pointer_cast<AudioPlaylist>(new_playlist));
        diskstream->set_record_enabled (false);
 
+       /* reset stuff that has already been accounted for in the freeze process */
+       
+       set_gain (1.0, this);
+       _gain_automation_curve.set_automation_state (Off);
+       _panner->set_automation_state (Off);
+
        _freeze_record.state = Frozen;
        FreezeChange(); /* EMIT SIGNAL */
 }
@@ -852,7 +985,10 @@ AudioTrack::unfreeze ()
                        }
                }
                
-               _freeze_record.playlist = 0;
+               _freeze_record.playlist.reset ();
+               set_gain (_freeze_record.gain, this);
+               _gain_automation_curve.set_automation_state (_freeze_record.gain_automation_state);
+               _panner->set_automation_state (_freeze_record.pan_automation_state);
        }
 
        _freeze_record.state = UnFrozen;