Create the session range location as and when the session first gets some content...
[ardour.git] / libs / ardour / ardour / session.h
index 7da21274e1f0dab2e008ed7aa5366d838a545cd2..0f5a73a28032df055e40272cbf2ddc8f20b5398c 100644 (file)
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 
-#include <sndfile.h>
-
 #include <glibmm/thread.h>
 
 #include "pbd/error.h"
-#include "pbd/pool.h"
 #include "pbd/rcu.h"
 #include "pbd/statefuldestructible.h"
+#include "pbd/signals.h"
 #include "pbd/undo.h"
 
 #include "midi++/mmc.h"
 #include "midi++/types.h"
 
-#include "pbd/destructible.h"
-#include "pbd/stateful.h"
-
 #include "ardour/ardour.h"
+#include "ardour/click.h"
 #include "ardour/chan_count.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session_configuration.h"
+#include "ardour/session_event.h"
 #include "ardour/location.h"
-#include "ardour/smpte.h"
+#include "ardour/timecode.h"
 #include "ardour/interpolation.h"
 
+#ifdef HAVE_JACK_SESSION
+#include <jack/session.h>
+#endif
+
 class XMLTree;
 class XMLNode;
 class AEffect;
@@ -67,6 +68,7 @@ namespace MIDI {
 
 namespace PBD {
        class Controllable;
+       class ControllableDescriptor;
 }
 
 namespace Evoral {
@@ -75,7 +77,6 @@ namespace Evoral {
 
 namespace ARDOUR {
 
-class AudioDiskstream;
 class AudioEngine;
 class AudioFileSource;
 class AudioRegion;
@@ -86,21 +87,24 @@ class AutomationList;
 class AuxInput;
 class BufferSet;
 class Bundle;
+class Butler;
 class ControlProtocolInfo;
 class Diskstream;
 class ExportHandler;
 class ExportStatus;
 class IO;
 class IOProcessor;
-class MidiDiskstream;
+class ImportStatus;
 class MidiRegion;
 class MidiSource;
 class MidiTrack;
+class MidiControlUI;
 class NamedSelection;
 class Playlist;
 class PluginInsert;
 class Port;
 class PortInsert;
+class ProcessThread;
 class Processor;
 class Region;
 class Return;
@@ -110,159 +114,59 @@ class SMFSource;
 class Send;
 class SessionDirectory;
 class SessionMetadata;
+class SessionPlaylists;
 class Slave;
 class Source;
 class TempoMap;
 class VSTPlugin;
+class Track;
 
-class Session : public PBD::StatefulDestructible, public boost::noncopyable
-{
-  private:
-       typedef std::pair<boost::weak_ptr<Route>,bool> RouteBooleanState;
-       typedef std::vector<RouteBooleanState> GlobalRouteBooleanState;
-       typedef std::pair<boost::weak_ptr<Route>,MeterPoint> RouteMeterState;
-       typedef std::vector<RouteMeterState> GlobalRouteMeterState;
+extern void setup_enum_writer ();
 
+class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager
+{
   public:
-       enum RecordState {
+        enum RecordState {
                Disabled = 0,
                Enabled = 1,
                Recording = 2
        };
 
-       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;
-               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 std::string& fullpath,
-                       const std::string& snapshot_name,
-                       std::string mix_template = "");
-
-       /* creating a new Session */
+        /* a new session might have non-empty mix_template, an existing session should always have an empty one.
+           the bus profile can be null if no master out bus is required.
+         */
 
        Session (AudioEngine&,
-                       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);
+                 const std::string& fullpath,
+                 const std::string& snapshot_name,
+                 BusProfile* bus_profile = 0,
+                 std::string mix_template = "");
 
        virtual ~Session ();
-
+        
        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;
+       bool path_is_within_session (const std::string&);
 
        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;
+       PBD::Signal0<void> DirtyChanged;
 
        const SessionDirectory& session_directory () const { return *(_session_dir.get()); }
 
-       static sigc::signal<void> AutoBindingOn;
-       static sigc::signal<void> AutoBindingOff;
+       static PBD::Signal0<void> AutoBindingOn;
+       static PBD::Signal0<void> AutoBindingOff;
 
-       static sigc::signal<void,std::string> Dialog;
+       static PBD::Signal1<void,std::string> Dialog;
 
        std::string sound_dir (bool with_path = true) const;
        std::string peak_dir () const;
@@ -288,27 +192,27 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        BufferSet& get_scratch_buffers (ChanCount count = ChanCount::ZERO);
        BufferSet& get_mix_buffers (ChanCount count = ChanCount::ZERO);
 
-       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 (std::string name);
-       bool have_rec_enabled_diskstream () const;
+       bool have_rec_enabled_track () 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; }
-
-       uint32_t get_next_diskstream_id() const { return n_diskstreams(); }
-       uint32_t n_diskstreams() const;
+       void refill_all_track_buffers ();
+       Butler* butler() { return _butler; }
+       void butler_transport_work ();
 
-       typedef std::list<boost::shared_ptr<Diskstream> > DiskstreamList;
+       void refresh_disk_space ();
 
-       int load_routes (const XMLNode&);
+       int load_diskstreams_2X (XMLNode const &, int);
+       
+       int load_routes (const XMLNode&, int);
        boost::shared_ptr<RouteList> get_routes() const {
                return routes.reader ();
        }
 
+       boost::shared_ptr<RouteList> get_routes_with_internal_returns() const;
+
+       boost::shared_ptr<RouteList> get_routes_with_regions_at (nframes64_t const) const;
+
        uint32_t nroutes() const { return routes.reader()->size(); }
        uint32_t ntracks () const;
        uint32_t nbusses () const;
@@ -318,15 +222,16 @@ 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 (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);
 
+        bool io_name_is_legal (const std::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);
@@ -353,85 +258,80 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void maybe_write_autosave ();
 
-       /* Proxy signal for region hidden changes */
-
-       sigc::signal<void,boost::shared_ptr<Region> > RegionHiddenChange;
-
        /* Emitted when all i/o connections are complete */
 
-       sigc::signal<void> IOConnectionsComplete;
+       PBD::Signal0<void> IOConnectionsComplete;
 
        /* Record status signals */
 
-       sigc::signal<void> RecordStateChanged;
+       PBD::Signal0<void> RecordStateChanged;
 
        /* Transport mechanism signals */
 
-       sigc::signal<void> TransportStateChange; /* generic */
-       sigc::signal<void,nframes_t> PositionChanged; /* sent after any non-sequential motion */
-       sigc::signal<void> DurationChanged;
-       sigc::signal<void,nframes_t> Xrun;
-       sigc::signal<void> TransportLooped;
+       PBD::Signal0<void> TransportStateChange; /* generic */
+       PBD::Signal1<void,nframes64_t> PositionChanged; /* sent after any non-sequential motion */
+       PBD::Signal1<void,nframes64_t> Xrun;
+       PBD::Signal0<void> TransportLooped;
 
        /** emitted when a locate has occurred */
-       sigc::signal<void> Located;
+       PBD::Signal0<void> Located;
+
+       PBD::Signal1<void,RouteList&> RouteAdded;
+       PBD::Signal0<void> RouteGroupChanged;
 
-       sigc::signal<void,RouteList&> RouteAdded;
-       sigc::signal<void> RouteGroupChanged;
+       void queue_event (SessionEvent*);
 
        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); config.set_end_marker_is_free (false); }
+       void goto_end ();
+       void goto_start ();
+       void set_session_start (nframes_t);
+       void set_session_end (nframes_t);
        void use_rf_shuttle_speed ();
        void allow_auto_play (bool yn);
        void request_transport_speed (double speed);
-       void request_overwrite_buffer (Diskstream*);
-       void request_diskstream_speed (Diskstream&, double speed);
+       void request_overwrite_buffer (Track *);
+       void request_track_speed (Track *, 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 ();
 
-       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(); }
+       std::pair<nframes_t, nframes_t> get_extent () const;
+       nframes_t current_end_frame () const;
+       nframes_t current_start_frame () const;
        /// "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
        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 */
 
        Locations *locations() { return &_locations; }
 
-       sigc::signal<void,Location*>    auto_loop_location_changed;
-       sigc::signal<void,Location*>    auto_punch_location_changed;
-       sigc::signal<void>              locations_modified;
+       PBD::Signal1<void,Location*>    auto_loop_location_changed;
+       PBD::Signal1<void,Location*>    auto_punch_location_changed;
+       PBD::Signal0<void>              locations_modified;
 
        void set_auto_punch_location (Location *);
        void set_auto_loop_location (Location *);
@@ -439,16 +339,15 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void reset_input_monitor_state ();
 
-       void add_event (nframes_t action_frame, Event::Type type, nframes_t target_frame = 0);
-       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 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; }
 
-       int save_state (std::string snapshot_name, bool pending = false);
+#ifdef HAVE_JACK_SESSION 
+       void jack_session_event (jack_session_event_t* event);
+#endif
+       int save_state (std::string snapshot_name, bool pending = false, bool switch_to_snapshot = false);
        int restore_state (std::string snapshot_name);
        int save_template (std::string template_name);
        int save_history (std::string snapshot_name = "");
@@ -460,14 +359,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,std::string> StateSaved;
-       sigc::signal<void> StateReady;
+       PBD::Signal1<void,std::string> StateSaved;
+       PBD::Signal0<void> StateReady;
 
        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
@@ -491,12 +390,12 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        RouteGroup *route_group_by_name (std::string);
 
-       sigc::signal<void,RouteGroup*> route_group_added;
-       sigc::signal<void>             route_group_removed;
+       PBD::Signal1<void,RouteGroup*> route_group_added;
+       PBD::Signal0<void>             route_group_removed;
 
-       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);
+       void foreach_route_group (boost::function<void(RouteGroup*)> f) {
+               for (std::list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
+                       f (*i);
                }
        }
 
@@ -505,8 +404,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        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);
+
+       RouteList new_audio_route (bool aux, 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, RouteGroup* route_group = 0, uint32_t how_many = 1
@@ -521,13 +420,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        AudioEngine & engine() { return _engine; }
        AudioEngine const & engine () const { return _engine; }
 
-       int32_t  max_level;
-       int32_t  min_level;
-
        /* 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 {
@@ -545,28 +441,29 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        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 PBD::Signal0<void> StartTimeChanged;
+       static PBD::Signal0<void> EndTimeChanged;
+       static PBD::Signal0<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 (Slave*);
+        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; }
@@ -579,47 +476,21 @@ 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;
-       
-       /* region info  */
+       /// signals the current transport position in frames, bbt and timecode time (in that order)
+       PBD::Signal3<void,const nframes_t&, const BBT_Time&, const Timecode::Time&> tick;
 
-       void add_regions (std::vector<boost::shared_ptr<Region> >&);
+       /* region info  */
 
-       sigc::signal<void,boost::weak_ptr<Region> > RegionAdded;
-       sigc::signal<void,std::vector<boost::weak_ptr<Region> >& > RegionsAdded;
-       sigc::signal<void,boost::weak_ptr<Region> > RegionRemoved;
+       boost::shared_ptr<Region> find_whole_file_parent (boost::shared_ptr<Region const>) const;
 
-       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>);
-
-       void find_equivalent_playlist_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >& result);
-
        boost::shared_ptr<Region>      XMLRegionFactory (const XMLNode&, bool full);
        boost::shared_ptr<AudioRegion> XMLAudioRegionFactory (const XMLNode&, bool full);
        boost::shared_ptr<MidiRegion>  XMLMidiRegionFactory (const XMLNode&, bool full);
 
-       template<class T> void foreach_region (T *obj, void (T::*func)(boost::shared_ptr<Region>));
-
        /* source management */
 
-       struct ImportStatus : public InterThreadInfo {
-               std::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&, std::string infile, std::string& outfile);
        std::string build_tmp_convert_name (std::string file);
@@ -627,22 +498,16 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        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;
-       static sigc::signal<void, std::string, std::string> Exported;
+       PBD::Signal1<int,nframes_t> ProcessExport;
+       static PBD::Signal2<void,std::string, std::string> Exported;
 
        void add_source (boost::shared_ptr<Source>);
        void remove_source (boost::weak_ptr<Source>);
 
-       struct cleanup_report {
-               std::vector<std::string> paths;
-               int64_t        space;
-       };
-
-       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> >);
@@ -653,46 +518,35 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
            0 for "yes, delete this playlist",
            1 for "no, don't delete this playlist".
        */
-       sigc::signal<int,boost::shared_ptr<ARDOUR::Playlist> > AskAboutPlaylistDeletion;
+       static PBD::Signal1<int,boost::shared_ptr<Playlist> >  AskAboutPlaylistDeletion;
 
        /** 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;
+       static PBD::Signal2<int,nframes_t, nframes_t> AskAboutSampleRateMismatch;
 
        /** handlers should return !0 for use pending state, 0 for ignore it.
        */
-       static sigc::signal<int> AskAboutPendingState;
+       static PBD::Signal0<int> AskAboutPendingState;
 
-       boost::shared_ptr<AudioFileSource> create_audio_source_for_session (ARDOUR::AudioDiskstream&, uint32_t which_channel, bool destructive);
+       boost::shared_ptr<AudioFileSource> create_audio_source_for_session (size_t, std::string const &, uint32_t, bool);
 
-       boost::shared_ptr<MidiSource> create_midi_source_for_session (ARDOUR::MidiDiskstream&);
+       boost::shared_ptr<MidiSource> create_midi_source_for_session (std::string const &);
 
        boost::shared_ptr<Source> source_by_id (const PBD::ID&);
        boost::shared_ptr<Source> source_by_path_and_channel (const Glib::ustring&, uint16_t);
 
-       /* playlist management */
-
-       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;
-       sigc::signal<void,boost::shared_ptr<Playlist> > PlaylistRemoved;
-
-       uint32_t n_playlists() const;
-
-       template<class T> void foreach_playlist (T *obj, void (T::*func)(boost::shared_ptr<Playlist>));
-       void get_playlists (std::vector<boost::shared_ptr<Playlist> >&);
 
        /* named selections */
 
-       NamedSelection* named_selection_by_name (std::string name);
-       void add_named_selection (NamedSelection *);
-       void remove_named_selection (NamedSelection *);
+       boost::shared_ptr<NamedSelection> named_selection_by_name (std::string name);
+       void add_named_selection (boost::shared_ptr<NamedSelection>);
+       void remove_named_selection (boost::shared_ptr<NamedSelection>);
 
-       template<class T> void foreach_named_selection (T& obj, void (T::*func)(NamedSelection&));
-       sigc::signal<void> NamedSelectionAdded;
-       sigc::signal<void> NamedSelectionRemoved;
+       template<class T> void foreach_named_selection (T& obj, void (T::*func)(boost::shared_ptr<NamedSelection>));
+       PBD::Signal0<void> NamedSelectionAdded;
+       PBD::Signal0<void> NamedSelectionRemoved;
 
        /* Curves and AutomationLists (TODO when they go away) */
        void add_automation_list(AutomationList*);
@@ -711,33 +565,37 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void cancel_audition ();
        bool is_auditioning () const;
 
-       sigc::signal<void,bool> AuditionActive;
+       PBD::Signal1<void,bool> AuditionActive;
 
        /* flattening stuff */
 
        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&);
+                       bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
+                       bool enable_processing = true);
+       int freeze_all (InterThreadInfo&);
 
        /* session-wide solo/mute/rec-enable */
 
        bool soloing() const { return _non_soloed_outs_muted; }
        bool listening() const { return _listen_cnt > 0; }
+        bool solo_isolated() const { return _solo_isolated_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;
+       static const SessionEvent::RTeventCallback rt_cleanup;
 
-       void record_disenable_all ();
-       void record_enable_all ();
+       void set_solo (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
+       void set_just_one_solo (boost::shared_ptr<Route>, bool, SessionEvent::RTeventCallback after = rt_cleanup);
+       void set_mute (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
+       void set_listen (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
+       void set_record_enable (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
+        void set_solo_isolated (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
 
+       PBD::Signal1<void,bool> SoloActive;
+       PBD::Signal0<void> SoloChanged;
+        PBD::Signal0<void> IsolatedChanged;
+       
        /* control/master out */
 
-       boost::shared_ptr<Route> control_out() const { return _control_out; }
+       boost::shared_ptr<Route> monitor_out() const { return _monitor_out; }
        boost::shared_ptr<Route> master_out() const { return _master_out; }
 
        void globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p);
@@ -759,6 +617,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void mark_send_id (uint32_t);
        void mark_return_id (uint32_t);
        void mark_insert_id (uint32_t);
+       void unmark_send_id (uint32_t);
+       void unmark_return_id (uint32_t);
+       void unmark_insert_id (uint32_t);
 
        /* s/w "RAID" management */
 
@@ -770,8 +631,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void remove_bundle (boost::shared_ptr<Bundle>);
        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;
+       PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleAdded;
+       PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleRemoved;
 
        /* MIDI control */
 
@@ -785,10 +646,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        MIDI::Port *midi_port() const { return _midi_port; }
        MIDI::Port *midi_clock_port() const { return _midi_clock_port; }
 
-       sigc::signal<void> MTC_PortChanged;
-       sigc::signal<void> MMC_PortChanged;
-       sigc::signal<void> MIDI_PortChanged;
-       sigc::signal<void> MIDIClock_PortChanged;
+       PBD::Signal0<void> MTC_PortChanged;
+       PBD::Signal0<void> MMC_PortChanged;
+       PBD::Signal0<void> MIDI_PortChanged;
+       PBD::Signal0<void> MIDIClock_PortChanged;
 
        void set_trace_midi_input (bool, MIDI::Port* port = 0);
        void set_trace_midi_output (bool, MIDI::Port* port = 0);
@@ -805,7 +666,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void stop_scrub ();
        void set_scrub_speed (float);
        nframes_t scrub_buffer_size() const;
-       sigc::signal<void> ScrubReady;
+       PBD::Signal0<void> ScrubReady;
 
        /* History (for editors, mixers, UIs etc.) */
 
@@ -830,84 +691,20 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void begin_reversible_command (const std::string& cmd_name);
        void commit_reversible_command (Command* cmd = 0);
 
+       UndoTransaction* start_reversible_command (const std::string& cmd_name);
+       void finish_reversible_command (UndoTransaction&);
+
        void add_command (Command *const cmd) {
                assert(!_current_trans.empty ());
                _current_trans.top()->add_command (cmd);
        }
 
-       std::map<PBD::ID, PBD::StatefulThingWithGoingAway*> registry;
+       std::map<PBD::ID,PBD::StatefulDestructible*> registry;
 
        // these commands are implemented in libs/ardour/session_command.cc
        Command* memento_command_factory(XMLNode* n);
-       void register_with_memento_command_factory(PBD::ID, PBD::StatefulThingWithGoingAway*);
-
-       Command* global_state_command_factory (const XMLNode& n);
-
-       class GlobalRouteStateCommand : public Command
-       {
-         public:
-               GlobalRouteStateCommand (Session&, void*);
-               GlobalRouteStateCommand (Session&, const XMLNode& node);
-               int set_state (const XMLNode&);
-               XMLNode& get_state ();
-
-         protected:
-               GlobalRouteBooleanState before, after;
-               Session& sess;
-               void* src;
-
-       };
-
-       class GlobalSoloStateCommand : public GlobalRouteStateCommand
-       {
-         public:
-               GlobalSoloStateCommand (Session &, void *src);
-               GlobalSoloStateCommand (Session&, const XMLNode&);
-               void operator()(); //redo
-               void undo();
-               XMLNode &get_state();
-               void mark();
-       };
-
-       class GlobalMuteStateCommand : public GlobalRouteStateCommand
-       {
-         public:
-               GlobalMuteStateCommand(Session &, void *src);
-               GlobalMuteStateCommand (Session&, const XMLNode&);
-               void operator()(); // redo
-               void undo();
-               XMLNode &get_state();
-               void mark();
-       };
-
-       class GlobalRecordEnableStateCommand : public GlobalRouteStateCommand
-       {
-         public:
-               GlobalRecordEnableStateCommand(Session &, void *src);
-               GlobalRecordEnableStateCommand (Session&, const XMLNode&);
-               void operator()(); // redo
-               void undo();
-               XMLNode &get_state();
-               void mark();
-       };
-
-       class GlobalMeteringStateCommand : public Command
-       {
-         public:
-               GlobalMeteringStateCommand(Session &, void *src);
-               GlobalMeteringStateCommand (Session&, const XMLNode&);
-               void operator()();
-               void undo();
-               XMLNode &get_state();
-               int set_state (const XMLNode&);
-               void mark();
-
-         protected:
-               Session& sess;
-               void* src;
-               GlobalRouteMeterState before;
-               GlobalRouteMeterState after;
-       };
+       Command* stateful_diff_command_factory (XMLNode *);
+       void register_with_memento_command_factory(PBD::ID, PBD::StatefulDestructible*);
 
        /* clicking */
 
@@ -923,22 +720,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 (std::list<AudioRange>&);
-       void set_music_range (std::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; }
-       
+       gain_t* gain_automation_buffer () const;
+       pan_t** pan_automation_buffer () const;
+
        void ensure_buffer_set (BufferSet& buffers, const ChanCount& howmany);
 
        /* VST support */
@@ -950,11 +741,12 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                        void* ptr,
                        float opt);
 
-       static sigc::signal<void> SendFeedback;
+       static PBD::Signal0<void> SendFeedback;
 
        /* Controllables */
 
        boost::shared_ptr<PBD::Controllable> controllable_by_id (const PBD::ID&);
+       boost::shared_ptr<PBD::Controllable> controllable_by_descriptor (const PBD::ControllableDescriptor&);
 
        void add_controllable (boost::shared_ptr<PBD::Controllable>);
        void remove_controllable (PBD::Controllable*);
@@ -966,28 +758,55 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        bool exporting () const {
                return _exporting;
        }
+
+       /* this is a private enum, but setup_enum_writer() needs it,
+          and i can't find a way to give that function
+          friend access. sigh.
+       */
+
+       enum PostTransportWork {
+               PostTransportStop               = 0x1,
+               PostTransportDisableRecord      = 0x2,
+               PostTransportPosition           = 0x8,
+               PostTransportDidRecord          = 0x20,
+               PostTransportDuration           = 0x40,
+               PostTransportLocate             = 0x80,
+               PostTransportRoll               = 0x200,
+               PostTransportAbort              = 0x800,
+               PostTransportOverWrite          = 0x1000,
+               PostTransportSpeed              = 0x2000,
+               PostTransportAudition           = 0x4000,
+               PostTransportScrub              = 0x8000,
+               PostTransportReverse            = 0x10000,
+               PostTransportInputChange        = 0x20000,
+               PostTransportCurveRealloc       = 0x40000,
+               PostTransportClearSubstate      = 0x80000
+       };
+
+       enum SlaveState {
+               Stopped,
+               Waiting,
+               Running
+       };
        
+       SlaveState slave_state() const { return _slave_state; }
+
+       boost::shared_ptr<SessionPlaylists> playlists;
+
   protected:
        friend class AudioEngine;
        void set_block_size (nframes_t nframes);
        void set_frame_rate (nframes_t nframes);
 
-  protected:
-       friend class Diskstream;
-       void stop_butler ();
-       void wait_till_butler_finished();
-
   protected:
        friend class Route;
        void schedule_curve_reallocation ();
        void update_latency_compensation (bool, bool);
 
   private:
-       int  create (bool& new_session, const std::string& mix_template, nframes_t initial_length);
+       int  create (const std::string& mix_template, BusProfile*);
        void destroy ();
 
-       nframes_t compute_initial_length ();
-
        enum SubState {
                PendingDeclickIn   = 0x1,
                PendingDeclickOut  = 0x2,
@@ -1013,25 +832,21 @@ 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;
-       Location*                end_location;
-       Location*                start_location;
+       volatile nframes64_t    _transport_frame;
+       Location*               _session_range_location; ///< session range, or 0 if there is nothing in the session yet
        Slave*                  _slave;
        bool                    _silent;
-       
+
     // 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;
-       BufferSet*              _silent_buffers;
-       BufferSet*              _mix_buffers;
        nframes_t                current_block_size;
        nframes_t               _worst_output_latency;
        nframes_t               _worst_input_latency;
@@ -1041,6 +856,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        float                   _meter_falloff;
        bool                    _non_soloed_outs_muted;
        uint32_t                _listen_cnt;
+       uint32_t                _solo_isolated_cnt;
+       bool                    _writable;
+       bool                    _was_seamless;
 
        void set_worst_io_latencies ();
        void set_worst_io_latencies_x (IOChange, void *) {
@@ -1049,7 +867,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void update_latency_compensation_proxy (void* ignored);
 
-       void ensure_buffers (ChanCount howmany);
+       void ensure_buffers (ChanCount howmany = ChanCount::ZERO);
 
        void process_scrub          (nframes_t);
        void process_without_events (nframes_t);
@@ -1062,6 +880,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void unblock_processing() { g_atomic_int_set (&processing_prohibited, 0); }
        bool processing_blocked() const { return g_atomic_int_get (&processing_prohibited); }
 
+        Glib::Mutex                process_thread_lock;
+        std::list<ProcessThread*>  process_threads;
+
        /* slave tracking */
 
        static const int delta_accumulator_size = 25;
@@ -1071,43 +892,37 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        int  average_dir;
        bool have_first_delta_accumulator;
 
-       enum SlaveState {
-               Stopped,
-               Waiting,
-               Running
-       };
-
-       SlaveState slave_state;
+       SlaveState _slave_state;
        nframes_t slave_wait_end;
 
        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);
        void follow_slave_silently(nframes_t nframes, float slave_speed);
-       
-       void set_slave_source (SlaveSource);
 
-       SlaveSource post_export_slave;
+        void switch_to_sync_source (SyncSource); /* !RT context */
+        void drop_sync_source ();  /* !RT context */
+        void use_sync_source (Slave*); /* RT context */
+
+        bool post_export_sync;
        nframes_t post_export_position;
 
        bool _exporting;
-       bool _exporting_realtime;
-       
+       bool _export_rolling;
+
        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);
-       int  silent_process_routes (nframes_t);
+       PBD::ScopedConnection export_freewheel_connection;
+
+       void get_track_statistics ();
+       int  process_routes (nframes_t, bool& need_butler);
+       int  silent_process_routes (nframes_t, bool& need_butler);
 
        bool get_rec_monitors_input () {
                if (actively_recording()) {
@@ -1132,15 +947,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 ();
@@ -1152,6 +959,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        MIDI::Port*             _midi_clock_port;
        std::string             _path;
        std::string             _name;
+        bool                    _is_new;
        bool                     session_send_mmc;
        bool                     session_send_mtc;
        bool                     session_midi_feedback;
@@ -1161,16 +969,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        boost::scoped_ptr<SessionDirectory> _session_dir;
 
-       RingBuffer<Event*> pending_events;
-
        void hookup_io ();
        void when_engine_running ();
        void graph_reordered ();
 
        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();
@@ -1178,6 +984,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        int      load_state (std::string snapshot_name);
 
        nframes_t _last_roll_location;
+       nframes_t _last_roll_or_reversal_location;
        nframes_t _last_record_location;
 
        bool              pending_locate_roll;
@@ -1186,28 +993,9 @@ 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;
 
+#if 0 // these should be here, see comments in their other location above
        enum PostTransportWork {
                PostTransportStop               = 0x1,
                PostTransportDisableRecord      = 0x2,
@@ -1223,9 +1011,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                PostTransportScrub              = 0x8000,
                PostTransportReverse            = 0x10000,
                PostTransportInputChange        = 0x20000,
-               PostTransportCurveRealloc       = 0x40000
+               PostTransportCurveRealloc       = 0x40000,
+               PostTransportClearSubstate      = 0x80000
        };
-
+#endif
        static const PostTransportWork ProcessCannotProceedMask =
                PostTransportWork (
                                PostTransportInputChange|
@@ -1235,16 +1024,13 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
                                PostTransportScrub|
                                PostTransportAudition|
                                PostTransportLocate|
-                               PostTransportStop);
-
-       PostTransportWork post_transport_work;
+                               PostTransportStop|
+                               PostTransportClearSubstate);
 
-       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;
@@ -1257,42 +1043,17 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        void              locations_added (Location*);
        void              handle_locations_changed (Locations::LocationList&);
 
-       sigc::connection auto_punch_start_changed_connection;
-       sigc::connection auto_punch_end_changed_connection;
-       sigc::connection auto_punch_changed_connection;
+       PBD::ScopedConnectionList punch_connections;
        void             auto_punch_start_changed (Location *);
        void             auto_punch_end_changed (Location *);
        void             auto_punch_changed (Location *);
 
-       sigc::connection auto_loop_start_changed_connection;
-       sigc::connection auto_loop_end_changed_connection;
-       sigc::connection auto_loop_changed_connection;
+       PBD::ScopedConnectionList loop_connections;
        void             auto_loop_changed (Location *);
 
-       typedef std::list<Event *> Events;
-       Events           events;
-       Events           immediate_events;
-       Events::iterator next_event;
-
-       /* there can only ever be one of each of these */
-
-       Event *auto_loop_event;
-       Event *punch_out_event;
-       Event *punch_in_event;
-
-       /* events */
-
-       void dump_events () const;
-       void queue_event (Event *ev);
-       void merge_event (Event*);
-       void replace_event (Event::Type, nframes_t action_frame, nframes_t target = 0);
-       bool _replace_event (Event*);
-       bool _remove_event (Event *);
-       void _clear_event_type (Event::Type);
-
        void first_stage_init (std::string path, std::string snapshot_name);
-       int  second_stage_init (bool new_tracks);
-       void find_current_end ();
+       int  second_stage_init ();
+       void update_session_range_location_marker ();
        void remove_empty_sounds ();
 
        void setup_midi_control ();
@@ -1321,8 +1082,11 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        void *do_work();
 
+       /* SessionEventManager interface */
+
+       void process_event (SessionEvent*);
        void set_next_event ();
-       void process_event (Event *ev);
+       void cleanup_event (SessionEvent*,int);
 
        /* MIDI Machine Control */
 
@@ -1349,7 +1113,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        struct timeval last_mmc_step;
        double step_speed;
 
-       typedef sigc::slot<bool> MidiTimeoutCallback;
+       typedef boost::function<bool()> MidiTimeoutCallback;
        typedef std::list<MidiTimeoutCallback> MidiTimeoutList;
 
        MidiTimeoutList midi_timeouts;
@@ -1357,25 +1121,25 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        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);
@@ -1387,69 +1151,47 @@ 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 {
-                       PortChange,
-                       Quit
-               };
-               Type type;
-       };
-
-       Glib::Mutex  midi_lock;
-       pthread_t    midi_thread;
-       int          midi_request_pipe[2];
-       RingBuffer<MIDIRequest*> midi_requests;
+       MidiControlUI* midi_control_ui;
 
        int           start_midi_thread ();
        void          terminate_midi_thread ();
-       void          poke_midi_thread ();
-       static void *_midi_thread_work (void *arg);
-       void          midi_thread_work ();
-       void          change_midi_ports ();
+
        int           use_config_midi_ports ();
 
        void set_play_loop (bool yn);
-       void overwrite_some_buffers (Diskstream*);
+       void unset_play_loop ();
+       void overwrite_some_buffers (Track *);
        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 set_diskstream_speed (Diskstream*, double speed);
-       void set_transport_speed (double speed, bool abort = false);
-       void stop_transport (bool abort = 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_track_speed (Track *, double speed);
+        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 ();
 
        TempoMap    *_tempo_map;
-       void          tempo_map_changed (Change);
+       void          tempo_map_changed (const PBD::PropertyChange&);
 
        /* edit/mix groups */
 
-       int load_route_groups (const XMLNode&);
+       int load_route_groups (const XMLNode&, int);
 
        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 */
 
        SerializedRCUManager<RouteList>  routes;
@@ -1457,7 +1199,15 @@ 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);
+       boost::shared_ptr<Route> XMLRouteFactory_2X (const XMLNode&, int);
+
+       void route_processors_changed (RouteProcessorChange);
+
+       bool find_route_name (const char* base, uint32_t& id, char* name, size_t name_len);
+       void count_existing_route_channels (ChanCount& in, ChanCount& out);
+       void auto_connect_route (boost::shared_ptr<Route> route,
+               ChanCount& existing_inputs, ChanCount& existing_outputs);
 
        /* mixer stuff */
 
@@ -1465,7 +1215,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        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 route_solo_changed (bool self_solo_change, void *src, boost::weak_ptr<Route>);
+       void route_solo_isolated_changed (void *src, boost::weak_ptr<Route>);
        void update_route_solo_state (boost::shared_ptr<RouteList> r = boost::shared_ptr<RouteList>());
 
        void listen_position_changed ();
@@ -1473,16 +1224,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* REGION MANAGEMENT */
 
-       std::map<std::string,uint32_t> region_name_map;
-       void update_region_name_map (boost::shared_ptr<Region>);
-
        mutable Glib::Mutex region_lock;
-       typedef std::map<PBD::ID,boost::shared_ptr<Region> > RegionList;
-       RegionList regions;
-
-       void add_region (boost::shared_ptr<Region>);
-       void region_changed (Change, boost::weak_ptr<Region>);
-       void remove_region (boost::weak_ptr<Region>);
 
        int load_regions (const XMLNode& node);
 
@@ -1506,26 +1248,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        /* PLAYLISTS */
 
-       mutable Glib::Mutex playlist_lock;
-       typedef std::set<boost::shared_ptr<Playlist> > PlaylistList;
-       PlaylistList playlists;
-       PlaylistList unused_playlists;
-
-       int load_playlists (const XMLNode&);
-       int load_unused_playlists (const XMLNode&);
        void remove_playlist (boost::weak_ptr<Playlist>);
-       void track_playlist (bool, boost::weak_ptr<Playlist>);
-
-       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 track_playlist_changed (boost::weak_ptr<Track>);
 
        /* NAMED SELECTIONS */
 
        mutable Glib::Mutex named_selection_lock;
-       typedef std::set<NamedSelection *> NamedSelectionList;
+       typedef std::set<boost::shared_ptr<NamedSelection> > NamedSelectionList;
        NamedSelectionList named_selections;
 
        int load_named_selections (const XMLNode&);
@@ -1560,9 +1290,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        boost::dynamic_bitset<uint32_t> return_bitset;
        boost::dynamic_bitset<uint32_t> insert_bitset;
 
-       void add_processor (Processor *);
-       void remove_processor (Processor *);
-
        /* S/W RAID */
 
        struct space_and_path {
@@ -1588,7 +1315,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        Glib::Mutex space_lock;
 
        std::string get_best_session_directory_for_new_source ();
-       void refresh_disk_space ();
 
        mutable gint _playback_load;
        mutable gint _capture_load;
@@ -1601,53 +1327,20 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
        XMLNode* _bundle_xml_node;
        int load_bundles (XMLNode const &);
 
-       void reverse_diskstream_buffers ();
+       void reverse_track_buffers ();
 
        UndoHistory                  _history;
        std::stack<UndoTransaction*> _current_trans;
 
-       GlobalRouteBooleanState get_global_route_boolean (bool (Route::*method)(void) const);
-       GlobalRouteMeterState get_global_route_metering ();
-
-       void set_global_route_boolean (GlobalRouteBooleanState s, void (Route::*method)(bool, void*), void *arg);
-       void set_global_route_metering (GlobalRouteMeterState s, void *arg);
-
-       void set_global_mute (GlobalRouteBooleanState s, void *src);
-       void set_global_solo (GlobalRouteBooleanState s, void *src);
-       void set_global_record_enable (GlobalRouteBooleanState s, void *src);
-
        void jack_timebase_callback (jack_transport_state_t, nframes_t, jack_position_t*, int);
        int  jack_sync_callback (jack_transport_state_t, jack_position_t*);
        void reset_jack_connection (jack_client_t* jack);
-       void record_enable_change_all (bool yn);
+       void process_rtop (SessionEvent*);
 
        XMLNode& state(bool);
 
        /* click track */
 
-       struct Click {
-               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; }
-
-               void *operator new (size_t) {
-                       return pool.alloc ();
-               };
-
-               void operator delete(void *ptr, size_t /*size*/) {
-                       pool.release (ptr);
-               }
-
-         private:
-               static Pool pool;
-       };
-
-       typedef std::list<Click*> Clicks;
-
        Clicks                 clicks;
        bool                  _clicking;
        boost::shared_ptr<IO> _click_io;
@@ -1673,19 +1366,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 
        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<Route> _master_out;
-       boost::shared_ptr<Route> _control_out;
-
-       gain_t* _gain_automation_buffer;
-       pan_t** _pan_automation_buffer;
-       void allocate_pan_automation_buffers (nframes_t nframes, uint32_t howmany, bool force);
-       uint32_t _npan_buffers;
+       boost::shared_ptr<Route> _monitor_out;
 
        /* VST support */
 
@@ -1728,13 +1416,31 @@ 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(*)
 
-       void update_have_rec_enabled_diskstream ();
-       gint _have_rec_enabled_diskstream;
+       void update_have_rec_enabled_track ();
+       gint _have_rec_enabled_track;
+
+       static int ask_about_playlist_deletion (boost::shared_ptr<Playlist>);
+
+       /* realtime "apply to set of routes" operations */
+       SessionEvent* get_rt_event (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override, 
+               void (Session::*method) (boost::shared_ptr<RouteList>, bool, bool));
+
+       void rt_set_solo (boost::shared_ptr<RouteList>, bool yn, bool group_override);
+       void rt_set_just_one_solo (boost::shared_ptr<RouteList>, bool yn, bool /* ignored*/ );
+       void rt_set_mute (boost::shared_ptr<RouteList>, bool yn, bool group_override);
+       void rt_set_listen (boost::shared_ptr<RouteList>, bool yn, bool group_override);
+       void rt_set_solo_isolated (boost::shared_ptr<RouteList>, bool yn, bool group_override);
+       void rt_set_record_enable (boost::shared_ptr<RouteList>, bool yn, bool group_override);
+
+       /** temporary list of Diskstreams used only during load of 2.X sessions */
+       std::list<boost::shared_ptr<Diskstream> > _diskstreams_2X;
+
+       void add_session_range_location (nframes_t, nframes_t);
 };
 
 } // namespace ARDOUR