implement TC offset for slave&generator.
[ardour.git] / libs / ardour / ardour / session.h
index b72822bd1c2476ca7319bc4849f0016fd8ab2cb1..9b25f29c8f3b2d504f04bc78ae9516d6d5c7f125 100644 (file)
 #ifndef __ardour_session_h__
 #define __ardour_session_h__
 
+#include "libardour-config.h"
+
 #include <list>
 #include <map>
 #include <set>
-#include <stack>
 #include <string>
 #include <vector>
 #include <stdint.h>
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/error.h"
+#include "pbd/event_loop.h"
 #include "pbd/rcu.h"
 #include "pbd/statefuldestructible.h"
 #include "pbd/signals.h"
 #include "pbd/undo.h"
 
-#include "midi++/mmc.h"
+#include "evoral/types.hpp"
+
 #include "midi++/types.h"
 
+#include "timecode/time.h"
+
 #include "ardour/ardour.h"
-#include "ardour/click.h"
 #include "ardour/chan_count.h"
+#include "ardour/delivery.h"
+#include "ardour/interthread_info.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session_configuration.h"
 #include "ardour/session_event.h"
 #include "ardour/location.h"
-#include "ardour/timecode.h"
 #include "ardour/interpolation.h"
+#include "ardour/route_graph.h"
+
+#ifdef HAVE_JACK_SESSION
+#include <jack/session.h>
+#endif
+
+#ifdef HAVE_LTC
+#include <ltc.h>
+#endif
 
 class XMLTree;
 class XMLNode;
-class AEffect;
+struct _AEffect;
+typedef struct _AEffect AEffect;
 
 namespace MIDI {
        class Port;
+       class MachineControl;
+       class Parser;
 }
 
 namespace PBD {
        class Controllable;
+       class ControllableDescriptor;
 }
 
 namespace Evoral {
@@ -72,7 +90,7 @@ namespace Evoral {
 
 namespace ARDOUR {
 
-class AudioDiskstream;
+class Amp;
 class AudioEngine;
 class AudioFileSource;
 class AudioRegion;
@@ -84,23 +102,25 @@ class AuxInput;
 class BufferSet;
 class Bundle;
 class Butler;
-class ControlProtocolInfo;
+class Click;
 class Diskstream;
 class ExportHandler;
 class ExportStatus;
+class Graph;
 class IO;
 class IOProcessor;
 class ImportStatus;
-class MidiDiskstream;
+class MidiClockTicker;
+class MidiControlUI;
 class MidiRegion;
 class MidiSource;
 class MidiTrack;
-class MidiControlUI;
-class NamedSelection;
 class Playlist;
 class PluginInsert;
+class PluginInfo;
 class Port;
 class PortInsert;
+class ProcessThread;
 class Processor;
 class Region;
 class Return;
@@ -113,8 +133,10 @@ class SessionMetadata;
 class SessionPlaylists;
 class Slave;
 class Source;
+class Speakers;
 class TempoMap;
-class VSTPlugin;
+class Track;
+class WindowsVSTPlugin;
 
 extern void setup_enum_writer ();
 
@@ -127,25 +149,15 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
                Recording = 2
        };
 
-       /* 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 ();
 
@@ -168,22 +180,18 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        const SessionDirectory& session_directory () const { return *(_session_dir.get()); }
 
-       static PBD::Signal0<void> AutoBindingOn;
-       static PBD::Signal0<void> AutoBindingOff;
-
        static PBD::Signal1<void,std::string> Dialog;
 
-       std::string sound_dir (bool with_path = true) const;
-       std::string peak_dir () const;
-       std::string dead_sound_dir () const;
-       std::string automation_dir () const;
-       std::string analysis_dir() const;
-
        int ensure_subdirs ();
 
-       Glib::ustring peak_path (Glib::ustring) const;
+       std::string automation_dir () const;  ///< Automation data
+       std::string analysis_dir () const;    ///< Analysis data
+       std::string plugins_dir () const;     ///< Plugin state
+       std::string externals_dir () const;   ///< Links to external files
 
-       static std::string change_source_path_by_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
+       std::string peak_path (std::string) const;
+
+       std::string change_source_path_by_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
 
        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);
@@ -191,31 +199,23 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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);
+       void process (pframes_t nframes);
 
        BufferSet& get_silent_buffers (ChanCount count = ChanCount::ZERO);
        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 ();
+       void refill_all_track_buffers ();
        Butler* butler() { return _butler; }
        void butler_transport_work ();
 
-       uint32_t get_next_diskstream_id() const { return n_diskstreams(); }
-       uint32_t n_diskstreams() const;
-
        void refresh_disk_space ();
 
-       typedef std::list<boost::shared_ptr<Diskstream> > DiskstreamList;
-
-       SerializedRCUManager<DiskstreamList>& diskstream_list() { return diskstreams; }
+       int load_diskstreams_2X (XMLNode const &, int);
 
        int load_routes (const XMLNode&, int);
        boost::shared_ptr<RouteList> get_routes() const {
@@ -224,7 +224,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        boost::shared_ptr<RouteList> get_routes_with_internal_returns() const;
 
-       boost::shared_ptr<RouteList> get_routes_with_regions_at (nframes64_t const) const;
+       boost::shared_ptr<RouteList> get_routes_with_regions_at (framepos_t const) const;
 
        uint32_t nroutes() const { return routes.reader()->size(); }
        uint32_t ntracks () const;
@@ -238,15 +238,20 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
                bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b);
        };
 
-       void sync_order_keys (std::string const &);
+        void notify_remote_id_change ();
+        void sync_order_keys (RouteSortOrderKey);
 
        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);
 
+       static char session_name_is_legal (const std::string&);
+       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);
+       boost::shared_ptr<Track> track_by_diskstream_id (PBD::ID);
+        void routes_using_input_from (const std::string& str, RouteList& rl);
 
        bool route_name_unique (std::string) const;
        bool route_name_internal (std::string) const;
@@ -259,7 +264,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
                return (RecordState) g_atomic_int_get (&_record_status);
        }
 
-       bool actively_recording () {
+       bool actively_recording () const {
                return record_status() == Recording;
        }
 
@@ -270,10 +275,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        void maybe_write_autosave ();
 
-       /* Proxy signal for region hidden changes */
-
-       PBD::Signal1<void,boost::shared_ptr<Region> > RegionHiddenChange;
-
        /* Emitted when all i/o connections are complete */
 
        PBD::Signal0<void> IOConnectionsComplete;
@@ -284,38 +285,60 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* Transport mechanism signals */
 
-       PBD::Signal0<void> TransportStateChange; /* generic */
-       PBD::Signal1<void,nframes64_t> PositionChanged; /* sent after any non-sequential motion */
-       PBD::Signal0<void> DurationChanged;
-       PBD::Signal1<void,nframes64_t> Xrun;
+       /** Emitted on the following changes in transport state:
+        *  - stop (from the butler thread)
+        *  - change in whether or not we are looping (from the process thread)
+        *  - change in the play range (from the process thread)
+        *  - start (from the process thread)
+        *  - engine halted
+       */
+       PBD::Signal0<void> TransportStateChange;
+
+       PBD::Signal1<void,framepos_t> PositionChanged; /* sent after any non-sequential motion */
+       PBD::Signal1<void,framepos_t> Xrun;
        PBD::Signal0<void> TransportLooped;
 
        /** emitted when a locate has occurred */
        PBD::Signal0<void> Located;
 
        PBD::Signal1<void,RouteList&> RouteAdded;
-       PBD::Signal0<void> RouteGroupChanged;
+       /** Emitted when a property of one of our route groups changes.
+        *  The parameter is the RouteGroup that has changed.
+        */
+       PBD::Signal1<void, RouteGroup *> RouteGroupPropertyChanged;
+       /** Emitted when a route is added to one of our route groups.
+        *  First parameter is the RouteGroup, second is the route.
+        */
+       PBD::Signal2<void, RouteGroup *, boost::weak_ptr<Route> > RouteAddedToRouteGroup;
+       /** Emitted when a route is removed from one of our route groups.
+        *  First parameter is the RouteGroup, second is the route.
+        */
+       PBD::Signal2<void, RouteGroup *, boost::weak_ptr<Route> > RouteRemovedFromRouteGroup;
+
+       /* Step Editing status changed */
+       PBD::Signal1<void,bool> StepEditStatusChange;
 
        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_roll_at_and_return (framepos_t start, framepos_t return_to);
+       void request_bounded_roll (framepos_t start, framepos_t end);
        void request_stop (bool abort = false, bool clear_state = false);
-       void request_locate (nframes_t frame, bool with_roll = false);
+       void request_locate (framepos_t frame, bool with_roll = false);
 
        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); }
+       framepos_t last_transport_start () const { return _last_roll_location; }
+       void goto_end ();
+       void goto_start ();
        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_transport_speed (double speed, bool as_default = false);
+        void request_transport_speed_nonzero (double, bool as_default = false);
+       void request_overwrite_buffer (Track *);
+       void adjust_playback_buffering();
+       void adjust_capture_buffering();
+       void request_track_speed (Track *, double speed);
        void request_input_change_handling ();
 
        bool locate_pending() const { return static_cast<bool>(post_transport_work()&PostTransportLocate); }
@@ -323,30 +346,27 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        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(); }
-       /// "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; }
+       framepos_t current_end_frame () const;
+       framepos_t current_start_frame () const;
+       /** "actual" sample rate of session, set by current audioengine rate, pullup/down etc. */
+       framecnt_t frame_rate () const { return _current_frame_rate; }
+       /** "native" sample rate of session, regardless of current audioengine rate, pullup/down etc */
+       framecnt_t nominal_frame_rate () const { return _nominal_frame_rate; }
+       framecnt_t frames_per_hour () const { return _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; }
+       framecnt_t timecode_frames_per_hour() const { return _timecode_frames_per_hour; }
 
        MIDI::byte get_mtc_timecode_bits() const {
                return mtc_timecode_bits;   /* encoding of SMTPE type for MTC */
        }
 
-       float timecode_frames_per_second() const;
+       double timecode_frames_per_second() const;
        bool timecode_drop_frames() const;
 
        /* Locations */
 
-       Locations *locations() { return &_locations; }
+       Locations *locations() { return _locations; }
 
        PBD::Signal1<void,Location*>    auto_loop_location_changed;
        PBD::Signal1<void,Location*>    auto_punch_location_changed;
@@ -356,14 +376,16 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void set_auto_loop_location (Location *);
        int location_name(std::string& result, std::string base = std::string(""));
 
-       void reset_input_monitor_state ();
-
-       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; }
+       pframes_t get_block_size()        const { return current_block_size; }
+       framecnt_t worst_output_latency () const { return _worst_output_latency; }
+       framecnt_t worst_input_latency ()  const { return _worst_input_latency; }
+       framecnt_t worst_track_latency ()  const { return _worst_track_latency; }
+       framecnt_t worst_playback_latency () const { return _worst_output_latency + _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 = "");
@@ -371,9 +393,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void remove_state (std::string snapshot_name);
        void rename_state (std::string old_name, std::string new_name);
        void remove_pending_capture_state ();
-
-       static int rename_template (std::string old_name, std::string new_name);
-       static int delete_template (std::string name);
+       int rename (const std::string&);
 
        PBD::Signal1<void,std::string> StateSaved;
        PBD::Signal0<void> StateReady;
@@ -403,47 +423,59 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        void add_route_group (RouteGroup *);
        void remove_route_group (RouteGroup&);
+       void reorder_route_groups (std::list<RouteGroup*>);
 
-       RouteGroup *route_group_by_name (std::string);
+       RouteGroup* route_group_by_name (std::string);
+       RouteGroup& all_route_group() const;
 
        PBD::Signal1<void,RouteGroup*> route_group_added;
        PBD::Signal0<void>             route_group_removed;
+       PBD::Signal0<void>             route_groups_reordered;
 
        void foreach_route_group (boost::function<void(RouteGroup*)> f) {
-               for (std::list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); i++) {
+               for (std::list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
                        f (*i);
                }
        }
 
+       std::list<RouteGroup*> const & route_groups () const {
+               return _route_groups;
+       }
+
        /* fundamental operations. duh. */
 
        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
+               int input_channels,
+               int output_channels,
+               TrackMode mode = Normal,
+               RouteGroup* route_group = 0,
+               uint32_t how_many = 1,
+               std::string name_template = ""
                );
 
-       RouteList new_audio_route (bool aux, int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many);
+       RouteList new_audio_route (
+               int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many, std::string name_template = ""
+               );
 
        std::list<boost::shared_ptr<MidiTrack> > new_midi_track (
-               TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1
+               const ChanCount& input, const ChanCount& output,
+               boost::shared_ptr<PluginInfo> instrument = boost::shared_ptr<PluginInfo>(),
+               TrackMode mode = Normal, 
+               RouteGroup* route_group = 0, uint32_t how_many = 1, std::string name_template = ""
                );
 
        void   remove_route (boost::shared_ptr<Route>);
        void   resort_routes ();
        void   resort_routes_using (boost::shared_ptr<RouteList>);
 
-       void   set_remote_control_ids();
-
        AudioEngine & engine() { return _engine; }
        AudioEngine const & engine () const { return _engine; }
 
-       int32_t  max_level;
-       int32_t  min_level;
-
        /* Time */
 
-        nframes64_t transport_frame () const {return _transport_frame; }
-       nframes64_t audible_frame () const;
-       nframes64_t requested_return_frame() const { return _requested_return_frame; }
+       framepos_t transport_frame () const {return _transport_frame; }
+       framepos_t audible_frame () const;
+       framepos_t requested_return_frame() const { return _requested_return_frame; }
 
        enum PullupFormat {
                pullup_Plus4Plus1,
@@ -459,30 +491,24 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        void sync_time_vars();
 
-       void bbt_time (nframes_t when, BBT_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 bbt_time (framepos_t when, Timecode::BBT_Time&);
+       void timecode_to_sample(Timecode::Time& timecode, framepos_t& sample, bool use_offset, bool use_subframes) const;
+       void sample_to_timecode(framepos_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 timecode_time (framepos_t when, Timecode::Time&);
+       void timecode_time_subframes (framepos_t when, Timecode::Time&);
 
-       void timecode_duration (nframes_t, Timecode::Time&) const;
-       void timecode_duration_string (char *, nframes_t) const;
+       void timecode_duration (framecnt_t, Timecode::Time&) const;
+       void timecode_duration_string (char *, framecnt_t) const;
 
-       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; }
+       framecnt_t convert_to_frames (AnyTime const & position);
+       framecnt_t any_duration_to_frames (framepos_t position, AnyTime const & duration);
 
-       nframes_t convert_to_frames_at (nframes_t position, AnyTime const &);
+       static PBD::Signal1<void, framepos_t> StartTimeChanged;
+       static PBD::Signal1<void, framepos_t> EndTimeChanged;
 
-       static PBD::Signal0<void> StartTimeChanged;
-       static PBD::Signal0<void> EndTimeChanged;
-       static PBD::Signal0<void> TimecodeOffsetChanged;
-
-        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; }
+       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; }
@@ -491,55 +517,40 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void set_silent (bool yn);
        bool silent () { return _silent; }
 
-       int jack_slave_sync (nframes_t);
-
        TempoMap& tempo_map() { return *_tempo_map; }
 
-       /// 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;
-
        /* region info  */
 
-       void add_regions (std::vector<boost::shared_ptr<Region> >&);
-
-       PBD::Signal1<void,boost::weak_ptr<Region> >              RegionAdded;
-       PBD::Signal1<void,std::vector<boost::weak_ptr<Region> >&> RegionsAdded;
-       PBD::Signal1<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>);
-
        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 */
 
-       void import_audiofiles (ImportStatus&);
+       void import_files (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 (framepos_t position);
 
-       PBD::Signal1<int,nframes_t> ProcessExport;
+       PBD::Signal1<int, framecnt_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>);
 
+       void  cleanup_regions();
        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> >);
+       int destroy_sources (std::list<boost::shared_ptr<Source> >);
 
        int remove_last_capture ();
 
@@ -552,40 +563,27 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        /** handlers should return 0 for "ignore the rate mismatch",
            !0 for "do not use this session"
        */
-       static PBD::Signal2<int,nframes_t, nframes_t> AskAboutSampleRateMismatch;
+       static PBD::Signal2<int, framecnt_t, framecnt_t> AskAboutSampleRateMismatch;
 
        /** handlers should return !0 for use pending state, 0 for ignore it.
        */
        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 destructive);
 
-       boost::shared_ptr<MidiSource> create_midi_source_for_session (ARDOUR::MidiDiskstream&);
+       boost::shared_ptr<MidiSource> create_midi_source_for_session (
+               Track*, 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);
+       boost::shared_ptr<Source> source_by_path_and_channel (const std::string&, uint16_t);
+       uint32_t count_sources_by_origin (const std::string&);
 
        void add_playlist (boost::shared_ptr<Playlist>, bool unused = false);
 
-       /* named selections */
-
-       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)(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*);
 
-       /* fade curves */
-
-       float get_default_fade_length () const { return default_fade_msecs; }
-       float get_default_fade_steepness () const { return default_fade_steepness; }
-       void set_default_fade (float steepness, float msecs);
-
        /* auditioning */
 
        boost::shared_ptr<Auditioner> the_auditioner() { return auditioner; }
@@ -598,38 +596,48 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* 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&);
+       boost::shared_ptr<Region> write_one_track (AudioTrack&, framepos_t start, framepos_t end,
+                                                  bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
+                                                  boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export);
+       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; }
 
        static const SessionEvent::RTeventCallback rt_cleanup;
 
        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 cancel_solo_after_disconnect (boost::shared_ptr<Route>, bool upstream, 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_record_enabled (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);
+       void set_monitoring (boost::shared_ptr<RouteList>, MonitorChoice, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false);
+        void set_exclusive_input_active (boost::shared_ptr<RouteList> rt, bool onoff, bool flip_others=false);
 
        PBD::Signal1<void,bool> SoloActive;
        PBD::Signal0<void> SoloChanged;
-       
+       PBD::Signal0<void> IsolatedChanged;
+
+       /* monitor/master out */
 
-       /* control/master out */
+       void add_monitor_section ();
+       void remove_monitor_section ();
 
-       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);
+       void globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p, bool);
        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);
+       void add_internal_send (boost::shared_ptr<Route>, int, boost::shared_ptr<Route>);
+       void add_internal_send (boost::shared_ptr<Route>, boost::shared_ptr<Processor>, boost::shared_ptr<Route>);
 
        static void set_disable_all_loaded_plugins (bool yn) {
                _disable_all_loaded_plugins = yn;
@@ -639,15 +647,21 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        }
 
        uint32_t next_send_id();
+       uint32_t next_aux_send_id();
        uint32_t next_return_id();
        uint32_t next_insert_id();
        void mark_send_id (uint32_t);
+       void mark_aux_send_id (uint32_t);
        void mark_return_id (uint32_t);
        void mark_insert_id (uint32_t);
+       void unmark_send_id (uint32_t);
+       void unmark_aux_send_id (uint32_t);
+       void unmark_return_id (uint32_t);
+       void unmark_insert_id (uint32_t);
 
        /* s/w "RAID" management */
 
-       nframes_t available_capture_duration();
+       boost::optional<framecnt_t> available_capture_duration();
 
        /* I/O bundles */
 
@@ -658,39 +672,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleAdded;
        PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleRemoved;
 
-       /* MIDI control */
-
-       void midi_panic(void);
-       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; }
-       MIDI::Port *midi_clock_port() const { return _midi_clock_port; }
-
-       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);
-
-       bool get_trace_midi_input(MIDI::Port *port = 0);
-       bool get_trace_midi_output(MIDI::Port *port = 0);
-
-       void set_mmc_receive_device_id (uint32_t id);
-       void set_mmc_send_device_id (uint32_t id);
-
-       /* Scrubbing */
-
-       void start_scrub (nframes_t where);
-       void stop_scrub ();
-       void set_scrub_speed (float);
-       nframes_t scrub_buffer_size() const;
-       PBD::Signal0<void> ScrubReady;
+       void midi_panic ();
 
        /* History (for editors, mixers, UIs etc.) */
 
@@ -713,35 +695,39 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        std::string next_redo() const { return _history.next_redo(); }
 
        void begin_reversible_command (const std::string& cmd_name);
+       void begin_reversible_command (GQuark);
        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);
+               assert (_current_trans);
+               _current_trans->add_command (cmd);
        }
 
+       /** @return The list of operations that are currently in progress */
+       std::list<GQuark> const & current_operations () {
+               return _current_trans_quarks;
+       }
+
+       bool operation_in_progress (GQuark) const;
+
+       void add_commands (std::vector<Command*> const & cmds);
+
        std::map<PBD::ID,PBD::StatefulDestructible*> registry;
 
        // these commands are implemented in libs/ardour/session_command.cc
        Command* memento_command_factory(XMLNode* n);
+       Command* stateful_diff_command_factory (XMLNode *);
        void register_with_memento_command_factory(PBD::ID, PBD::StatefulDestructible*);
 
        /* clicking */
 
        boost::shared_ptr<IO> click_io() { return _click_io; }
+       boost::shared_ptr<Amp> click_gain() { return _click_gain; }
 
        /* disk, buffer loads */
 
        uint32_t playback_load ();
        uint32_t capture_load ();
-       uint32_t playback_load_min ();
-       uint32_t capture_load_min ();
-
-       void reset_playback_load_min ();
-       void reset_capture_load_min ();
 
        /* ranges */
 
@@ -750,30 +736,38 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* 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;
+       gain_t* send_gain_automation_buffer () const;
+       pan_t** pan_automation_buffer () const;
 
        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);
-
+       static intptr_t vst_callback (
+               AEffect* effect,
+               int32_t opcode,
+               int32_t index,
+               intptr_t value,
+               void* ptr,
+               float opt
+               );
+                       
        static PBD::Signal0<void> SendFeedback;
 
+       /* Speakers */
+
+       boost::shared_ptr<Speakers> get_speakers ();
+
        /* 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*);
 
-       SessionMetadata & metadata () { return *_metadata; }
+       boost::shared_ptr<PBD::Controllable> solo_cut_control() const;
 
        SessionConfiguration config;
 
@@ -788,21 +782,19 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        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
+               PostTransportDuration           = 0x2,
+               PostTransportLocate             = 0x4,
+               PostTransportRoll               = 0x8,
+               PostTransportAbort              = 0x10,
+               PostTransportOverWrite          = 0x20,
+               PostTransportSpeed              = 0x40,
+               PostTransportAudition           = 0x80,
+               PostTransportReverse            = 0x100,
+               PostTransportInputChange        = 0x200,
+               PostTransportCurveRealloc       = 0x400,
+               PostTransportClearSubstate      = 0x800,
+               PostTransportAdjustPlaybackBuffering  = 0x1000,
+               PostTransportAdjustCaptureBuffering   = 0x2000
        };
 
        enum SlaveState {
@@ -810,98 +802,147 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
                Waiting,
                Running
        };
-       
+
        SlaveState slave_state() const { return _slave_state; }
+        Slave* slave() const { return _slave; }
 
        boost::shared_ptr<SessionPlaylists> playlists;
 
+       void send_mmc_locate (framepos_t);
+       int send_full_time_code (framepos_t);
+
+       bool step_editing() const { return (_step_editors > 0); }
+
+       void request_suspend_timecode_transmission ();
+       void request_resume_timecode_transmission ();
+       bool timecode_transmission_suspended () const;
+
+       std::string source_search_path(DataType) const;
+       void ensure_search_path_includes (const std::string& path, DataType type);
+
+       std::list<std::string> unknown_processors () const;
+
+       /** Emitted when a feedback cycle has been detected within Ardour's signal
+           processing path.  Until it is fixed (by the user) some (unspecified)
+           routes will not be run.
+       */
+       static PBD::Signal0<void> FeedbackDetected;
+
+       /** Emitted when a graph sort has successfully completed, which means
+           that it has no feedback cycles.
+       */
+       static PBD::Signal0<void> SuccessfulGraphSort;
+
+       /* handlers can return an integer value:
+          0: config.set_audio_search_path() or config.set_midi_search_path() was used
+          to modify the search path and we should try to find it again.
+          1: quit entire session load
+          2: as 0, but don't ask about other missing files
+          3: don't ask about other missing files, and just mark this one missing
+          -1: just mark this one missing
+          any other value: as -1
+       */
+       static PBD::Signal3<int,Session*,std::string,DataType> MissingFile;
+
+       /** Emitted when the session wants Ardour to quit */
+       static PBD::Signal0<void> Quit;
+
+        boost::shared_ptr<Port> ltc_input_port() const;
+        boost::shared_ptr<Port> ltc_output_port() const;
+
+       boost::shared_ptr<IO> ltc_input_io() { return _ltc_input; }
+       boost::shared_ptr<IO> ltc_output_io() { return _ltc_output; }
+
   protected:
        friend class AudioEngine;
-       void set_block_size (nframes_t nframes);
-       void set_frame_rate (nframes_t nframes);
+       void set_block_size (pframes_t nframes);
+       void set_frame_rate (framecnt_t nframes);
 
   protected:
        friend class Route;
        void schedule_curve_reallocation ();
-       void update_latency_compensation (bool, bool);
+       void update_latency_compensation (bool force = false);
 
   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,
-               StopPendingCapture = 0x4,
-               AutoReturning      = 0x10,
-               PendingLocate      = 0x20,
-               PendingSetLoop     = 0x40
+               PendingDeclickIn      = 0x1,  ///< pending de-click fade-in for start
+               PendingDeclickOut     = 0x2,  ///< pending de-click fade-out for stop
+               StopPendingCapture    = 0x4,
+               PendingLoopDeclickIn  = 0x8,  ///< pending de-click fade-in at the start of a loop
+               PendingLoopDeclickOut = 0x10, ///< pending de-click fade-out at the end of a loop
+               PendingLocate         = 0x20,
        };
 
        /* stuff used in process() should be close together to
           maximise cache hits
        */
 
-       typedef void (Session::*process_function_type)(nframes_t);
+       typedef void (Session::*process_function_type)(pframes_t);
 
        AudioEngine&            _engine;
        mutable gint             processing_prohibited;
        process_function_type    process_function;
        process_function_type    last_process_function;
        bool                     waiting_for_sync_offset;
-       nframes_t               _base_frame_rate;
-       nframes_t               _current_frame_rate;  //this includes video pullup offset
-       nframes_t               _nominal_frame_rate;  //ignores audioengine setting, "native" SR
+       framecnt_t              _base_frame_rate;
+       framecnt_t              _current_frame_rate;  //this includes video pullup offset
+       framecnt_t              _nominal_frame_rate;  //ignores audioengine setting, "native" SR
        int                      transport_sub_state;
        mutable gint            _record_status;
-       volatile nframes64_t    _transport_frame;
-       Location*                end_location;
-       Location*                start_location;
+       framepos_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;
+       void maybe_update_session_range (framepos_t, framepos_t);
+
+       // varispeed playback
+       double                  _transport_speed;
+       double                  _default_transport_speed;
+       double                  _last_transport_speed;
+       double                  _target_transport_speed;
+       CubicInterpolation       interpolation;
 
        bool                     auto_play_legal;
-       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;
-       nframes_t               _worst_track_latency;
+       framepos_t              _last_slave_transport_frame;
+       framecnt_t               maximum_output_latency;
+       framepos_t              _requested_return_frame;
+       pframes_t                current_block_size;
+       framecnt_t              _worst_output_latency;
+       framecnt_t              _worst_input_latency;
+       framecnt_t              _worst_track_latency;
        bool                    _have_captured;
        float                   _meter_hold;
        float                   _meter_falloff;
        bool                    _non_soloed_outs_muted;
        uint32_t                _listen_cnt;
+       uint32_t                _solo_isolated_cnt;
        bool                    _writable;
        bool                    _was_seamless;
 
+       void initialize_latencies ();
        void set_worst_io_latencies ();
+       void set_worst_playback_latency ();
+       void set_worst_capture_latency ();
        void set_worst_io_latencies_x (IOChange, void *) {
                set_worst_io_latencies ();
        }
+       void post_capture_latency ();
+       void post_playback_latency ();
 
        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);
-       void process_with_events    (nframes_t);
-       void process_audition       (nframes_t);
-       void process_export         (nframes_t);
-       int  process_export_fw      (nframes_t);
+       void process_scrub          (pframes_t);
+       void process_without_events (pframes_t);
+       void process_with_events    (pframes_t);
+       void process_audition       (pframes_t);
+       void process_export         (pframes_t);
+       int  process_export_fw      (pframes_t);
 
        void block_processing() { g_atomic_int_set (&processing_prohibited, 1); }
        void unblock_processing() { g_atomic_int_set (&processing_prohibited, 0); }
@@ -911,28 +952,29 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        static const int delta_accumulator_size = 25;
        int delta_accumulator_cnt;
-       long delta_accumulator[delta_accumulator_size];
-       long average_slave_delta;
+       int32_t delta_accumulator[delta_accumulator_size];
+       int32_t average_slave_delta;
        int  average_dir;
        bool have_first_delta_accumulator;
 
        SlaveState _slave_state;
-       nframes_t slave_wait_end;
+       framepos_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);
-       void follow_slave_silently(nframes_t nframes, float slave_speed);
+       bool follow_slave (pframes_t);
+       void calculate_moving_average_of_slave_delta (int dir, framecnt_t this_delta);
+       void track_slave_state (float slave_speed, framepos_t slave_transport_frame, framecnt_t this_delta);
+       void follow_slave_silently (pframes_t nframes, float slave_speed);
 
-        void switch_to_sync_source (SyncSource); /* !RT context */
-        void drop_sync_source ();  /* !RT context */
-        void use_sync_source (Slave*); /* RT context */
+       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 post_export_sync;
+       framepos_t post_export_position;
 
        bool _exporting;
+       bool _export_started;
        bool _export_rolling;
 
        boost::shared_ptr<ExportHandler> export_handler;
@@ -941,55 +983,55 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        int  pre_export ();
        int  stop_audio_export ();
        void finalize_audio_export ();
+       bool _pre_export_mmc_enabled;
 
        PBD::ScopedConnection 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);
-
-       bool get_rec_monitors_input () {
-               if (actively_recording()) {
-                       return true;
-               } else {
-                       if (config.get_auto_input()) {
-                               return false;
-                       } else {
-                               return true;
-                       }
-               }
-       }
+       void get_track_statistics ();
+       int  process_routes (pframes_t, bool& need_butler);
+       int  silent_process_routes (pframes_t, bool& need_butler);
 
+       /** @return 1 if there is a pending declick fade-in,
+                  -1 if there is a pending declick fade-out,
+                   0 if there is no pending declick.
+       */
        int get_transport_declick_required () {
                if (transport_sub_state & PendingDeclickIn) {
                        transport_sub_state &= ~PendingDeclickIn;
                        return 1;
                } else if (transport_sub_state & PendingDeclickOut) {
+                       /* XXX: not entirely sure why we don't clear this */
+                       return -1;
+               } else if (transport_sub_state & PendingLoopDeclickOut) {
+                       /* Return the declick out first ... */
+                       transport_sub_state &= ~PendingLoopDeclickOut;
                        return -1;
+               } else if (transport_sub_state & PendingLoopDeclickIn) {
+                       /* ... then the declick in on the next call */
+                       transport_sub_state &= ~PendingLoopDeclickIn;
+                       return 1;
                } else {
                        return 0;
                }
        }
 
-       bool maybe_stop (nframes_t limit);
-       bool maybe_sync_start (nframes_t&);
+       bool maybe_stop (framepos_t limit);
+       bool maybe_sync_start (pframes_t &);
 
        void check_declick_out ();
 
-       MIDI::MachineControl*    mmc;
-       MIDI::Port*             _mmc_port;
-       MIDI::Port*             _mtc_port;
-       MIDI::Port*             _midi_port;
-       MIDI::Port*             _midi_clock_port;
        std::string             _path;
        std::string             _name;
-       bool                     session_send_mmc;
-       bool                     session_send_mtc;
+       bool                    _is_new;
+       bool                    _send_qf_mtc;
+       /** Number of process frames since the last MTC output (when sending MTC); used to
+        *  know when to send full MTC messages every so often.
+        */
+       pframes_t               _pframes_since_last_mtc;
        bool                     session_midi_feedback;
        bool                     play_loop;
        bool                     loop_changing;
-       nframes_t                last_loopend;
+       framepos_t               last_loopend;
 
        boost::scoped_ptr<SessionDirectory> _session_dir;
 
@@ -997,6 +1039,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void when_engine_running ();
        void graph_reordered ();
 
+       /** current snapshot name, without the .ardour suffix */
        std::string _current_snapshot_name;
 
        XMLTree*         state_tree;
@@ -1007,61 +1050,45 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        int      load_options (const XMLNode&);
        int      load_state (std::string snapshot_name);
 
-       nframes_t _last_roll_location;
-       nframes_t _last_record_location;
+       framepos_t _last_roll_location;
+       /** the session frame time at which we last rolled, located, or changed transport direction */
+       framepos_t _last_roll_or_reversal_location;
+       framepos_t _last_record_location;
 
        bool              pending_locate_roll;
-       nframes_t         pending_locate_frame;
+       framepos_t        pending_locate_frame;
        bool              pending_locate_flush;
        bool              pending_abort;
        bool              pending_auto_loop;
 
        Butler* _butler;
 
-#if 0 // these should be here, see comments in their other location above
-       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
-       };
-#endif
        static const PostTransportWork ProcessCannotProceedMask =
                PostTransportWork (
                                PostTransportInputChange|
                                PostTransportSpeed|
                                PostTransportReverse|
                                PostTransportCurveRealloc|
-                               PostTransportScrub|
                                PostTransportAudition|
                                PostTransportLocate|
                                PostTransportStop|
                                PostTransportClearSubstate);
 
        gint _post_transport_work; /* accessed only atomic ops */
-       PostTransportWork post_transport_work() const        { return (PostTransportWork) g_atomic_int_get (&_post_transport_work); }
+        PostTransportWork post_transport_work() const        { return (PostTransportWork) g_atomic_int_get (const_cast<gint*>(&_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);
 
+       void schedule_playback_buffering_adjustment ();
+       void schedule_capture_buffering_adjustment ();
+
        uint32_t    cumulative_rf_motion;
        uint32_t    rf_scale;
 
        void set_rf_speed (float speed);
-       void reset_rf_scale (nframes_t frames_moved);
+       void reset_rf_scale (framecnt_t frames_moved);
 
-       Locations        _locations;
+       Locations*       _locations;
        void              locations_changed ();
        void              locations_added (Location*);
        void              handle_locations_changed (Locations::LocationList&);
@@ -1073,10 +1100,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        PBD::ScopedConnectionList loop_connections;
        void             auto_loop_changed (Location *);
+       void             auto_loop_declick_range (Location *, framepos_t &, framepos_t &);
 
        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 remove_empty_sounds ();
 
        void setup_midi_control ();
@@ -1084,15 +1111,15 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        void enable_record ();
 
-       void increment_transport_position (uint32_t val) {
-               if (max_frames - val < _transport_frame) {
-                       _transport_frame = max_frames;
+       void increment_transport_position (framecnt_t val) {
+               if (max_framepos - val < _transport_frame) {
+                       _transport_frame = max_framepos;
                } else {
                        _transport_frame += val;
                }
        }
 
-       void decrement_transport_position (uint32_t val) {
+       void decrement_transport_position (framecnt_t val) {
                if (val < _transport_frame) {
                        _transport_frame -= val;
                } else {
@@ -1113,11 +1140,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* MIDI Machine Control */
 
-       void deliver_mmc (MIDI::MachineControl::Command, nframes_t);
-
-       void spp_start (MIDI::Parser&, nframes_t timestamp);
-       void spp_continue (MIDI::Parser&, nframes_t timestamp);
-       void spp_stop (MIDI::Parser&, nframes_t timestamp);
+       void spp_start ();
+       void spp_continue ();
+       void spp_stop ();
 
        void mmc_deferred_play (MIDI::MachineControl &);
        void mmc_stop (MIDI::MachineControl &);
@@ -1142,37 +1167,60 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        MidiTimeoutList midi_timeouts;
        bool mmc_step_timeout ();
 
-       MIDI::byte mmc_buffer[32];
        MIDI::byte mtc_msg[16];
        MIDI::byte mtc_timecode_bits;   /* encoding of SMTPE type for MTC */
        MIDI::byte midi_msg[16];
-       nframes_t  outbound_mtc_timecode_frame;
+       framepos_t outbound_mtc_timecode_frame;
        Timecode::Time transmitting_timecode_time;
        int next_quarter_frame_to_send;
 
        double _frames_per_timecode_frame; /* has to be floating point because of drop frame */
-       nframes_t _frames_per_hour;
-       nframes_t _timecode_frames_per_hour;
-       nframes_t _timecode_offset;
-       bool _timecode_offset_negative;
+       framecnt_t _frames_per_hour;
+       framecnt_t _timecode_frames_per_hour;
 
        /* 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_timecode_valid;
-       nframes_t last_timecode_when;
-       Timecode::Time    last_timecode;
+       bool last_timecode_valid;
+       framepos_t last_timecode_when;
+       Timecode::Time last_timecode;
 
        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);
+       int send_midi_time_code_for_cycle (framepos_t, framepos_t, pframes_t nframes);
+
+#ifdef HAVE_LTC
+       LTCEncoder*       ltc_encoder;
+       ltcsnd_sample_t*  ltc_enc_buf;
+
+       Timecode::TimecodeFormat ltc_enc_tcformat;
+       int32_t           ltc_buf_off;
+       int32_t           ltc_buf_len;
+
+       double            ltc_speed;
+       int32_t           ltc_enc_byte;
+       framepos_t        ltc_enc_pos;
+       double            ltc_enc_cnt;
+       framepos_t        ltc_enc_off;
+       bool              restarting;
 
-       nframes_t adjust_apparent_position (nframes_t frames);
+       framepos_t        ltc_timecode_offset;
+       bool              ltc_timecode_negative_offset;
+
+       jack_latency_range_t ltc_out_latency;
+
+       void ltc_tx_initialize();
+       void ltc_tx_cleanup();
+       void ltc_tx_reset();
+       void ltc_tx_resync_latency();
+       void ltc_tx_recalculate_position();
+       void ltc_tx_parse_offset();
+       void ltc_tx_send_time_code_for_cycle (framepos_t, framepos_t, double, double, pframes_t nframes);
+#endif
 
        void reset_record_status ();
 
-       int no_roll (nframes_t nframes);
-       int fail_roll (nframes_t nframes);
+       int no_roll (pframes_t nframes);
+       int fail_roll (pframes_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); }
@@ -1180,23 +1228,21 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        MidiControlUI* midi_control_ui;
 
        int           start_midi_thread ();
-       void          terminate_midi_thread ();
-
-       int           use_config_midi_ports ();
 
        void set_play_loop (bool yn);
        void unset_play_loop ();
-       void overwrite_some_buffers (Diskstream*);
+       void overwrite_some_buffers (Track *);
        void flush_all_inserts ();
-       int  micro_locate (nframes_t distance);
-        void locate (nframes64_t, bool with_roll, bool with_flush, bool with_loop=false, bool force=false);
-        void start_locate (nframes64_t, bool with_roll, bool with_flush, bool with_loop=false, bool force=false);
-       void force_locate (nframes64_t frame, bool with_roll = false);
-       void set_diskstream_speed (Diskstream*, double speed);
-        void set_transport_speed (double speed, bool abort = false, bool clear_state = false);
+       int  micro_locate (framecnt_t distance);
+       void locate (framepos_t, bool with_roll, bool with_flush, bool with_loop=false, bool force=false, bool with_mmc=true);
+       void start_locate (framepos_t, bool with_roll, bool with_flush, bool with_loop=false, bool force=false);
+       void force_locate (framepos_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, bool as_default = false);
        void stop_transport (bool abort = false, bool clear_state = false);
        void start_transport ();
        void realtime_stop (bool abort, bool clear_state);
+       void realtime_locate ();
        void non_realtime_start_scrub ();
        void non_realtime_set_speed ();
        void non_realtime_locate ();
@@ -1207,38 +1253,44 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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);
 
        std::list<RouteGroup *> _route_groups;
-
-       /* disk-streams */
-
-       SerializedRCUManager<DiskstreamList>  diskstreams;
-
-       int load_diskstreams (const XMLNode&);
+       RouteGroup*             _all_route_group;
 
        /* routes stuff */
 
+       boost::shared_ptr<Graph> _process_graph;
+
        SerializedRCUManager<RouteList>  routes;
 
-       void add_routes (RouteList&, bool save);
+       void add_routes (RouteList&, bool input_auto_connect, bool output_auto_connect, bool save);
        uint32_t destructive_index;
 
        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 (std::string const &, uint32_t& id, char* name, size_t name_len, bool);
+       void count_existing_track_channels (ChanCount& in, ChanCount& out);
+       void auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing_inputs, ChanCount& existing_outputs,
+                                bool with_lock, bool connect_inputs = true,
+                                ChanCount input_start = ChanCount (), ChanCount output_start = ChanCount ());
+       void midi_output_change_handler (IOChange change, void* /*src*/, boost::weak_ptr<Route> midi_track);
+
        /* mixer stuff */
 
        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 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 ();
@@ -1246,26 +1298,23 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* 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>);
+       mutable Glib::Threads::Mutex region_lock;
 
        int load_regions (const XMLNode& node);
+       int load_compounds (const XMLNode& node);
 
-       void route_group_changed ();
+       void route_added_to_route_group (RouteGroup *, boost::weak_ptr<Route>);
+       void route_removed_from_route_group (RouteGroup *, boost::weak_ptr<Route>);
+       void route_group_property_changed (RouteGroup *);
 
        /* SOURCES */
 
-       mutable Glib::Mutex source_lock;
+       mutable Glib::Threads::Mutex source_lock;
+
+  public:
        typedef std::map<PBD::ID,boost::shared_ptr<Source> > SourceMap;
 
+  private:
        SourceMap sources;
 
   public:
@@ -1280,19 +1329,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        /* PLAYLISTS */
 
        void remove_playlist (boost::weak_ptr<Playlist>);
-       void playlist_length_changed ();
-       void diskstream_playlist_changed (boost::weak_ptr<Diskstream>);
-
-       /* NAMED SELECTIONS */
-
-       mutable Glib::Mutex named_selection_lock;
-       typedef std::set<boost::shared_ptr<NamedSelection> > NamedSelectionList;
-       NamedSelectionList named_selections;
-
-       int load_named_selections (const XMLNode&);
-
-       NamedSelection *named_selection_factory (std::string name);
-       NamedSelection *XMLNamedSelectionFactory (const XMLNode&);
+       void track_playlist_changed (boost::weak_ptr<Track>);
+       void playlist_region_added (boost::weak_ptr<Region>);
+       void playlist_ranges_moved (std::list<Evoral::RangeMove<framepos_t> > const &);
+       void playlist_regions_extended (std::list<Evoral::Range<framepos_t> > const &);
 
        /* CURVES and AUTOMATION LISTS */
        std::map<PBD::ID, AutomationList*> automation_lists;
@@ -1313,30 +1353,33 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* FLATTEN */
 
-       int flatten_one_track (AudioTrack&, nframes_t start, nframes_t cnt);
+       int flatten_one_track (AudioTrack&, framepos_t start, framecnt_t cnt);
 
        /* INSERT AND SEND MANAGEMENT */
 
        boost::dynamic_bitset<uint32_t> send_bitset;
+       boost::dynamic_bitset<uint32_t> aux_send_bitset;
        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 {
-               uint32_t blocks; /* 4kB blocks */
+               uint32_t blocks;     ///< 4kB blocks
+               bool blocks_unknown; ///< true if blocks is unknown
                std::string path;
 
-               space_and_path() {
-                       blocks = 0;
-               }
+               space_and_path ()
+                       : blocks (0)
+                       , blocks_unknown (true)
+               {}
        };
 
        struct space_and_path_ascending_cmp {
                bool operator() (space_and_path a, space_and_path b) {
+                       if (a.blocks_unknown != b.blocks_unknown) {
+                               return !a.blocks_unknown;
+                       }
                        return a.blocks > b.blocks;
                }
        };
@@ -1346,14 +1389,19 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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;
+       /** If this is true, _total_free_4k_blocks is not definite,
+           as one or more of the session directories' filesystems
+           could not report free space.
+       */
+       bool _total_free_4k_blocks_uncertain;
+       Glib::Threads::Mutex space_lock;
+
+       bool no_questions_about_missing_files;
 
        std::string get_best_session_directory_for_new_source ();
 
        mutable gint _playback_load;
        mutable gint _capture_load;
-       mutable gint _playback_load_min;
-       mutable gint _capture_load_min;
 
        /* I/O bundles */
 
@@ -1361,38 +1409,47 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        XMLNode* _bundle_xml_node;
        int load_bundles (XMLNode const &);
 
-       void reverse_diskstream_buffers ();
-
-       UndoHistory                  _history;
-       std::stack<UndoTransaction*> _current_trans;
+       UndoHistory      _history;
+       /** current undo transaction, or 0 */
+       UndoTransaction* _current_trans;
+       /** GQuarks to describe the reversible commands that are currently in progress.
+        *  These may be nested, in which case more recently-started commands are toward
+        *  the front of the list.
+        */
+       std::list<GQuark> _current_trans_quarks;
 
-       void jack_timebase_callback (jack_transport_state_t, nframes_t, jack_position_t*, int);
+       void jack_timebase_callback (jack_transport_state_t, pframes_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 process_rtop (SessionEvent*);
 
+       void  update_latency (bool playback);
+
        XMLNode& state(bool);
 
        /* click track */
-
-       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;
-
-       static const Sample    default_click[];
-       static const nframes_t default_click_length;
-       static const Sample    default_click_emphasis[];
-       static const nframes_t default_click_emphasis_length;
+       typedef std::list<Click*> Clicks;
+       Clicks                  clicks;
+       bool                   _clicking;
+       boost::shared_ptr<IO>  _click_io;
+       boost::shared_ptr<Amp> _click_gain;
+       Sample*                 click_data;
+       Sample*                 click_emphasis_data;
+       framecnt_t              click_length;
+       framecnt_t              click_emphasis_length;
+       mutable Glib::Threads::RWLock    click_lock;
+
+       static const Sample     default_click[];
+       static const framecnt_t default_click_length;
+       static const Sample     default_click_emphasis[];
+       static const framecnt_t default_click_emphasis_length;
 
        Click *get_click();
+       framepos_t _clicks_cleared;
        void   setup_click_sounds (int which);
+       void   setup_click_sounds (Sample**, Sample const *, framecnt_t*, framecnt_t, std::string const &);
        void   clear_clicks ();
-       void   click (nframes_t start, nframes_t nframes);
+       void   click (framepos_t start, framecnt_t nframes);
 
        std::vector<Route*> master_outs;
 
@@ -1407,42 +1464,37 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        uint32_t main_outs;
 
        boost::shared_ptr<Route> _master_out;
-       boost::shared_ptr<Route> _control_out;
+       boost::shared_ptr<Route> _monitor_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;
+       void auto_connect_master_bus ();
 
-       /* VST support */
+       /* Windows VST support */
 
-       long _vst_callback (VSTPlugin*,
-                       long opcode,
-                       long index,
-                       long value,
-                       void* ptr,
-                       float opt);
+       long _windows_vst_callback (
+               WindowsVSTPlugin*,
+               long opcode,
+               long index,
+               long value,
+               void* ptr,
+               float opt
+               );
 
        /* number of hardware ports we're using,
           based on max (requested,available)
        */
 
-       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;
+       ChanCount n_physical_outputs;
+       ChanCount n_physical_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);
 
        typedef std::set<boost::shared_ptr<PBD::Controllable> > Controllables;
-       Glib::Mutex controllables_lock;
+       Glib::Threads::Mutex controllables_lock;
        Controllables controllables;
 
+       boost::shared_ptr<PBD::Controllable> _solo_cut_control;
+
        void reset_native_file_format();
        bool first_file_data_format_reset;
        bool first_file_header_format_reset;
@@ -1452,28 +1504,76 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        XMLNode& get_control_protocol_state ();
 
        void set_history_depth (uint32_t depth);
-       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));
+       template<typename T> SessionEvent*
+               get_rt_event (boost::shared_ptr<RouteList> rl, T targ, SessionEvent::RTeventCallback after, bool group_override,
+                             void (Session::*method) (boost::shared_ptr<RouteList>, T, bool)) {
+               SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0);
+               ev->rt_slot = boost::bind (method, this, rl, targ, group_override);
+               ev->rt_return = after;
+               ev->event_loop = PBD::EventLoop::get_event_loop_for_thread ();
+               
+               return ev;
+       }
 
+       void rt_cancel_solo_after_disconnect (boost::shared_ptr<RouteList>, bool upstream, bool /* ignored*/ );
        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_record_enable (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_enabled (boost::shared_ptr<RouteList>, bool yn, bool group_override);
+       void rt_set_monitoring (boost::shared_ptr<RouteList>, MonitorChoice, 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 (framepos_t, framepos_t);
+
+       void setup_midi_machine_control ();
+
+       void step_edit_status_change (bool);
+       uint32_t _step_editors;
+
+       /** true if timecode transmission by the transport is suspended, otherwise false */
+       mutable gint _suspend_timecode_transmission;
+
+       void update_locations_after_tempo_map_change (Locations::LocationList &);
+
+       void start_time_changed (framepos_t);
+       void end_time_changed (framepos_t);
+
+       void set_track_monitor_input_status (bool);
+       framepos_t compute_stop_limit () const;
+
+       boost::shared_ptr<Speakers> _speakers;
+       void load_nested_sources (const XMLNode& node);
+
+       /** The directed graph of routes that is currently being used for audio processing
+           and solo/mute computations.
+       */
+       GraphEdges _current_route_graph;
+
+       uint32_t next_control_id () const;
+       bool ignore_route_processor_changes;
+
+       MidiClockTicker* midi_clock;
+
+        boost::shared_ptr<IO>   _ltc_input;
+        boost::shared_ptr<IO>   _ltc_output;
+
+        void reconnect_ltc_input ();
+        void reconnect_ltc_output ();
 };
 
 } // namespace ARDOUR