remove InputConfigurationChange from session events, since it is a no-op in this...

[ardour.git] / libs / ardour / ardour / session.h

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index f1cb739673318590a1b6e0d6cced42eb3f0ae5b0..6a61293642034f840a09e4a83f4531203d696b76 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -115,7 +115,6 @@ class Butler;
 class Click;
 class ControllableDescriptor;
 class CoreSelection;
-class Diskstream;
 class ExportHandler;
 class ExportStatus;
 class Graph;
@@ -259,7 +258,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
         */
        RouteList new_route_from_template (uint32_t how_many, PresentationInfo::order_t insert_at, const std::string& template_path, const std::string& name, PlaylistDisposition pd = NewPlaylist);
        RouteList new_route_from_template (uint32_t how_many, PresentationInfo::order_t insert_at, XMLNode&, const std::string& name, PlaylistDisposition pd = NewPlaylist);
-       std::vector<std::string> get_paths_for_new_sources (bool allow_replacing, const std::string& import_file_path, 
+       std::vector<std::string> get_paths_for_new_sources (bool allow_replacing, const std::string& import_file_path,
                                                            uint32_t channels, std::vector<std::string> const & smf_track_names);
 
        int bring_all_sources_into_session (boost::function<void(uint32_t,uint32_t,std::string)> callback);
@@ -283,8 +282,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
 
        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 ();
@@ -328,7 +325,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        boost::shared_ptr<Stripable> get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag) const;
        boost::shared_ptr<Route> get_remote_nth_route (PresentationInfo::order_t n) const;
        boost::shared_ptr<Route> route_by_selected_count (uint32_t cnt) const;
-       boost::shared_ptr<Track> track_by_diskstream_id (PBD::ID) const;
        void routes_using_input_from (const std::string& str, RouteList& rl);
 
        bool route_name_unique (std::string) const;
@@ -433,11 +429,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        void allow_auto_play (bool yn);
        void request_transport_speed (double speed, bool as_default = true);
        void request_transport_speed_nonzero (double, bool as_default = true);
-       void request_overwrite_buffer (Track *);
+       void request_overwrite_buffer (boost::shared_ptr<Route>);
        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); }
        bool declick_out_pending() const { return static_cast<bool>(transport_sub_state&(PendingDeclickOut)); }
@@ -531,7 +525,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        int archive_session (const std::string&, const std::string&, ArchiveEncode compress_audio = FLAC_16BIT, bool only_used_sources = false, Progress* p = 0);
 
        int restore_state (std::string snapshot_name);
-       int save_template (std::string template_name, bool replace_existing = false);
+       int save_template (const std::string& template_name, const std::string& description = "", bool replace_existing = false);
        int save_history (std::string snapshot_name = "");
        int restore_history (std::string snapshot_name);
        void remove_state (std::string snapshot_name);
@@ -1203,6 +1197,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        void reconnect_ltc_output ();
 
        VCAManager& vca_manager() { return *_vca_manager; }
+       VCAManager* vca_manager_ptr() { return _vca_manager; }
 
        void auto_connect_thread_wakeup ();
 
@@ -1421,8 +1416,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        Glib::Threads::Mutex save_state_lock;
        Glib::Threads::Mutex peak_cleanup_lock;
 
-       int      load_options (const XMLNode&);
-       int      load_state (std::string snapshot_name);
+       int        load_options (const XMLNode&);
+       int        load_state (std::string snapshot_name);
+       static int parse_stateful_loading_version (const std::string&);
 
        framepos_t _last_roll_location;
        /** the session frame time at which we last rolled, located, or changed transport direction */
@@ -1701,7 +1697,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        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 for_loop_enabled=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, framepos_t destination_frame, bool abort = false, bool clear_state = false, bool as_default = false);
        void stop_transport (bool abort = false, bool clear_state = false);
        void start_transport ();
@@ -1940,8 +1935,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        void   add_click (framepos_t pos, bool emphasis);
        framecnt_t _count_in_samples;
 
-       std::vector<Route*> master_outs;
-
        /* range playback */
 
        std::list<AudioRange> current_audio_range;
@@ -2037,9 +2030,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
        void rt_set_controls (boost::shared_ptr<ControlList>, double val, PBD::Controllable::GroupControlDisposition group_override);
        void rt_clear_all_solo_state (boost::shared_ptr<RouteList>, bool yn, PBD::Controllable::GroupControlDisposition group_override);
 
-       /** temporary list of Diskstreams used only during load of 2.X sessions */
-       std::list<boost::shared_ptr<Diskstream> > _diskstreams_2X;
-
        void set_session_range_location (framepos_t, framepos_t);
 
        void setup_midi_machine_control ();