Split butler into separate object (partially, just data so far...)
[ardour.git] / libs / ardour / ardour / session.h
index 017a78a015078c528bfce08d0c75667a080584ef..aa15f07e8d38cab18e01de7763c5bb2287341c65 100644 (file)
 #ifndef __ardour_session_h__
 #define __ardour_session_h__
 
-#include <string>
 #include <list>
 #include <map>
-#include <vector>
 #include <set>
 #include <stack>
+#include <string>
+#include <vector>
+#include <stdint.h>
 
+#include <boost/dynamic_bitset.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/dynamic_bitset.hpp>
-
-#include <stdint.h>
+#include <boost/utility.hpp>
 
 #include <sndfile.h>
 
 #include <glibmm/thread.h>
 
-#include <pbd/error.h>
-#include <pbd/undo.h>
-#include <pbd/pool.h>
-#include <pbd/rcu.h>
-#include <pbd/statefuldestructible.h>
+#include "pbd/error.h"
+#include "pbd/pool.h"
+#include "pbd/rcu.h"
+#include "pbd/statefuldestructible.h"
+#include "pbd/undo.h"
 
-#include <midi++/types.h>
-#include <midi++/mmc.h>
+#include "midi++/mmc.h"
+#include "midi++/types.h"
 
-#include <pbd/stateful.h>
-#include <pbd/destructible.h>
+#include "pbd/destructible.h"
+#include "pbd/stateful.h"
 
-#include <ardour/ardour.h>
-#include <ardour/configuration.h>
-#include <ardour/location.h>
-#include <ardour/gain.h>
-#include <ardour/io.h>
-
-#include <ardour/smpte.h>
+#include "ardour/ardour.h"
+#include "ardour/chan_count.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/session_configuration.h"
+#include "ardour/location.h"
+#include "ardour/smpte.h"
+#include "ardour/interpolation.h"
 
 class XMLTree;
 class XMLNode;
@@ -69,63 +69,60 @@ namespace PBD {
        class Controllable;
 }
 
+namespace Evoral {
+       class Curve;
+}
+
 namespace ARDOUR {
 
-class Port;
+class AudioDiskstream;
 class AudioEngine;
-class Slave;
-class Diskstream;
-class Route;
-class AuxInput;
-class Source;
+class AudioFileSource;
+class AudioRegion;
 class AudioSource;
+class AudioTrack;
+class Auditioner;
+class AutomationList;
+class AuxInput;
 class BufferSet;
-
+class Bundle;
+class ControlProtocolInfo;
 class Diskstream;
-class AudioDiskstream;
+class ExportHandler;
+class ExportStatus;
+class IO;
+class IOProcessor;
 class MidiDiskstream;
-class AudioFileSource;
+class MidiRegion;
 class MidiSource;
-class Auditioner;
-class Processor;
-class Send;
-class IOProcessor;
-class PortInsert;
-class PluginInsert;
-class Bundle;
-class TempoMap;
-class AudioTrack;
+class MidiTrack;
 class NamedSelection;
-class AudioRegion;
-
-class Region;
 class Playlist;
-class VSTPlugin;
-class ControlProtocolInfo;
-
-class MidiTrack;
-class MidiRegion;
+class PluginInsert;
+class Port;
+class PortInsert;
+class Processor;
+class Region;
+class Return;
+class Route;
+class RouteGroup;
 class SMFSource;
-
+class Send;
 class SessionDirectory;
 class SessionMetadata;
-class ExportHandler;
-class ExportStatus;
-
-struct RouteGroup;
-
-using std::vector;
-using std::string;
-using std::map;
-using std::set;
+class Slave;
+class Source;
+class TempoMap;
+class VSTPlugin;
+class Butler;
 
-class Session : public PBD::StatefulDestructible
+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 {
@@ -135,129 +132,130 @@ class Session : public PBD::StatefulDestructible
        };
 
        struct Event {
-           enum Type {
-                   SetTransportSpeed,
-                   SetDiskstreamSpeed,
-                   Locate,
-                   LocateRoll,
-                   LocateRollLocate,
-                   SetLoop,
-                   PunchIn,
-                   PunchOut,
-                   RangeStop,
-                   RangeLocate,
-                   Overwrite,
-                   SetSlaveSource,
-                   Audition,
-                   InputConfigurationChange,
-                   SetAudioRange,
-                   SetPlayRange,
-
-                   /* 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;
-           float          speed;
-
-           union {
-                       void*                ptr;
-                       bool                 yes_or_no;
-                       nframes_t            target2_frame;
-                       SlaveSource slave;
-                       Route*               route;
-           };
-
-           boost::shared_ptr<Region>     region;
-
-           list<AudioRange>     audio_range;
-           list<MusicRange>     music_range;
-
-           Event(Type t, Action a, nframes_t when, nframes_t where, float spd, bool yn = false)
-                   : type (t),
-                     action (a),
-                     action_frame (when),
-                     target_frame (where),
-                     speed (spd),
-                     yes_or_no (yn) {}
-
-           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;
+               enum Type {
+                       SetTransportSpeed,
+                       SetDiskstreamSpeed,
+                       Locate,
+                       LocateRoll,
+                       LocateRollLocate,
+                       SetLoop,
+                       PunchIn,
+                       PunchOut,
+                       RangeStop,
+                       RangeLocate,
+                       Overwrite,
+                       SetSlaveSource,
+                       Audition,
+                       InputConfigurationChange,
+                       SetAudioRange,
+                       SetPlayRange,
+
+                       /* 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;
+               };
+
+               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)
+                       : type (t)
+                       , action (a)
+                       , action_frame (when)
+                       , target_frame (where)
+                       , speed (spd)
+                       , yes_or_no (yn)
+               {}
+
+               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,
-                AutoConnectOption input_auto_connect,
-                AutoConnectOption output_auto_connect,
-                uint32_t control_out_channels,
-                uint32_t master_out_channels,
-                uint32_t n_physical_in,
-                uint32_t n_physical_out,
-                nframes_t initial_length);
+                       std::string fullpath,
+                       std::string snapshot_name,
+                       AutoConnectOption input_auto_connect,
+                       AutoConnectOption output_auto_connect,
+                       uint32_t control_out_channels,
+                       uint32_t master_out_channels,
+                       uint32_t n_physical_in,
+                       uint32_t n_physical_out,
+                       nframes_t initial_length);
 
        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;
 
@@ -278,12 +276,13 @@ class Session : public PBD::StatefulDestructible
 
        Glib::ustring peak_path (Glib::ustring) const;
 
-       static string change_audio_path_by_name (string oldpath, string oldname, string newname, bool destructive);
-       static string change_midi_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 audio_path_from_name (string, uint32_t nchans, uint32_t chan, bool destructive);
-       string midi_path_from_name (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);
 
@@ -293,7 +292,8 @@ class Session : public PBD::StatefulDestructible
 
        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; }
 
@@ -305,9 +305,8 @@ class Session : public PBD::StatefulDestructible
        uint32_t n_diskstreams() const;
 
        typedef std::list<boost::shared_ptr<Diskstream> > DiskstreamList;
-       typedef std::list<boost::shared_ptr<Route> >      RouteList;
 
-       int load_routes (const XMLNode&);
+       int load_routes (const XMLNode&, int);
        boost::shared_ptr<RouteList> get_routes() const {
                return routes.reader ();
        }
@@ -316,21 +315,26 @@ class Session : public PBD::StatefulDestructible
        uint32_t ntracks () const;
        uint32_t nbusses () const;
 
+       boost::shared_ptr<BundleList> bundles () {
+               return _bundles.reader ();
+       }
+
        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_unique (std::string) const;
+       bool route_name_internal (std::string) const;
 
        bool get_record_enabled() const {
                return (record_status () >= Enabled);
@@ -371,7 +375,11 @@ class Session : public PBD::StatefulDestructible
        sigc::signal<void,nframes_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);
@@ -385,34 +393,37 @@ class Session : public PBD::StatefulDestructible
        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 (float speed);
+       void request_transport_speed (double speed);
        void request_overwrite_buffer (Diskstream*);
-       void request_diskstream_speed (Diskstream&, float speed);
+       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 transport_locked () const;
 
        int wipe ();
-       //int wipe_diskstream (AudioDiskstream *);
 
        int remove_region_from_region_list (boost::shared_ptr<Region>);
 
        nframes_t get_maximum_extent () const;
        nframes_t current_end_frame() const { return end_location->start(); }
        nframes_t current_start_frame() const { return start_location->start(); }
-       // "actual" sample rate of session, set by current audioengine rate, pullup/down etc.
+       /// "actual" sample rate of session, set by current audioengine rate, pullup/down etc.
        nframes_t frame_rate() const   { return _current_frame_rate; }
-       // "native" sample rate of session, regardless of current audioengine rate, pullup/down etc
+       /// "native" sample rate of session, regardless of current audioengine rate, pullup/down etc
        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; }
 
+       MIDI::byte get_mtc_smpte_bits() const {
+               return mtc_smpte_bits;   /* encoding of SMTPE type for MTC */
+       }
+
        float smpte_frames_per_second() const;
        bool smpte_drop_frames() const;
 
@@ -426,7 +437,7 @@ class Session : public PBD::StatefulDestructible
 
        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 ();
 
@@ -434,10 +445,10 @@ class Session : public PBD::StatefulDestructible
        void remove_event (nframes_t frame, Event::Type type);
        void clear_events (Event::Type type);
 
-       nframes_t get_block_size() const { return current_block_size; }
+       nframes_t get_block_size()        const { return current_block_size; }
        nframes_t worst_output_latency () const { return _worst_output_latency; }
-       nframes_t worst_input_latency () const { return _worst_input_latency; }
-       nframes_t worst_track_latency () const { return _worst_track_latency; }
+       nframes_t worst_input_latency ()  const { return _worst_input_latency; }
+       nframes_t worst_track_latency ()  const { return _worst_track_latency; }
 
        int save_state (std::string snapshot_name, bool pending = false);
        int restore_state (std::string snapshot_name);
@@ -451,19 +462,19 @@ class Session : public PBD::StatefulDestructible
        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
        void add_instant_xml (XMLNode&, bool write_to_config = true);
-       XMLNode * instant_xml (const std::string& str);
+       XMLNode* instant_xml (const std::string& str);
 
        enum StateOfTheState {
                Clean = 0x0,
@@ -477,39 +488,31 @@ class Session : public PBD::StatefulDestructible
 
        StateOfTheState state_of_the_state() const { return _state_of_the_state; }
 
-       RouteGroup* add_edit_group (string);
-       RouteGroup* add_mix_group (string);
+       void add_route_group (RouteGroup *);
+       void remove_route_group (RouteGroup&);
 
-       void remove_edit_group (RouteGroup&);
-       void remove_mix_group (RouteGroup&);
+       RouteGroup *route_group_by_name (std::string);
 
-       RouteGroup *mix_group_by_name (string);
-       RouteGroup *edit_group_by_name (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;
-
-       void foreach_edit_group (sigc::slot<void,RouteGroup*> sl) {
-               for (list<RouteGroup *>::iterator i = edit_groups.begin(); i != edit_groups.end(); i++) {
-                       sl (*i);
-               }
-       }
+       sigc::signal<void,RouteGroup*> route_group_added;
+       sigc::signal<void>             route_group_removed;
 
-       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);
                }
        }
 
        /* 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);
+       std::list<boost::shared_ptr<AudioTrack> > new_audio_track (
+               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);
-       //boost::shared_ptr<Route>     new_midi_route (uint32_t how_many = 1);
+       std::list<boost::shared_ptr<MidiTrack> > new_midi_track (
+               TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1
+               );
 
        void   remove_route (boost::shared_ptr<Route>);
        void   resort_routes ();
@@ -541,12 +544,11 @@ class Session : public PBD::StatefulDestructible
                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_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&);
@@ -555,7 +557,7 @@ class Session : public PBD::StatefulDestructible
        void smpte_duration_string (char *, nframes_t) const;
 
        void           set_smpte_offset (nframes_t);
-       nframes_t smpte_offset () const { return _smpte_offset; }
+       nframes_t      smpte_offset () const { return _smpte_offset; }
        void           set_smpte_offset_negative (bool);
        bool           smpte_offset_negative () const { return _smpte_offset_negative; }
 
@@ -565,12 +567,12 @@ class Session : public PBD::StatefulDestructible
        static sigc::signal<void> EndTimeChanged;
        static sigc::signal<void> SMPTEOffsetChanged;
 
-       void        request_slave_source (SlaveSource);
-       bool        synced_to_jack() const { return Config->get_slave_source() == JACK; }
+       void   request_slave_source (SlaveSource);
+       bool   synced_to_jack() const { return Config->get_slave_source() == JACK; }
 
-       float       transport_speed() const { return _transport_speed; }
-       bool        transport_stopped() const { return _transport_speed == 0.0f; }
-       bool        transport_rolling() const { return _transport_speed != 0.0f; }
+       double transport_speed() const { return _transport_speed; }
+       bool   transport_stopped() const { return _transport_speed == 0.0f; }
+       bool   transport_rolling() const { return _transport_speed != 0.0f; }
 
        void set_silent (bool yn);
        bool silent () { return _silent; }
@@ -581,7 +583,7 @@ class Session : public PBD::StatefulDestructible
 
        /// 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;
-       
+
        /* region info  */
 
        void add_regions (std::vector<boost::shared_ptr<Region> >&);
@@ -590,9 +592,9 @@ class Session : public PBD::StatefulDestructible
        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>);
 
@@ -606,28 +608,28 @@ class Session : public PBD::StatefulDestructible
 
        /* source management */
 
-       struct import_status : public InterThreadInfo {
-           string doing_what;
-
-           /* control info */
-           SrcQuality quality;
-           volatile bool freeze;
-           std::vector<Glib::ustring> paths;
-           bool replace_existing_source;
+       struct ImportStatus : public InterThreadInfo {
+               std::string doing_what;
 
-           /* result */
-           SourceList sources;
+               /* 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 (import_status&);
-       bool sample_rate_convert (import_status&, string infile, string& outfile);
-       string build_tmp_convert_name (string file);
+       void import_audiofiles (ImportStatus&);
+       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;
@@ -637,7 +639,7 @@ class Session : public PBD::StatefulDestructible
        void remove_source (boost::weak_ptr<Source>);
 
        struct cleanup_report {
-               vector<string> paths;
+               std::vector<std::string> paths;
                int64_t        space;
        };
 
@@ -649,23 +651,19 @@ class Session : public PBD::StatefulDestructible
 
        int remove_last_capture ();
 
-       /* handlers should return -1 for "stop cleanup", 0 for
-          "yes, delete this playlist" and 1 for "no, don't delete
-          this playlist.
+       /** handlers should return -1 for "stop cleanup",
+           0 for "yes, delete this playlist",
+           1 for "no, don't delete this playlist".
        */
-
        sigc::signal<int,boost::shared_ptr<ARDOUR::Playlist> > AskAboutPlaylistDeletion;
 
-       /* handlers should return 0 for "ignore the rate mismatch"
-          and !0 for "do not use this session"
+       /** handlers should return 0 for "ignore the rate mismatch",
+           !0 for "do not use this session"
        */
-
        static sigc::signal<int,nframes_t, nframes_t> AskAboutSampleRateMismatch;
 
-       /* handlers should return !0 for use pending state, 0 for
-          ignore it.
+       /** handlers should return !0 for use pending state, 0 for ignore it.
        */
-
        static sigc::signal<int> AskAboutPendingState;
 
        boost::shared_ptr<AudioFileSource> create_audio_source_for_session (ARDOUR::AudioDiskstream&, uint32_t which_channel, bool destructive);
@@ -677,7 +675,7 @@ class Session : public PBD::StatefulDestructible
 
        /* 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;
@@ -690,7 +688,7 @@ class Session : public PBD::StatefulDestructible
 
        /* 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 *);
 
@@ -699,7 +697,6 @@ class Session : public PBD::StatefulDestructible
        sigc::signal<void> NamedSelectionRemoved;
 
        /* Curves and AutomationLists (TODO when they go away) */
-       void add_curve(Evoral::Curve*);
        void add_automation_list(AutomationList*);
 
        /* fade curves */
@@ -720,16 +717,19 @@ class Session : public PBD::StatefulDestructible
 
        /* 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);
+       boost::shared_ptr<Region> write_one_track (AudioTrack&, nframes_t start, nframes_t end,
+                       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;
@@ -739,14 +739,14 @@ class Session : public PBD::StatefulDestructible
 
        /* control/master out */
 
-       boost::shared_ptr<IO> control_out() const { return _control_out; }
-       boost::shared_ptr<IO> master_out() const { return _master_out; }
-
-       /* insert/send management */
+       boost::shared_ptr<Route> control_out() const { return _control_out; }
+       boost::shared_ptr<Route> master_out() const { return _master_out; }
 
-       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;
@@ -756,8 +756,10 @@ class Session : public PBD::StatefulDestructible
        }
 
        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 */
@@ -766,21 +768,20 @@ class Session : public PBD::StatefulDestructible
 
        /* I/O bundles */
 
-       void foreach_bundle (sigc::slot<void, boost::shared_ptr<Bundle> >);
        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;
 
-       /* MIDI */
+       /* 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; }
@@ -825,14 +826,15 @@ class Session : public PBD::StatefulDestructible
 
        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;
@@ -845,22 +847,21 @@ class Session : public PBD::StatefulDestructible
 
        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
@@ -871,7 +872,7 @@ class Session : public PBD::StatefulDestructible
 
        class GlobalMuteStateCommand : public GlobalRouteStateCommand
        {
-         public:
+       public:
                GlobalMuteStateCommand(Session &, void *src);
                GlobalMuteStateCommand (Session&, const XMLNode&);
                void operator()(); // redo
@@ -882,7 +883,7 @@ class Session : public PBD::StatefulDestructible
 
        class GlobalRecordEnableStateCommand : public GlobalRouteStateCommand
        {
-         public:
+       public:
                GlobalRecordEnableStateCommand(Session &, void *src);
                GlobalRecordEnableStateCommand (Session&, const XMLNode&);
                void operator()(); // redo
@@ -893,16 +894,16 @@ class Session : public PBD::StatefulDestructible
 
        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;
@@ -911,7 +912,7 @@ class Session : public PBD::StatefulDestructible
 
        /* clicking */
 
-       boost::shared_ptr<IO>  click_io() { return _click_io; }
+       boost::shared_ptr<IO> click_io() { return _click_io; }
 
        /* disk, buffer loads */
 
@@ -928,8 +929,8 @@ class Session : public PBD::StatefulDestructible
 
        /* ranges */
 
-       void set_audio_range (list<AudioRange>&);
-       void set_music_range (list<MusicRange>&);
+       void set_audio_range (std::list<AudioRange>&);
+       void set_music_range (std::list<MusicRange>&);
 
        void request_play_range (bool yn);
        bool get_play_range () const { return _play_range; }
@@ -939,21 +940,16 @@ class Session : public PBD::StatefulDestructible
        gain_t* gain_automation_buffer () const { return _gain_automation_buffer; }
        pan_t** pan_automation_buffer () const  { return _pan_automation_buffer; }
 
-       /* buffers for conversion */
-       enum RunContext {
-               ButlerContext = 0,
-               TransportContext,
-               ExportContext
-       };
+       void ensure_buffer_set (BufferSet& buffers, const ChanCount& howmany);
 
        /* VST support */
 
        static long vst_callback (AEffect* effect,
-                                 long opcode,
-                                 long index,
-                                 long value,
-                                 void* ptr,
-                                 float opt);
+                       long opcode,
+                       long index,
+                       long value,
+                       void* ptr,
+                       float opt);
 
        static sigc::signal<void> SendFeedback;
 
@@ -964,6 +960,14 @@ class Session : public PBD::StatefulDestructible
        void add_controllable (boost::shared_ptr<PBD::Controllable>);
        void remove_controllable (PBD::Controllable*);
 
+       SessionMetadata & metadata () { return *_metadata; }
+
+       SessionConfiguration config;
+
+       bool exporting () const {
+               return _exporting;
+       }
+
   protected:
        friend class AudioEngine;
        void set_block_size (nframes_t nframes);
@@ -980,7 +984,7 @@ class Session : public PBD::StatefulDestructible
        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 ();
@@ -1015,13 +1019,16 @@ class Session : public PBD::StatefulDestructible
        Location*                start_location;
        Slave*                  _slave;
        bool                    _silent;
-       volatile float          _transport_speed;
-       volatile float          _desired_transport_speed;
-       float                   _last_transport_speed;
+
+    // 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;
        nframes_t                maximum_output_latency;
-       nframes_t                last_stop_frame;
        volatile nframes64_t    _requested_return_frame;
        BufferSet*              _scratch_buffers;
        BufferSet*              _silent_buffers;
@@ -1033,10 +1040,12 @@ class Session : public PBD::StatefulDestructible
        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;
 
        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 ();
        }
 
@@ -1051,6 +1060,10 @@ class Session : public PBD::StatefulDestructible
        void process_export         (nframes_t);
        int  process_export_fw      (nframes_t);
 
+       void block_processing() { g_atomic_int_set (&processing_prohibited, 1); }
+       void unblock_processing() { g_atomic_int_set (&processing_prohibited, 0); }
+       bool processing_blocked() const { return g_atomic_int_get (&processing_prohibited); }
+
        /* slave tracking */
 
        static const int delta_accumulator_size = 25;
@@ -1070,7 +1083,12 @@ class Session : public PBD::StatefulDestructible
        nframes_t slave_wait_end;
 
        void reset_slave_state ();
-       bool follow_slave (nframes_t, nframes_t);
+       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 follow_slave_silently(nframes_t nframes, float slave_speed);
+
        void set_slave_source (SlaveSource);
 
        SlaveSource post_export_slave;
@@ -1078,26 +1096,26 @@ class Session : public PBD::StatefulDestructible
 
        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 ();
        void commit_diskstreams (nframes_t, bool& session_requires_butler);
-       int  process_routes (nframes_t, nframes_t);
-       int  silent_process_routes (nframes_t, nframes_t);
+       int  process_routes (nframes_t);
+       int  silent_process_routes (nframes_t);
 
        bool get_rec_monitors_input () {
                if (actively_recording()) {
                        return true;
                } else {
-                       if (Config->get_auto_input()) {
+                       if (config.get_auto_input()) {
                                return false;
                        } else {
                                return true;
@@ -1106,7 +1124,6 @@ class Session : public PBD::StatefulDestructible
        }
 
        int get_transport_declick_required () {
-
                if (transport_sub_state & PendingDeclickIn) {
                        transport_sub_state &= ~PendingDeclickIn;
                        return 1;
@@ -1118,14 +1135,15 @@ class Session : public PBD::StatefulDestructible
        }
 
        bool maybe_stop (nframes_t limit) {
-               if ((_transport_speed > 0.0f && _transport_frame >= limit) || (_transport_speed < 0.0f && _transport_frame == 0)) {
+               if ( (_transport_speed > 0.0f && _transport_frame >= limit)
+                               || (_transport_speed < 0.0f && _transport_frame == 0) ) {
                        stop_transport ();
                        return true;
                }
                return false;
        }
 
-       bool maybe_sync_start (nframes_t&, nframes_t&);
+       bool maybe_sync_start (nframes_t&);
 
        void check_declick_out ();
 
@@ -1134,8 +1152,8 @@ class Session : public PBD::StatefulDestructible
        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;
@@ -1151,17 +1169,15 @@ class Session : public PBD::StatefulDestructible
        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;
@@ -1172,24 +1188,17 @@ class Session : public PBD::StatefulDestructible
        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];
+       Butler* butler;
 
-       inline bool transport_work_requested() const { return g_atomic_int_get(&butler_should_do_transport_work); }
+       bool transport_work_requested() const;
 
        struct ButlerRequest {
-           enum Type {
-                   Wake,
-                   Run,
-                   Pause,
-                   Quit
-           };
+               enum Type {
+                       Wake,
+                       Run,
+                       Pause,
+                       Quit
+               };
        };
 
        enum PostTransportWork {
@@ -1211,14 +1220,15 @@ class Session : public PBD::StatefulDestructible
        };
 
        static const PostTransportWork ProcessCannotProceedMask =
-               PostTransportWork (PostTransportInputChange|
-                                  PostTransportSpeed|
-                                  PostTransportReverse|
-                                  PostTransportCurveRealloc|
-                                  PostTransportScrub|
-                                  PostTransportAudition|
-                                  PostTransportLocate|
-                                  PostTransportStop);
+               PostTransportWork (
+                               PostTransportInputChange|
+                               PostTransportSpeed|
+                               PostTransportReverse|
+                               PostTransportCurveRealloc|
+                               PostTransportScrub|
+                               PostTransportAudition|
+                               PostTransportLocate|
+                               PostTransportStop);
 
        PostTransportWork post_transport_work;
 
@@ -1252,7 +1262,7 @@ class Session : public PBD::StatefulDestructible
        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;
@@ -1273,7 +1283,7 @@ class Session : public PBD::StatefulDestructible
        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 ();
@@ -1333,7 +1343,7 @@ class Session : public PBD::StatefulDestructible
        double step_speed;
 
        typedef sigc::slot<bool> MidiTimeoutCallback;
-       typedef list<MidiTimeoutCallback> MidiTimeoutList;
+       typedef std::list<MidiTimeoutCallback> MidiTimeoutList;
 
        MidiTimeoutList midi_timeouts;
        bool mmc_step_timeout ();
@@ -1367,21 +1377,18 @@ class Session : public PBD::StatefulDestructible
 
        void reset_record_status ();
 
-       int no_roll (nframes_t nframes, nframes_t offset);
+       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); }
 
        struct MIDIRequest {
-
-           enum Type {
-                   PortChange,
-                   Quit
-           };
-
-           Type type;
-
-           MIDIRequest () {}
+               enum Type {
+                       PortChange,
+                       Quit
+               };
+               Type type;
        };
 
        Glib::Mutex  midi_lock;
@@ -1404,8 +1411,8 @@ class Session : public PBD::StatefulDestructible
        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 set_diskstream_speed (Diskstream*, float speed);
-       void set_transport_speed (float speed, bool abort = false);
+       void set_diskstream_speed (Diskstream*, double speed);
+       void set_transport_speed (double speed, bool abort = false);
        void stop_transport (bool abort = false);
        void start_transport ();
        void realtime_stop (bool abort);
@@ -1424,13 +1431,9 @@ class Session : public PBD::StatefulDestructible
 
        /* 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 */
 
@@ -1438,28 +1441,28 @@ class Session : public PBD::StatefulDestructible
 
        uint32_t audio_dstream_buffer_size;
        uint32_t midi_dstream_buffer_size;
-       int  load_diskstreams (const XMLNode&);
+       int load_diskstreams (const XMLNode&);
 
        /* routes stuff */
 
        SerializedRCUManager<RouteList>  routes;
 
-       void   add_routes (RouteList&, bool save);
+       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 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 */
 
@@ -1467,7 +1470,7 @@ class Session : public PBD::StatefulDestructible
        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>);
@@ -1476,6 +1479,8 @@ class Session : public PBD::StatefulDestructible
 
        int load_regions (const XMLNode& node);
 
+       void route_group_changed ();
+
        /* SOURCES */
 
        mutable Glib::Mutex source_lock;
@@ -1487,8 +1492,6 @@ class Session : public PBD::StatefulDestructible
        SourceMap get_sources() { return sources; }
 
   private:
-
-
        int load_sources (const XMLNode& node);
        XMLNode& get_sources_as_xml ();
 
@@ -1497,7 +1500,7 @@ class Session : public PBD::StatefulDestructible
        /* 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;
 
@@ -1506,7 +1509,7 @@ class Session : public PBD::StatefulDestructible
        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 ();
@@ -1515,16 +1518,15 @@ class Session : public PBD::StatefulDestructible
        /* 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 */
-       std::map<PBD::ID, Evoral::Curve*> curves;
        std::map<PBD::ID, AutomationList*> automation_lists;
 
        /* DEFAULT FADE CURVES */
@@ -1547,14 +1549,9 @@ class Session : public PBD::StatefulDestructible
 
        /* 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 *);
@@ -1562,28 +1559,28 @@ class Session : public PBD::StatefulDestructible
        /* S/W RAID */
 
        struct space_and_path {
-           uint32_t blocks; /* 4kB blocks */
-           string path;
+               uint32_t blocks; /* 4kB blocks */
+               std::string path;
 
-           space_and_path() {
-                   blocks = 0;
-           }
+               space_and_path() {
+                       blocks = 0;
+               }
        };
 
        struct space_and_path_ascending_cmp {
-           bool operator() (space_and_path a, space_and_path b) {
-                   return a.blocks > b.blocks;
-           }
+               bool operator() (space_and_path a, space_and_path b) {
+                       return a.blocks > b.blocks;
+               }
        };
 
-       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 ();
+       std::string get_best_session_directory_for_new_source ();
        void refresh_disk_space ();
 
        mutable gint _playback_load;
@@ -1593,16 +1590,14 @@ class Session : public PBD::StatefulDestructible
 
        /* I/O bundles */
 
-       typedef list<boost::shared_ptr<Bundle> > BundleList;
-       mutable Glib::Mutex bundle_lock;
-       BundleList _bundles;
+       SerializedRCUManager<BundleList> _bundles;
        XMLNode* _bundle_xml_node;
        int load_bundles (XMLNode const &);
 
        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 ();
@@ -1624,36 +1619,36 @@ class Session : public PBD::StatefulDestructible
        /* click track */
 
        struct Click {
-           nframes_t start;
-           nframes_t duration;
-           nframes_t offset;
-           const Sample *data;
+               nframes_t start;
+               nframes_t duration;
+               nframes_t offset;
+               const Sample *data;
 
-           Click (nframes_t s, nframes_t d, const Sample *b)
-                   : start (s), duration (d), data (b) { offset = 0; }
+               Click (nframes_t s, nframes_t d, const Sample *b)
+                       : start (s), duration (d), data (b) { offset = 0; }
 
-           void *operator new(size_t ignored) {
-                   return pool.alloc ();
-           };
+               void *operator new (size_t) {
+                       return pool.alloc ();
+               };
 
-           void operator delete(void *ptr, size_t size) {
-                   pool.release (ptr);
-           }
+               void operator delete(void *ptr, size_t /*size*/) {
+                       pool.release (ptr);
+               }
 
-         private:
-           static Pool pool;
+       private:
+               static Pool pool;
        };
 
-       typedef list<Click*> Clicks;
+       typedef std::list<Click*> Clicks;
 
-       Clicks          clicks;
-       bool           _clicking;
+       Clicks                 clicks;
+       bool                  _clicking;
        boost::shared_ptr<IO> _click_io;
-       Sample*         click_data;
-       Sample*         click_emphasis_data;
-       nframes_t  click_length;
-       nframes_t  click_emphasis_length;
-       mutable Glib::RWLock click_lock;
+       Sample*                click_data;
+       Sample*                click_emphasis_data;
+       nframes_t              click_length;
+       nframes_t              click_emphasis_length;
+       mutable Glib::RWLock   click_lock;
 
        static const Sample    default_click[];
        static const nframes_t default_click_length;
@@ -1663,13 +1658,13 @@ class Session : public PBD::StatefulDestructible
        Click *get_click();
        void   setup_click_sounds (int which);
        void   clear_clicks ();
-       void   click (nframes_t start, nframes_t nframes, nframes_t offset);
+       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 ();
@@ -1677,8 +1672,8 @@ class Session : public PBD::StatefulDestructible
        /* 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;
@@ -1688,11 +1683,11 @@ class Session : public PBD::StatefulDestructible
        /* VST support */
 
        long _vst_callback (VSTPlugin*,
-                           long opcode,
-                           long index,
-                           long value,
-                           void* ptr,
-                           float opt);
+                       long opcode,
+                       long index,
+                       long value,
+                       void* ptr,
+                       float opt);
 
        /* number of hardware ports we're using,
           based on max (requested,available)
@@ -1701,13 +1696,15 @@ class Session : public PBD::StatefulDestructible
        uint32_t n_physical_outputs;
        uint32_t n_physical_inputs;
 
+       uint32_t n_physical_audio_outputs;
+       uint32_t n_physical_audio_inputs;
+
+       uint32_t n_physical_midi_outputs;
+       uint32_t n_physical_midi_inputs;
 
        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;
@@ -1716,7 +1713,7 @@ class Session : public PBD::StatefulDestructible
        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 ();
 
@@ -1724,12 +1721,13 @@ class Session : public PBD::StatefulDestructible
        void sync_order_keys ();
 
        static bool _disable_all_loaded_plugins;
-       
-       /* Metadata */
 
        SessionMetadata * _metadata;
-  public:
-       SessionMetadata & metadata () { return *_metadata; }
+
+       mutable bool have_looped; ///< Used in ::audible_frame(*)
+
+       void update_have_rec_enabled_diskstream ();
+       gint _have_rec_enabled_diskstream;
 };
 
 } // namespace ARDOUR