Fix uninitialised variable and remove bind of shared_ptr to a slot.
[ardour.git] / libs / ardour / ardour / session.h
index bc8dcb81f11d9206a105f9c9a10cfd3a24b9e9f8..1717d21969dc41d62c818f48eb7c6ac57a325776 100644 (file)
 
 #include "ardour/ardour.h"
 #include "ardour/chan_count.h"
-#include "ardour/configuration.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/session_configuration.h"
 #include "ardour/location.h"
-#include "ardour/smpte.h"
+#include "ardour/timecode.h"
+#include "ardour/interpolation.h"
 
 class XMLTree;
 class XMLNode;
@@ -84,12 +86,14 @@ class AutomationList;
 class AuxInput;
 class BufferSet;
 class Bundle;
+class Butler;
 class ControlProtocolInfo;
 class Diskstream;
 class ExportHandler;
 class ExportStatus;
 class IO;
 class IOProcessor;
+class ImportStatus;
 class MidiDiskstream;
 class MidiRegion;
 class MidiSource;
@@ -101,6 +105,7 @@ class Port;
 class PortInsert;
 class Processor;
 class Region;
+class Return;
 class Route;
 class RouteGroup;
 class SMFSource;
@@ -112,18 +117,13 @@ class Source;
 class TempoMap;
 class VSTPlugin;
 
-using std::vector;
-using std::string;
-using std::map;
-using std::set;
-
 class Session : public PBD::StatefulDestructible, public boost::noncopyable
 {
   private:
        typedef std::pair<boost::weak_ptr<Route>,bool> RouteBooleanState;
-       typedef vector<RouteBooleanState> GlobalRouteBooleanState;
+       typedef std::vector<RouteBooleanState> GlobalRouteBooleanState;
        typedef std::pair<boost::weak_ptr<Route>,MeterPoint> RouteMeterState;
-       typedef vector<RouteMeterState> GlobalRouteMeterState;
+       typedef std::vector<RouteMeterState> GlobalRouteMeterState;
 
   public:
        enum RecordState {
@@ -132,8 +132,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                Recording = 2
        };
 
-       struct Event {
-               enum Type {
+        struct Event {
+               enum Type {
                        SetTransportSpeed,
                        SetDiskstreamSpeed,
                        Locate,
@@ -145,95 +145,99 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                        RangeStop,
                        RangeLocate,
                        Overwrite,
-                       SetSlaveSource,
+                       SetSyncSource,
                        Audition,
                        InputConfigurationChange,
-                       SetAudioRange,
-                       SetPlayRange,
-
+                       SetPlayAudioRange,
+                       
                        /* only one of each of these events can be queued at any one time */
-
+                       
                        StopOnce,
                        AutoLoop
                };
-
-               enum Action {
-                       Add,
-                       Remove,
-                       Replace,
-                       Clear
-               };
-
-               Type             type;
-               Action           action;
-               nframes_t        action_frame;
-               nframes_t        target_frame;
-               double           speed;
-
-               union {
-                       void*        ptr;
-                       bool         yes_or_no;
-                       nframes_t    target2_frame;
-                       SlaveSource  slave;
-                       Route*       route;
-               };
-
-               list<AudioRange> audio_range;
-               list<MusicRange> music_range;
-               
-               boost::shared_ptr<Region> region;
-
-               Event(Type t, Action a, nframes_t when, nframes_t where, double spd, bool yn = false)
+           
+                enum Action {
+                        Add,
+                        Remove,
+                        Replace,
+                        Clear
+                };
+           
+           Type             type;
+           Action           action;
+           nframes64_t      action_frame;
+           nframes64_t      target_frame;
+           double           speed;
+           
+           union {
+               void*        ptr;
+               bool         yes_or_no;
+               nframes64_t  target2_frame;
+               SyncSource   sync_source;
+               Route*       route;
+           };
+
+           union {
+               bool second_yes_or_no;
+           };
+           
+           std::list<AudioRange> audio_range;
+           std::list<MusicRange> music_range;
+           
+           boost::shared_ptr<Region> region;
+           
+           Event(Type t, Action a, nframes_t when, nframes_t where, double spd, bool yn = false, bool yn2 = false)
                        : type (t)
                        , action (a)
                        , action_frame (when)
                        , target_frame (where)
                        , speed (spd)
                        , yes_or_no (yn)
+                       , second_yes_or_no (yn2)
                {}
 
-               void set_ptr (void* p) {
-                       ptr = p;
-               }
-
-               bool before (const Event& other) const {
-                       return action_frame < other.action_frame;
-               }
-
-               bool after (const Event& other) const {
-                       return action_frame > other.action_frame;
-               }
-
-               static bool compare (const Event *e1, const Event *e2) {
-                       return e1->before (*e2);
-               }
-
-               void *operator new (size_t ignored) {
-                       return pool.alloc ();
-               }
-
-               void operator delete(void *ptr, size_t size) {
-                       pool.release (ptr);
-               }
-
-               static const nframes_t Immediate = 0;
-
-               private:
-               static MultiAllocSingleReleasePool pool;
+           void set_ptr (void* p) {
+                   ptr = p;
+           }
+           
+           bool before (const Event& other) const {
+                   return action_frame < other.action_frame;
+           }
+           
+           bool after (const Event& other) const {
+                   return action_frame > other.action_frame;
+           }
+           
+           static bool compare (const Event *e1, const Event *e2) {
+                   return e1->before (*e2);
+           }
+           
+           void *operator new (size_t) {
+                   return pool.alloc ();
+           }
+           
+           void operator delete (void *ptr, size_t /*size*/) {
+                   pool.release (ptr);
+           }
+           
+           static const nframes_t Immediate = 0;
+           
+       private:
+           static MultiAllocSingleReleasePool pool;
        };
 
        /* creating from an XML file */
 
        Session (AudioEngine&,
-                       const string& fullpath,
-                       const string& snapshot_name,
-                       string mix_template = "");
+                       const std::string& fullpath,
+                       const std::string& snapshot_name,
+                       std::string mix_template = "");
 
        /* creating a new Session */
 
        Session (AudioEngine&,
-                       string fullpath,
-                       string snapshot_name,
+                       std::string fullpath,
+                       std::string snapshot_name,
                        AutoConnectOption input_auto_connect,
                        AutoConnectOption output_auto_connect,
                        uint32_t control_out_channels,
@@ -244,17 +248,19 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        virtual ~Session ();
 
-       string path() const { return _path; }
-       string name() const { return _name; }
-       string snap_name() const { return _current_snapshot_name; }
-       string raid_path () const;
+       std::string path() const { return _path; }
+       std::string name() const { return _name; }
+       std::string snap_name() const { return _current_snapshot_name; }
+       std::string raid_path () const;
 
        void set_snap_name ();
 
+       bool writable() const { return _writable; }
        void set_dirty ();
        void set_clean ();
        bool dirty() const { return _state_of_the_state & Dirty; }
        void set_deletion_in_progress ();
+       void clear_deletion_in_progress ();
        bool deletion_in_progress() const { return _state_of_the_state & Deletion; }
        sigc::signal<void> DirtyChanged;
 
@@ -275,12 +281,12 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        Glib::ustring peak_path (Glib::ustring) const;
 
-       static string change_source_path_by_name (string oldpath, string oldname, string newname, bool destructive);
+       static std::string change_source_path_by_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
 
-       string peak_path_from_audio_path (string) const;
-       string new_audio_source_name (const string&, uint32_t nchans, uint32_t chan, bool destructive);
-       string new_midi_source_name (const string&);
-       string new_source_path_from_name (DataType type, const string&);
+       std::string peak_path_from_audio_path (std::string) const;
+       std::string new_audio_source_name (const std::string&, uint32_t nchans, uint32_t chan, bool destructive);
+       std::string new_midi_source_name (const std::string&);
+       std::string new_source_path_from_name (DataType type, const std::string&);
        RouteList new_route_from_template (uint32_t how_many, const std::string& template_path);
 
        void process (nframes_t nframes);
@@ -291,21 +297,25 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void add_diskstream (boost::shared_ptr<Diskstream>);
        boost::shared_ptr<Diskstream> diskstream_by_id (const PBD::ID& id);
-       boost::shared_ptr<Diskstream> diskstream_by_name (string name);
+       boost::shared_ptr<Diskstream> diskstream_by_name (std::string name);
        bool have_rec_enabled_diskstream () const;
 
        bool have_captured() const { return _have_captured; }
 
        void refill_all_diskstream_buffers ();
-       uint32_t audio_diskstream_buffer_size() const { return audio_dstream_buffer_size; }
-       uint32_t midi_diskstream_buffer_size() const { return midi_dstream_buffer_size; }
+       Butler* butler() { return _butler; }
+       void butler_transport_work ();
 
        uint32_t get_next_diskstream_id() const { return n_diskstreams(); }
        uint32_t n_diskstreams() const;
 
+       void refresh_disk_space ();
+
        typedef std::list<boost::shared_ptr<Diskstream> > DiskstreamList;
 
-       int load_routes (const XMLNode&);
+       SerializedRCUManager<DiskstreamList>& diskstream_list() { return diskstreams; }
+
+       int load_routes (const XMLNode&, int);
        boost::shared_ptr<RouteList> get_routes() const {
                return routes.reader ();
        }
@@ -319,21 +329,21 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        }
 
        struct RoutePublicOrderSorter {
-           bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b);
+               bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b);
        };
-       
-       void sync_order_keys (const char* base);
+
+       void sync_order_keys (std::string const &);
 
        template<class T> void foreach_route (T *obj, void (T::*func)(Route&));
        template<class T> void foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>));
        template<class T, class A> void foreach_route (T *obj, void (T::*func)(Route&, A), A arg);
 
-       boost::shared_ptr<Route> route_by_name (string);
+       boost::shared_ptr<Route> route_by_name (std::string);
        boost::shared_ptr<Route> route_by_id (PBD::ID);
        boost::shared_ptr<Route> route_by_remote_id (uint32_t id);
 
-       bool route_name_unique (string) const;
-       bool route_name_internal (string) const;
+       bool route_name_unique (std::string) const;
+       bool route_name_internal (std::string) const;
 
        bool get_record_enabled() const {
                return (record_status () >= Enabled);
@@ -369,29 +379,30 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        /* Transport mechanism signals */
 
        sigc::signal<void> TransportStateChange; /* generic */
-       sigc::signal<void,nframes_t> PositionChanged; /* sent after any non-sequential motion */
+       sigc::signal<void,nframes64_t> PositionChanged; /* sent after any non-sequential motion */
        sigc::signal<void> DurationChanged;
-       sigc::signal<void,nframes_t> Xrun;
+       sigc::signal<void,nframes64_t> Xrun;
        sigc::signal<void> TransportLooped;
 
        /** emitted when a locate has occurred */
        sigc::signal<void> Located;
 
        sigc::signal<void,RouteList&> RouteAdded;
+       sigc::signal<void> RouteGroupChanged;
 
        void request_roll_at_and_return (nframes_t start, nframes_t return_to);
        void request_bounded_roll (nframes_t start, nframes_t end);
-       void request_stop (bool abort = false);
+       void request_stop (bool abort = false, bool clear_state = false);
        void request_locate (nframes_t frame, bool with_roll = false);
 
-       void request_play_loop (bool yn);
+       void request_play_loop (bool yn, bool leave_rolling = false);
        bool get_play_loop () const { return play_loop; }
 
        nframes_t  last_transport_start() const { return _last_roll_location; }
        void goto_end ()   { request_locate (end_location->start(), false);}
        void goto_start () { request_locate (start_location->start(), false); }
        void set_session_start (nframes_t start) { start_location->set_start(start); }
-       void set_session_end (nframes_t end) { end_location->set_start(end); _end_location_is_free = false; }
+       void set_session_end (nframes_t end) { end_location->set_start(end); config.set_end_marker_is_free (false); }
        void use_rf_shuttle_speed ();
        void allow_auto_play (bool yn);
        void request_transport_speed (double speed);
@@ -399,7 +410,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void request_diskstream_speed (Diskstream&, double speed);
        void request_input_change_handling ();
 
-       bool locate_pending() const { return static_cast<bool>(post_transport_work&PostTransportLocate); }
+       bool locate_pending() const { return static_cast<bool>(post_transport_work()&PostTransportLocate); }
        bool transport_locked () const;
 
        int wipe ();
@@ -415,15 +426,15 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        nframes_t nominal_frame_rate() const   { return _nominal_frame_rate; }
        nframes_t frames_per_hour() const { return _frames_per_hour; }
 
-       double frames_per_smpte_frame() const { return _frames_per_smpte_frame; }
-       nframes_t smpte_frames_per_hour() const { return _smpte_frames_per_hour; }
+       double frames_per_timecode_frame() const { return _frames_per_timecode_frame; }
+       nframes_t timecode_frames_per_hour() const { return _timecode_frames_per_hour; }
 
-       MIDI::byte get_mtc_smpte_bits() const { 
-               return mtc_smpte_bits;   /* encoding of SMTPE type for MTC */
+       MIDI::byte get_mtc_timecode_bits() const {
+               return mtc_timecode_bits;   /* encoding of SMTPE type for MTC */
        }
 
-       float smpte_frames_per_second() const;
-       bool smpte_drop_frames() const;
+       float timecode_frames_per_second() const;
+       bool timecode_drop_frames() const;
 
        /* Locations */
 
@@ -435,7 +446,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void set_auto_punch_location (Location *);
        void set_auto_loop_location (Location *);
-       int location_name(string& result, string base = string(""));
+       int location_name(std::string& result, std::string base = std::string(""));
 
        void reset_input_monitor_state ();
 
@@ -460,14 +471,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        static int rename_template (std::string old_name, std::string new_name);
        static int delete_template (std::string name);
 
-       sigc::signal<void,string> StateSaved;
+       sigc::signal<void,std::string> StateSaved;
        sigc::signal<void> StateReady;
 
-       vector<string*>* possible_states() const;
-       static vector<string*>* possible_states(string path);
+       std::vector<std::string*>* possible_states() const;
+       static std::vector<std::string*>* possible_states (std::string path);
 
        XMLNode& get_state();
-       int      set_state(const XMLNode& node); // not idempotent
+       int      set_state(const XMLNode& node, int version); // not idempotent
        XMLNode& get_template();
 
        /// The instant xml file is written to the session directory
@@ -486,28 +497,16 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        StateOfTheState state_of_the_state() const { return _state_of_the_state; }
 
-       RouteGroup* add_edit_group (string);
-       RouteGroup* add_mix_group (string);
-
-       void remove_edit_group (RouteGroup&);
-       void remove_mix_group (RouteGroup&);
+       void add_route_group (RouteGroup *);
+       void remove_route_group (RouteGroup&);
 
-       RouteGroup *mix_group_by_name (string);
-       RouteGroup *edit_group_by_name (string);
+       RouteGroup *route_group_by_name (std::string);
 
-       sigc::signal<void,RouteGroup*> edit_group_added;
-       sigc::signal<void,RouteGroup*> mix_group_added;
-       sigc::signal<void>             edit_group_removed;
-       sigc::signal<void>             mix_group_removed;
+       sigc::signal<void,RouteGroup*> route_group_added;
+       sigc::signal<void>             route_group_removed;
 
-       void foreach_edit_group (sigc::slot<void,RouteGroup*> sl) {
-               for (list<RouteGroup *>::iterator i = edit_groups.begin(); i != edit_groups.end(); i++) {
-                       sl (*i);
-               }
-       }
-
-       void foreach_mix_group (sigc::slot<void,RouteGroup*> sl) {
-               for (list<RouteGroup *>::iterator i = mix_groups.begin(); i != mix_groups.end(); i++) {
+       void foreach_route_group (sigc::slot<void,RouteGroup*> sl) {
+               for (std::list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); i++) {
                        sl (*i);
                }
        }
@@ -515,12 +514,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        /* fundamental operations. duh. */
 
        std::list<boost::shared_ptr<AudioTrack> > new_audio_track (
-                       int input_channels, int output_channels, TrackMode mode = Normal, uint32_t how_many = 1);
-       
-       RouteList new_audio_route (int input_channels, int output_channels, uint32_t how_many);
+               int input_channels, int output_channels, TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1
+               );
+
+       RouteList new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many);
 
        std::list<boost::shared_ptr<MidiTrack> > new_midi_track (
-                       TrackMode mode = Normal, uint32_t how_many = 1);
+               TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1
+               );
 
        void   remove_route (boost::shared_ptr<Route>);
        void   resort_routes ();
@@ -536,8 +537,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* Time */
 
-       nframes_t transport_frame () const {return _transport_frame; }
-       nframes_t audible_frame () const;
+        nframes64_t transport_frame () const {return _transport_frame; }
+       nframes64_t audible_frame () const;
        nframes64_t requested_return_frame() const { return _requested_return_frame; }
 
        enum PullupFormat {
@@ -552,32 +553,32 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                pullup_Minus4Minus1
        };
 
-       int  set_smpte_format (SmpteFormat);
        void sync_time_vars();
 
        void bbt_time (nframes_t when, BBT_Time&);
-       void smpte_to_sample(SMPTE::Time& smpte, nframes_t& sample, bool use_offset, bool use_subframes) const;
-       void sample_to_smpte(nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const;
-       void smpte_time (SMPTE::Time &);
-       void smpte_time (nframes_t when, SMPTE::Time&);
-       void smpte_time_subframes (nframes_t when, SMPTE::Time&);
+       void timecode_to_sample(Timecode::Time& timecode, nframes_t& sample, bool use_offset, bool use_subframes) const;
+       void sample_to_timecode(nframes_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const;
+       void timecode_time (Timecode::Time &);
+       void timecode_time (nframes_t when, Timecode::Time&);
+       void timecode_time_subframes (nframes_t when, Timecode::Time&);
 
-       void smpte_duration (nframes_t, SMPTE::Time&) const;
-       void smpte_duration_string (char *, nframes_t) const;
+       void timecode_duration (nframes_t, Timecode::Time&) const;
+       void timecode_duration_string (char *, nframes_t) const;
 
-       void           set_smpte_offset (nframes_t);
-       nframes_t      smpte_offset () const { return _smpte_offset; }
-       void           set_smpte_offset_negative (bool);
-       bool           smpte_offset_negative () const { return _smpte_offset_negative; }
+       void           set_timecode_offset (nframes_t);
+       nframes_t      timecode_offset () const { return _timecode_offset; }
+       void           set_timecode_offset_negative (bool);
+       bool           timecode_offset_negative () const { return _timecode_offset_negative; }
 
        nframes_t convert_to_frames_at (nframes_t position, AnyTime const &);
 
        static sigc::signal<void> StartTimeChanged;
        static sigc::signal<void> EndTimeChanged;
-       static sigc::signal<void> SMPTEOffsetChanged;
+       static sigc::signal<void> TimecodeOffsetChanged;
 
-       void   request_slave_source (SlaveSource);
-       bool   synced_to_jack() const { return Config->get_slave_source() == JACK; }
+        std::vector<SyncSource> get_available_sync_options() const;
+       void   request_sync_source (SyncSource);
+        bool   synced_to_jack() const { return config.get_external_sync() && config.get_sync_source() == JACK; }
 
        double transport_speed() const { return _transport_speed; }
        bool   transport_stopped() const { return _transport_speed == 0.0f; }
@@ -590,9 +591,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        TempoMap& tempo_map() { return *_tempo_map; }
 
-       /// signals the current transport position in frames, bbt and smpte time (in that order)
-       sigc::signal<void, const nframes_t&, const BBT_Time&, const SMPTE::Time&> tick;
-       
+       /// signals the current transport position in frames, bbt and timecode time (in that order)
+       sigc::signal<void, const nframes_t&, const BBT_Time&, const Timecode::Time&> tick;
+
        /* region info  */
 
        void add_regions (std::vector<boost::shared_ptr<Region> >&);
@@ -601,9 +602,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        sigc::signal<void,std::vector<boost::weak_ptr<Region> >& > RegionsAdded;
        sigc::signal<void,boost::weak_ptr<Region> > RegionRemoved;
 
-       int region_name (string& result, string base = string(""), bool newlevel = false);
-       string new_region_name (string);
-       string path_from_region_name (DataType type, string name, string identifier);
+       int region_name (std::string& result, std::string base = std::string(""), bool newlevel = false);
+       std::string new_region_name (std::string);
+       std::string path_from_region_name (DataType type, std::string name, std::string identifier);
 
        boost::shared_ptr<Region> find_whole_file_parent (boost::shared_ptr<Region const>);
 
@@ -617,28 +618,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* source management */
 
-       struct ImportStatus : public InterThreadInfo {
-               string doing_what;
-
-               /* control info */
-               uint32_t total;
-               SrcQuality quality;
-               volatile bool freeze;
-               std::vector<Glib::ustring> paths;
-               bool replace_existing_source;
-
-               /* result */
-               SourceList sources;
-       };
-
        void import_audiofiles (ImportStatus&);
-       bool sample_rate_convert (ImportStatus&, string infile, string& outfile);
-       string build_tmp_convert_name (string file);
+       bool sample_rate_convert (ImportStatus&, std::string infile, std::string& outfile);
+       std::string build_tmp_convert_name (std::string file);
 
        boost::shared_ptr<ExportHandler> get_export_handler ();
        boost::shared_ptr<ExportStatus> get_export_status ();
 
-       int  start_audio_export (nframes_t position, bool realtime);    
+       int  start_audio_export (nframes_t position, bool realtime);
 
        sigc::signal<int, nframes_t> ProcessExport;
        sigc::signal<void> ExportReadFinished;
@@ -647,13 +634,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void add_source (boost::shared_ptr<Source>);
        void remove_source (boost::weak_ptr<Source>);
 
-       struct cleanup_report {
-               vector<string> paths;
-               int64_t        space;
-       };
+       uint32_t source_use_count (boost::shared_ptr<const Source> src) const;
 
-       int  cleanup_sources (cleanup_report&);
-       int  cleanup_trash_sources (cleanup_report&);
+       int  cleanup_sources (CleanupReport&);
+       int  cleanup_trash_sources (CleanupReport&);
 
        int destroy_region (boost::shared_ptr<Region>);
        int destroy_regions (std::list<boost::shared_ptr<Region> >);
@@ -684,7 +668,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* playlist management */
 
-       boost::shared_ptr<Playlist> playlist_by_name (string name);
+       boost::shared_ptr<Playlist> playlist_by_name (std::string name);
        void unassigned_playlists (std::list<boost::shared_ptr<Playlist> > & list);
        void add_playlist (boost::shared_ptr<Playlist>, bool unused = false);
        sigc::signal<void,boost::shared_ptr<Playlist> > PlaylistAdded;
@@ -697,7 +681,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* named selections */
 
-       NamedSelection* named_selection_by_name (string name);
+       NamedSelection* named_selection_by_name (std::string name);
        void add_named_selection (NamedSelection *);
        void remove_named_selection (NamedSelection *);
 
@@ -727,16 +711,18 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        /* flattening stuff */
 
        boost::shared_ptr<Region> write_one_track (AudioTrack&, nframes_t start, nframes_t end,
-                       bool overwrite, vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
+                       bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
                        bool enable_processing = true);
        int freeze (InterThreadInfo&);
 
        /* session-wide solo/mute/rec-enable */
 
-       bool soloing() const { return currently_soloing; }
+       bool soloing() const { return _non_soloed_outs_muted; }
+       bool listening() const { return _listen_cnt > 0; }
 
        void set_all_solo (bool);
        void set_all_mute (bool);
+       void set_all_listen (bool);
 
        sigc::signal<void,bool> SoloActive;
        sigc::signal<void> SoloChanged;
@@ -746,14 +732,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* control/master out */
 
-       boost::shared_ptr<IO> control_out() const { return _control_out; }
-       boost::shared_ptr<IO> master_out() const { return _master_out; }
+       boost::shared_ptr<Route> control_out() const { return _control_out; }
+       boost::shared_ptr<Route> master_out() const { return _master_out; }
 
-       /* insert/send management */
-
-       uint32_t n_port_inserts() const { return _port_inserts.size(); }
-       uint32_t n_plugin_inserts() const { return _plugin_inserts.size(); }
-       uint32_t n_sends() const { return _sends.size(); }
+       void globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p);
+       void globally_set_send_gains_from_track (boost::shared_ptr<Route> dest);
+       void globally_set_send_gains_to_zero (boost::shared_ptr<Route> dest);
+       void globally_set_send_gains_to_unity (boost::shared_ptr<Route> dest);
+       void add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::shared_ptr<RouteList> senders);
 
        static void set_disable_all_loaded_plugins (bool yn) {
                _disable_all_loaded_plugins = yn;
@@ -763,8 +749,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        }
 
        uint32_t next_send_id();
+       uint32_t next_return_id();
        uint32_t next_insert_id();
        void mark_send_id (uint32_t);
+       void mark_return_id (uint32_t);
        void mark_insert_id (uint32_t);
 
        /* s/w "RAID" management */
@@ -775,7 +763,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void add_bundle (boost::shared_ptr<Bundle>);
        void remove_bundle (boost::shared_ptr<Bundle>);
-       boost::shared_ptr<Bundle> bundle_by_name (string) const;
+       boost::shared_ptr<Bundle> bundle_by_name (std::string) const;
 
        sigc::signal<void,boost::shared_ptr<Bundle> > BundleAdded;
        sigc::signal<void,boost::shared_ptr<Bundle> > BundleRemoved;
@@ -783,10 +771,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        /* MIDI control */
 
        void midi_panic(void);
-       int set_mtc_port (string port_tag);
-       int set_mmc_port (string port_tag);
-       int set_midi_port (string port_tag);
-       int set_midi_clock_port (string port_tag);
+       int set_mtc_port (std::string port_tag);
+       int set_mmc_port (std::string port_tag);
+       int set_midi_port (std::string port_tag);
+       int set_midi_clock_port (std::string port_tag);
        MIDI::Port *mtc_port() const { return _mtc_port; }
        MIDI::Port *mmc_port() const { return _mmc_port; }
        MIDI::Port *midi_port() const { return _midi_port; }
@@ -831,14 +819,15 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        uint32_t undo_depth() const { return _history.undo_depth(); }
        uint32_t redo_depth() const { return _history.redo_depth(); }
-       string next_undo() const { return _history.next_undo(); }
-       string next_redo() const { return _history.next_redo(); }
+       std::string next_undo() const { return _history.next_undo(); }
+       std::string next_redo() const { return _history.next_redo(); }
 
-       void begin_reversible_command (const string& cmd_name);
+       void begin_reversible_command (const std::string& cmd_name);
        void commit_reversible_command (Command* cmd = 0);
 
        void add_command (Command *const cmd) {
-               current_trans->add_command (cmd);
+               assert(!_current_trans.empty ());
+               _current_trans.top()->add_command (cmd);
        }
 
        std::map<PBD::ID, PBD::StatefulThingWithGoingAway*> registry;
@@ -851,22 +840,21 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        class GlobalRouteStateCommand : public Command
        {
-         public:
+       public:
                GlobalRouteStateCommand (Session&, void*);
                GlobalRouteStateCommand (Session&, const XMLNode& node);
-               int set_state (const XMLNode&);
+               int set_state (const XMLNode&, int version);
                XMLNode& get_state ();
 
-         protected:
+       protected:
                GlobalRouteBooleanState before, after;
                Session& sess;
                void* src;
-
        };
 
        class GlobalSoloStateCommand : public GlobalRouteStateCommand
        {
-         public:
+       public:
                GlobalSoloStateCommand (Session &, void *src);
                GlobalSoloStateCommand (Session&, const XMLNode&);
                void operator()(); //redo
@@ -877,7 +865,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        class GlobalMuteStateCommand : public GlobalRouteStateCommand
        {
-         public:
+       public:
                GlobalMuteStateCommand(Session &, void *src);
                GlobalMuteStateCommand (Session&, const XMLNode&);
                void operator()(); // redo
@@ -888,7 +876,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        class GlobalRecordEnableStateCommand : public GlobalRouteStateCommand
        {
-         public:
+       public:
                GlobalRecordEnableStateCommand(Session &, void *src);
                GlobalRecordEnableStateCommand (Session&, const XMLNode&);
                void operator()(); // redo
@@ -899,16 +887,16 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        class GlobalMeteringStateCommand : public Command
        {
-         public:
+       public:
                GlobalMeteringStateCommand(Session &, void *src);
                GlobalMeteringStateCommand (Session&, const XMLNode&);
                void operator()();
                void undo();
                XMLNode &get_state();
-               int set_state (const XMLNode&);
+               int set_state (const XMLNode&, int version);
                void mark();
 
-         protected:
+       protected:
                Session& sess;
                void* src;
                GlobalRouteMeterState before;
@@ -929,22 +917,16 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void reset_playback_load_min ();
        void reset_capture_load_min ();
 
-       float read_data_rate () const; // in usec
-       float write_data_rate () const;
-
        /* ranges */
 
-       void set_audio_range (list<AudioRange>&);
-       void set_music_range (list<MusicRange>&);
-
-       void request_play_range (bool yn);
+       void request_play_range (std::list<AudioRange>*, bool leave_rolling = false);
        bool get_play_range () const { return _play_range; }
 
        /* buffers for gain and pan */
 
        gain_t* gain_automation_buffer () const { return _gain_automation_buffer; }
        pan_t** pan_automation_buffer () const  { return _pan_automation_buffer; }
-       
+
        void ensure_buffer_set (BufferSet& buffers, const ChanCount& howmany);
 
        /* VST support */
@@ -967,6 +949,12 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        SessionMetadata & metadata () { return *_metadata; }
 
+       SessionConfiguration config;
+
+       bool exporting () const {
+               return _exporting;
+       }
+
   protected:
        friend class AudioEngine;
        void set_block_size (nframes_t nframes);
@@ -974,8 +962,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
   protected:
        friend class Diskstream;
-       void stop_butler ();
-       void wait_till_butler_finished();
 
   protected:
        friend class Route;
@@ -983,7 +969,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void update_latency_compensation (bool, bool);
 
   private:
-       int  create (bool& new_session, const string& mix_template, nframes_t initial_length);
+       int  create (bool& new_session, const std::string& mix_template, nframes_t initial_length);
        void destroy ();
 
        nframes_t compute_initial_length ();
@@ -1013,21 +999,20 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        nframes_t               _nominal_frame_rate;  //ignores audioengine setting, "native" SR
        int                      transport_sub_state;
        mutable gint            _record_status;
-       volatile nframes_t      _transport_frame;
+       volatile nframes64_t    _transport_frame;
        Location*                end_location;
        Location*                start_location;
        Slave*                  _slave;
        bool                    _silent;
-       volatile double         _transport_speed;
-       double                  _last_transport_speed;
-       // fixed point transport speed for varispeed playback
-       uint64_t                phi; 
-       // fixed point target transport speed for varispeed playback when tempo changes
-       uint64_t                target_phi;
-       // fixed point phase for varispeed playback
-       uint64_t                phase;
+
+    // varispeed playback
+       volatile double             _transport_speed;
+       double                      _last_transport_speed;
+       double                      _target_transport_speed;
+       CubicInterpolation          interpolation;
+
        bool                     auto_play_legal;
-       nframes_t               _last_slave_transport_frame;
+       nframes64_t             _last_slave_transport_frame;
        nframes_t                maximum_output_latency;
        volatile nframes64_t    _requested_return_frame;
        BufferSet*              _scratch_buffers;
@@ -1040,10 +1025,13 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        bool                    _have_captured;
        float                   _meter_hold;
        float                   _meter_falloff;
-       bool                    _end_location_is_free;
+       bool                    _non_soloed_outs_muted;
+       uint32_t                _listen_cnt;
+       bool                    _writable;
+       bool                    _was_seamless;
 
        void set_worst_io_latencies ();
-       void set_worst_io_latencies_x (IOChange asifwecare, void *ignored) {
+       void set_worst_io_latencies_x (IOChange, void *) {
                set_worst_io_latencies ();
        }
 
@@ -1083,25 +1071,26 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void reset_slave_state ();
        bool follow_slave (nframes_t);
        void calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta);
-       void track_slave_state(float slave_speed, nframes_t slave_transport_frame, 
-                              nframes_t this_delta, bool starting);
+       void track_slave_state(float slave_speed, nframes_t slave_transport_frame,
+                              nframes_t this_delta, bool starting);
        void follow_slave_silently(nframes_t nframes, float slave_speed);
-       
-       void set_slave_source (SlaveSource);
 
-       SlaveSource post_export_slave;
+        void use_sync_source (SyncSource);
+        void drop_sync_source ();
+
+        bool post_export_sync;
        nframes_t post_export_position;
 
        bool _exporting;
        bool _exporting_realtime;
-       
+
        boost::shared_ptr<ExportHandler> export_handler;
        boost::shared_ptr<ExportStatus>  export_status;
 
        int  pre_export ();
        int  stop_audio_export ();
        void finalize_audio_export ();
-       
+
        sigc::connection export_freewheel_connection;
 
        void prepare_diskstreams ();
@@ -1113,7 +1102,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                if (actively_recording()) {
                        return true;
                } else {
-                       if (Config->get_auto_input()) {
+                       if (config.get_auto_input()) {
                                return false;
                        } else {
                                return true;
@@ -1132,15 +1121,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                }
        }
 
-       bool maybe_stop (nframes_t limit) {
-               if (   (_transport_speed > 0.0f && _transport_frame >= limit)
-                   || (_transport_speed < 0.0f && _transport_frame == 0)    ) {
-                       stop_transport ();
-                       return true;
-               }
-               return false;
-       }
-
+       bool maybe_stop (nframes_t limit);
        bool maybe_sync_start (nframes_t&);
 
        void check_declick_out ();
@@ -1150,8 +1131,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        MIDI::Port*             _mtc_port;
        MIDI::Port*             _midi_port;
        MIDI::Port*             _midi_clock_port;
-       string                  _path;
-       string                  _name;
+       std::string             _path;
+       std::string             _name;
        bool                     session_send_mmc;
        bool                     session_send_mtc;
        bool                     session_midi_feedback;
@@ -1167,17 +1148,15 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void when_engine_running ();
        void graph_reordered ();
 
-       string _current_snapshot_name;
+       std::string _current_snapshot_name;
 
-       XMLTree* state_tree;
-       bool     state_was_pending;
+       XMLTree*         state_tree;
+       bool             state_was_pending;
        StateOfTheState _state_of_the_state;
 
        void     auto_save();
        int      load_options (const XMLNode&);
-       XMLNode& get_options () const;
-       int      load_state (string snapshot_name);
-       bool     save_config_options_predicate (ConfigVariableBase::Owner owner) const;
+       int      load_state (std::string snapshot_name);
 
        nframes_t _last_roll_location;
        nframes_t _last_record_location;
@@ -1188,27 +1167,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        bool              pending_abort;
        bool              pending_auto_loop;
 
-       Sample*           butler_mixdown_buffer;
-       float*            butler_gain_buffer;
-       pthread_t         butler_thread;
-       Glib::Mutex       butler_request_lock;
-       Glib::Cond        butler_paused;
-       bool              butler_should_run;
-       mutable gint      butler_should_do_transport_work;
-       int               butler_request_pipe[2];
-
-       inline bool transport_work_requested() const {
-               return g_atomic_int_get(&butler_should_do_transport_work);
-       }
-
-       struct ButlerRequest {
-               enum Type {
-                       Wake,
-                       Run,
-                       Pause,
-                       Quit
-               };
-       };
+       Butler* _butler;
 
        enum PostTransportWork {
                PostTransportStop               = 0x1,
@@ -1225,7 +1184,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                PostTransportScrub              = 0x8000,
                PostTransportReverse            = 0x10000,
                PostTransportInputChange        = 0x20000,
-               PostTransportCurveRealloc       = 0x40000
+               PostTransportCurveRealloc       = 0x40000,
+               PostTransportClearSubstate      = 0x80000
        };
 
        static const PostTransportWork ProcessCannotProceedMask =
@@ -1237,16 +1197,13 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                                PostTransportScrub|
                                PostTransportAudition|
                                PostTransportLocate|
-                               PostTransportStop);
+                               PostTransportStop|
+                               PostTransportClearSubstate);
 
-       PostTransportWork post_transport_work;
-
-       void             summon_butler ();
-       void             schedule_butler_transport_work ();
-       int              start_butler_thread ();
-       void             terminate_butler_thread ();
-       static void    *_butler_thread_work (void *arg);
-       void*            butler_thread_work ();
+       gint _post_transport_work; /* accessed only atomic ops */
+       PostTransportWork post_transport_work() const        { return (PostTransportWork) g_atomic_int_get (&_post_transport_work); }
+       void set_post_transport_work (PostTransportWork ptw) { g_atomic_int_set (&_post_transport_work, (gint) ptw); }
+       void add_post_transport_work (PostTransportWork ptw);
 
        uint32_t    cumulative_rf_motion;
        uint32_t    rf_scale;
@@ -1271,7 +1228,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        sigc::connection auto_loop_changed_connection;
        void             auto_loop_changed (Location *);
 
-       typedef list<Event *> Events;
+       typedef std::list<Event *> Events;
        Events           events;
        Events           immediate_events;
        Events::iterator next_event;
@@ -1292,7 +1249,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        bool _remove_event (Event *);
        void _clear_event_type (Event::Type);
 
-       void first_stage_init (string path, string snapshot_name);
+       void first_stage_init (std::string path, std::string snapshot_name);
        int  second_stage_init (bool new_tracks);
        void find_current_end ();
        void remove_empty_sounds ();
@@ -1352,32 +1309,32 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        double step_speed;
 
        typedef sigc::slot<bool> MidiTimeoutCallback;
-       typedef list<MidiTimeoutCallback> MidiTimeoutList;
+       typedef std::list<MidiTimeoutCallback> MidiTimeoutList;
 
        MidiTimeoutList midi_timeouts;
        bool mmc_step_timeout ();
 
        MIDI::byte mmc_buffer[32];
        MIDI::byte mtc_msg[16];
-       MIDI::byte mtc_smpte_bits;   /* encoding of SMTPE type for MTC */
+       MIDI::byte mtc_timecode_bits;   /* encoding of SMTPE type for MTC */
        MIDI::byte midi_msg[16];
-       nframes_t  outbound_mtc_smpte_frame;
-       SMPTE::Time transmitting_smpte_time;
+       nframes_t  outbound_mtc_timecode_frame;
+       Timecode::Time transmitting_timecode_time;
        int next_quarter_frame_to_send;
 
-       double _frames_per_smpte_frame; /* has to be floating point because of drop frame */
+       double _frames_per_timecode_frame; /* has to be floating point because of drop frame */
        nframes_t _frames_per_hour;
-       nframes_t _smpte_frames_per_hour;
-       nframes_t _smpte_offset;
-       bool _smpte_offset_negative;
+       nframes_t _timecode_frames_per_hour;
+       nframes_t _timecode_offset;
+       bool _timecode_offset_negative;
 
        /* cache the most-recently requested time conversions. This helps when we
         * have multiple clocks showing the same time (e.g. the transport frame) */
-       bool           last_smpte_valid;
-       nframes_t last_smpte_when;
-       SMPTE::Time    last_smpte;
+       bool           last_timecode_valid;
+       nframes_t last_timecode_when;
+       Timecode::Time    last_timecode;
 
-       bool _send_smpte_update; ///< Flag to send a full frame (SMPTE) MTC message this cycle
+       bool _send_timecode_update; ///< Flag to send a full frame (Timecode) MTC message this cycle
 
        int send_full_time_code(nframes_t nframes);
        int send_midi_time_code_for_cycle(nframes_t nframes);
@@ -1389,8 +1346,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        int no_roll (nframes_t nframes);
        int fail_roll (nframes_t nframes);
 
-       bool non_realtime_work_pending() const { return static_cast<bool>(post_transport_work); }
-       bool process_can_proceed() const { return !(post_transport_work & ProcessCannotProceedMask); }
+       bool non_realtime_work_pending() const { return static_cast<bool>(post_transport_work()); }
+       bool process_can_proceed() const { return !(post_transport_work() & ProcessCannotProceedMask); }
 
        struct MIDIRequest {
                enum Type {
@@ -1414,23 +1371,23 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        int           use_config_midi_ports ();
 
        void set_play_loop (bool yn);
+       void unset_play_loop ();
        void overwrite_some_buffers (Diskstream*);
        void flush_all_inserts ();
        int  micro_locate (nframes_t distance);
-       void locate (nframes_t, bool with_roll, bool with_flush, bool with_loop=false);
-       void start_locate (nframes_t, bool with_roll, bool with_flush, bool with_loop=false);
-       void force_locate (nframes_t frame, bool with_roll = false);
+        void locate (nframes64_t, bool with_roll, bool with_flush, bool with_loop=false, bool force=false);
+        void start_locate (nframes64_t, bool with_roll, bool with_flush, bool with_loop=false, bool force=false);
+       void force_locate (nframes64_t frame, bool with_roll = false);
        void set_diskstream_speed (Diskstream*, double speed);
-       void set_transport_speed (double speed, bool abort = false);
-       void stop_transport (bool abort = false);
+        void set_transport_speed (double speed, bool abort = false, bool clear_state = false);
+       void stop_transport (bool abort = false, bool clear_state = false);
        void start_transport ();
-       void realtime_stop (bool abort);
+       void realtime_stop (bool abort, bool clear_state);
        void non_realtime_start_scrub ();
        void non_realtime_set_speed ();
        void non_realtime_locate ();
        void non_realtime_stop (bool abort, int entry_request_count, bool& finished);
        void non_realtime_overwrite (int entry_request_count, bool& finished);
-       void butler_transport_work ();
        void post_transport ();
        void engine_halted ();
        void xrun_recovery ();
@@ -1440,20 +1397,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* edit/mix groups */
 
-       int load_route_groups (const XMLNode&, bool is_edit);
-       int load_edit_groups (const XMLNode&);
-       int load_mix_groups (const XMLNode&);
-
+       int load_route_groups (const XMLNode&, int);
 
-       list<RouteGroup *> edit_groups;
-       list<RouteGroup *> mix_groups;
+       std::list<RouteGroup *> _route_groups;
 
        /* disk-streams */
 
        SerializedRCUManager<DiskstreamList>  diskstreams;
 
-       uint32_t audio_dstream_buffer_size;
-       uint32_t midi_dstream_buffer_size;
        int load_diskstreams (const XMLNode&);
 
        /* routes stuff */
@@ -1463,20 +1414,19 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void add_routes (RouteList&, bool save);
        uint32_t destructive_index;
 
-       boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&);
+       boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&, int);
 
        /* mixer stuff */
 
-       bool       solo_update_disabled;
-       bool       currently_soloing;
+       bool solo_update_disabled;
 
+       void route_listen_changed (void *src, boost::weak_ptr<Route>);
        void route_mute_changed (void *src);
        void route_solo_changed (void *src, boost::weak_ptr<Route>);
-       void catch_up_on_solo ();
-       void catch_up_on_solo_mute_override ();
-       void update_route_solo_state ();
-       void modify_solo_mute (bool, bool);
-       void strip_portname_for_solo (string& portname);
+       void update_route_solo_state (boost::shared_ptr<RouteList> r = boost::shared_ptr<RouteList>());
+
+       void listen_position_changed ();
+       void solo_control_mode_changed ();
 
        /* REGION MANAGEMENT */
 
@@ -1484,7 +1434,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void update_region_name_map (boost::shared_ptr<Region>);
 
        mutable Glib::Mutex region_lock;
-       typedef map<PBD::ID,boost::shared_ptr<Region> > RegionList;
+       typedef std::map<PBD::ID,boost::shared_ptr<Region> > RegionList;
        RegionList regions;
 
        void add_region (boost::shared_ptr<Region>);
@@ -1493,6 +1443,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        int load_regions (const XMLNode& node);
 
+       void route_group_changed ();
+
        /* SOURCES */
 
        mutable Glib::Mutex source_lock;
@@ -1512,7 +1464,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        /* PLAYLISTS */
 
        mutable Glib::Mutex playlist_lock;
-       typedef set<boost::shared_ptr<Playlist> > PlaylistList;
+       typedef std::set<boost::shared_ptr<Playlist> > PlaylistList;
        PlaylistList playlists;
        PlaylistList unused_playlists;
 
@@ -1521,21 +1473,21 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void remove_playlist (boost::weak_ptr<Playlist>);
        void track_playlist (bool, boost::weak_ptr<Playlist>);
 
-       boost::shared_ptr<Playlist> playlist_factory (string name);
+       boost::shared_ptr<Playlist> playlist_factory (std::string name);
        boost::shared_ptr<Playlist> XMLPlaylistFactory (const XMLNode&);
 
        void playlist_length_changed ();
-       void diskstream_playlist_changed (boost::shared_ptr<Diskstream>);
+       void diskstream_playlist_changed (boost::weak_ptr<Diskstream>);
 
        /* NAMED SELECTIONS */
 
        mutable Glib::Mutex named_selection_lock;
-       typedef set<NamedSelection *> NamedSelectionList;
+       typedef std::set<NamedSelection *> NamedSelectionList;
        NamedSelectionList named_selections;
 
        int load_named_selections (const XMLNode&);
 
-       NamedSelection *named_selection_factory (string name);
+       NamedSelection *named_selection_factory (std::string name);
        NamedSelection *XMLNamedSelectionFactory (const XMLNode&);
 
        /* CURVES and AUTOMATION LISTS */
@@ -1561,14 +1513,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* INSERT AND SEND MANAGEMENT */
 
-       list<PortInsert *>              _port_inserts;
-       list<PluginInsert *>            _plugin_inserts;
-       list<Send *>                    _sends;
        boost::dynamic_bitset<uint32_t> send_bitset;
+       boost::dynamic_bitset<uint32_t> return_bitset;
        boost::dynamic_bitset<uint32_t> insert_bitset;
-       uint32_t                        send_cnt;
-       uint32_t                        insert_cnt;
-
 
        void add_processor (Processor *);
        void remove_processor (Processor *);
@@ -1577,7 +1524,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        struct space_and_path {
                uint32_t blocks; /* 4kB blocks */
-               string path;
+               std::string path;
 
                space_and_path() {
                        blocks = 0;
@@ -1590,15 +1537,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                }
        };
 
-       void setup_raid_path (string path);
+       void setup_raid_path (std::string path);
 
-       vector<space_and_path> session_dirs;
-       vector<space_and_path>::iterator last_rr_session_dir;
+       std::vector<space_and_path> session_dirs;
+       std::vector<space_and_path>::iterator last_rr_session_dir;
        uint32_t _total_free_4k_blocks;
        Glib::Mutex space_lock;
 
-       string get_best_session_directory_for_new_source ();
-       void refresh_disk_space ();
+       std::string get_best_session_directory_for_new_source ();
 
        mutable gint _playback_load;
        mutable gint _capture_load;
@@ -1613,8 +1559,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void reverse_diskstream_buffers ();
 
-       UndoHistory _history;
-       UndoTransaction* current_trans;
+       UndoHistory                  _history;
+       std::stack<UndoTransaction*> _current_trans;
 
        GlobalRouteBooleanState get_global_route_boolean (bool (Route::*method)(void) const);
        GlobalRouteMeterState get_global_route_metering ();
@@ -1644,19 +1590,19 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                Click (nframes_t s, nframes_t d, const Sample *b)
                        : start (s), duration (d), data (b) { offset = 0; }
 
-               void *operator new(size_t ignored) {
+               void *operator new (size_t) {
                        return pool.alloc ();
                };
 
-               void operator delete(void *ptr, size_t size) {
+               void operator delete(void *ptr, size_t /*size*/) {
                        pool.release (ptr);
                }
 
-         private:
+       private:
                static Pool pool;
        };
 
-       typedef list<Click*> Clicks;
+       typedef std::list<Click*> Clicks;
 
        Clicks                 clicks;
        bool                  _clicking;
@@ -1677,20 +1623,20 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void   clear_clicks ();
        void   click (nframes_t start, nframes_t nframes);
 
-       vector<Route*> master_outs;
+       std::vector<Route*> master_outs;
 
        /* range playback */
 
-       list<AudioRange> current_audio_range;
+       std::list<AudioRange> current_audio_range;
        bool _play_range;
-       void set_play_range (bool yn);
-       void setup_auto_play ();
+       void set_play_range (std::list<AudioRange>&, bool leave_rolling);
+       void unset_play_range ();
 
        /* main outs */
        uint32_t main_outs;
 
-       boost::shared_ptr<IO> _master_out;
-       boost::shared_ptr<IO> _control_out;
+       boost::shared_ptr<Route> _master_out;
+       boost::shared_ptr<Route> _control_out;
 
        gain_t* _gain_automation_buffer;
        pan_t** _pan_automation_buffer;
@@ -1722,9 +1668,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        int find_all_sources (std::string path, std::set<std::string>& result);
        int find_all_sources_across_snapshots (std::set<std::string>& result, bool exclude_this_snapshot);
 
-       LayerModel layer_model;
-       CrossfadeModel xfade_model;
-
        typedef std::set<boost::shared_ptr<PBD::Controllable> > Controllables;
        Glib::Mutex controllables_lock;
        Controllables controllables;
@@ -1733,7 +1676,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        bool first_file_data_format_reset;
        bool first_file_header_format_reset;
 
-       void config_changed (const char*);
+       void config_changed (std::string, bool);
 
        XMLNode& get_control_protocol_state ();
 
@@ -1741,7 +1684,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void sync_order_keys ();
 
        static bool _disable_all_loaded_plugins;
-       
+
        SessionMetadata * _metadata;
 
        mutable bool have_looped; ///< Used in ::audible_frame(*)