Fix compensation of roll delay with MIDI tracks; data
[ardour.git] / libs / ardour / ardour / session.h
index 6b874d804112cfb245c503a1cfce001799072eda..ad42ee768ba15852b6b512a735a19cebb9ebaa93 100644 (file)
@@ -20,6 +20,8 @@
 #ifndef __ardour_session_h__
 #define __ardour_session_h__
 
+#include "libardour-config.h"
+
 #include <list>
 #include <map>
 #include <set>
 #include <glibmm/thread.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 "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/rc_configuration.h"
 #include "ardour/session_configuration.h"
 #include "ardour/session_event.h"
 #include "ardour/location.h"
 #include "ardour/interpolation.h"
-#include "ardour/speakers.h"
 
 #ifdef HAVE_JACK_SESSION
 #include <jack/session.h>
@@ -90,16 +93,18 @@ class AuxInput;
 class BufferSet;
 class Bundle;
 class Butler;
+class Click;
 class Diskstream;
 class ExportHandler;
 class ExportStatus;
+class Graph;
 class IO;
 class IOProcessor;
 class ImportStatus;
+class MidiControlUI;
 class MidiRegion;
 class MidiSource;
 class MidiTrack;
-class MidiControlUI;
 class NamedSelection;
 class Playlist;
 class PluginInsert;
@@ -120,9 +125,8 @@ class Slave;
 class Source;
 class Speakers;
 class TempoMap;
-class VSTPlugin;
-class Graph;
 class Track;
+class VSTPlugin;
 
 extern void setup_enum_writer ();
 
@@ -171,14 +175,11 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        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;
+       int ensure_subdirs ();
+
        std::string automation_dir () const;
        std::string analysis_dir() const;
        std::string plugins_dir() const;
-       
-       int ensure_subdirs ();
 
        std::string peak_path (std::string) const;
 
@@ -187,7 +188,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        std::string peak_path_from_audio_path (std::string) const;
        std::string new_audio_source_name (const std::string&, uint32_t nchans, uint32_t chan, bool destructive);
        std::string new_midi_source_name (const std::string&);
-       std::string new_source_path_from_name (DataType type, const std::string&, bool as_stub = false);
+       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 (pframes_t nframes);
@@ -207,7 +208,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void refresh_disk_space ();
 
        int load_diskstreams_2X (XMLNode const &, int);
-       
+
        int load_routes (const XMLNode&, int);
        boost::shared_ptr<RouteList> get_routes() const {
                return routes.reader ();
@@ -239,6 +240,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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);
+       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;
@@ -251,7 +253,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;
        }
 
@@ -272,7 +274,15 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        /* Transport mechanism signals */
 
-       PBD::Signal0<void> TransportStateChange; /* generic */
+       /** 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;
@@ -281,8 +291,18 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        PBD::Signal0<void> Located;
 
        PBD::Signal1<void,RouteList&> RouteAdded;
-       /** Emitted when anything about any of our route groups changes */
-       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;
@@ -351,8 +371,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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; }
 
-#ifdef HAVE_JACK_SESSION 
+#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);
@@ -363,6 +384,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 ();
+       int rename (const std::string&);
 
        static int rename_template (std::string old_name, std::string new_name);
        static int delete_template (std::string name);
@@ -395,12 +417,14 @@ 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& 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) {
@@ -415,13 +439,20 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        /* 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 (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
+               TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1, std::string name_template = ""
                );
 
        void   remove_route (boost::shared_ptr<Route>);
@@ -464,7 +495,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void timecode_duration_string (char *, framecnt_t) const;
 
        framecnt_t convert_to_frames (AnyTime const & position);
-        framecnt_t any_duration_to_frames (framepos_t position, AnyTime const & duration);
+       framecnt_t any_duration_to_frames (framepos_t position, AnyTime const & duration);
 
        static PBD::Signal1<void, framepos_t> StartTimeChanged;
        static PBD::Signal1<void, framepos_t> EndTimeChanged;
@@ -536,10 +567,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        static PBD::Signal0<int> AskAboutPendingState;
 
        boost::shared_ptr<AudioFileSource> create_audio_source_for_session (
-               size_t, std::string const &, uint32_t, bool destructive, bool as_stub = false);
-       
+               size_t, std::string const &, uint32_t, bool destructive);
+
        boost::shared_ptr<MidiSource> create_midi_source_for_session (
-               Track*, std::string const &, bool as_stub = false);
+               Track*, std::string const &);
 
        boost::shared_ptr<Source> source_by_id (const PBD::ID&);
        boost::shared_ptr<Source> source_by_path_and_channel (const std::string&, uint16_t);
@@ -591,11 +622,13 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void set_listen (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_exclusive_input_active (boost::shared_ptr<Route> rt, bool others_on);
+       void set_monitoring (boost::shared_ptr<RouteList>, MonitorChoice, 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> monitor_out() const { return _monitor_out; }
@@ -711,12 +744,21 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
                        long value,
                        void* ptr,
                        float opt);
+                       
+       /*Native linuxVST support*/
+       
+       static intptr_t lxvst_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 ();
+       boost::shared_ptr<Speakers> get_speakers ();
 
        /* Controllables */
 
@@ -726,7 +768,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void add_controllable (boost::shared_ptr<PBD::Controllable>);
        void remove_controllable (PBD::Controllable*);
 
-        boost::shared_ptr<PBD::Controllable> solo_cut_control() const;
+       boost::shared_ptr<PBD::Controllable> solo_cut_control() const;
 
        SessionMetadata & metadata () { return *_metadata; }
 
@@ -743,23 +785,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,
-               PostTransportAdjustPlaybackBuffering  = 0x100000,
-               PostTransportAdjustCaptureBuffering   = 0x200000
+               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 {
@@ -767,7 +805,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
                Waiting,
                Running
        };
-       
+
        SlaveState slave_state() const { return _slave_state; }
 
        boost::shared_ptr<SessionPlaylists> playlists;
@@ -810,7 +848,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
   protected:
        friend class Route;
        void schedule_curve_reallocation ();
-       void update_latency_compensation (bool, bool);
+       void update_latency_compensation (bool force = false);
 
   private:
        int  create (const std::string& mix_template, BusProfile*);
@@ -845,7 +883,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        bool                    _silent;
 
        void maybe_update_session_range (framepos_t, framepos_t);
-       
+
        // varispeed playback
        double                  _transport_speed;
        double                  _last_transport_speed;
@@ -869,10 +907,15 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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);
 
@@ -933,18 +976,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        int  process_routes (pframes_t, bool& need_butler);
        int  silent_process_routes (pframes_t, bool& need_butler);
 
-       bool get_rec_monitors_input () {
-               if (actively_recording()) {
-                       return true;
-               } else {
-                       if (config.get_auto_input()) {
-                               return false;
-                       } else {
-                               return true;
-                       }
-               }
-       }
-
        int get_transport_declick_required () {
                if (transport_sub_state & PendingDeclickIn) {
                        transport_sub_state &= ~PendingDeclickIn;
@@ -980,6 +1011,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;
@@ -1002,33 +1034,12 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        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|
@@ -1173,6 +1184,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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 ();
@@ -1198,7 +1210,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        SerializedRCUManager<RouteList>  routes;
 
-       void add_routes (RouteList&, bool save);
+       void add_routes (RouteList&, bool auto_connect, bool save);
        uint32_t destructive_index;
 
        boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&, int);
@@ -1206,16 +1218,12 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
        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 (
-               Route* route,
-               ChanCount& existing_inputs,
-               ChanCount& existing_outputs,
-               bool connect_inputs = true,
-               ChanCount input_start = ChanCount (),
-               ChanCount output_start = ChanCount ()
-               );
+       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 */
 
@@ -1235,17 +1243,20 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        mutable Glib::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;
 
-  public:      
+  public:
        typedef std::map<PBD::ID,boost::shared_ptr<Source> > SourceMap;
 
-  private:     
+  private:
        SourceMap sources;
 
   public:
@@ -1263,6 +1274,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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 &);
 
        /* NAMED SELECTIONS */
 
@@ -1355,14 +1367,12 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void reset_jack_connection (jack_client_t* jack);
        void process_rtop (SessionEvent*);
 
-#ifdef HAVE_JACK_NEW_LATENCY
-        void  update_latency (bool playback);
-#endif
+       void  update_latency (bool playback);
 
        XMLNode& state(bool);
 
        /* click track */
-
+       typedef std::list<Click*> Clicks;
        Clicks                 clicks;
        bool                  _clicking;
        boost::shared_ptr<IO> _click_io;
@@ -1421,7 +1431,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        Glib::Mutex controllables_lock;
        Controllables controllables;
 
-        boost::shared_ptr<PBD::Controllable> _solo_cut_control;
+       boost::shared_ptr<PBD::Controllable> _solo_cut_control;
 
        void reset_native_file_format();
        bool first_file_data_format_reset;
@@ -1446,10 +1456,16 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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_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*/ );
@@ -1457,6 +1473,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        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_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;
@@ -1464,7 +1481,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void add_session_range_location (framepos_t, framepos_t);
 
        void setup_midi_machine_control ();
-       void cleanup_stubfiles ();
 
        void route_order_key_changed ();
 
@@ -1479,7 +1495,11 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
        void start_time_changed (framepos_t);
        void end_time_changed (framepos_t);
 
-        boost::shared_ptr<Speakers> _speakers; 
+       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);
 };
 
 } // namespace ARDOUR