X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsession.h;h=bb2da411c851b4a18a544e8e90a954aa7170229c;hb=3f4d49fd2f6fca3237668897e91212ea93b05b07;hp=4efe41f9cc0114876575178cfa94182dfbee0ed5;hpb=a9187a9e25b1e44c4d15132b24d189db564fb924;p=ardour.git diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 4efe41f9cc..bb2da411c8 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -63,10 +64,13 @@ #include "ardour/luascripting.h" #include "ardour/location.h" #include "ardour/monitor_processor.h" +#include "ardour/presentation_info.h" #include "ardour/rc_configuration.h" #include "ardour/session_configuration.h" #include "ardour/session_event.h" #include "ardour/interpolation.h" +#include "ardour/plugin.h" +#include "ardour/presentation_info.h" #include "ardour/route.h" #include "ardour/route_graph.h" @@ -84,7 +88,6 @@ class Parser; namespace PBD { class Controllable; -class ControllableDescriptor; } namespace luabridge { @@ -110,6 +113,7 @@ class BufferSet; class Bundle; class Butler; class Click; +class ControllableDescriptor; class Diskstream; class ExportHandler; class ExportStatus; @@ -146,6 +150,7 @@ class Source; class Speakers; class TempoMap; class Track; +class VCAManager; class WindowsVSTPlugin; extern void setup_enum_writer (); @@ -186,6 +191,12 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop static int get_info_from_path (const std::string& xmlpath, float& sample_rate, SampleFormat& data_format); static std::string get_snapshot_from_instant (const std::string& session_dir); + /** a monotonic counter used for naming user-visible things uniquely + * (curently the sidechain port). + * Use sparingly to keep the numbers low, prefer PBD::ID for all + * internal, not user-visible IDs */ + static unsigned int next_name_id (); + std::string path() const { return _path; } std::string name() const { return _name; } std::string snap_name() const { return _current_snapshot_name; } @@ -202,11 +213,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool deletion_in_progress() const { return _state_of_the_state & Deletion; } bool routes_deletion_in_progress() const { return _route_deletion_in_progress; } bool peaks_cleanup_in_progres() const { return _state_of_the_state & PeakCleanup; } + bool loading () const { return _state_of_the_state & Loading; } PBD::Signal0 DirtyChanged; - PBD::Signal1 RouteAddedOrRemoved; - const SessionDirectory& session_directory () const { return *(_session_dir.get()); } static PBD::Signal1 Dialog; @@ -228,8 +238,15 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop std::string new_audio_source_path_for_embedded (const std::string& existing_path); std::string new_audio_source_path (const std::string&, uint32_t nchans, uint32_t chan, bool destructive, bool take_required); std::string new_midi_source_path (const std::string&); - RouteList new_route_from_template (uint32_t how_many, const std::string& template_path, const std::string& name, PlaylistDisposition pd = NewPlaylist); - RouteList new_route_from_template (uint32_t how_many, XMLNode&, const std::string& name, PlaylistDisposition pd = NewPlaylist); + /** create a new track or bus from a template (XML path) + * @param how_many how many tracks or busses to create + * @param template_path path to xml template file + * @param name name (prefix) of the route to create + * @param pd Playlist disposition + * @return list of newly created routes + */ + 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 get_paths_for_new_sources (bool allow_replacing, const std::string& import_file_path, uint32_t channels); int bring_all_sources_into_session (boost::function callback); @@ -260,6 +277,14 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop return routes.reader (); } + /* because the set of Stripables consists of objects managed + * independently, in multiple containers within the Session (or objects + * owned by the session), we fill out a list in-place rather than + * return a pointer to a copy of the (RCU) managed list, as happens + * with get_routes() + */ + + void get_stripables (StripableList&) const; boost::shared_ptr get_tracks() const; boost::shared_ptr get_routes_with_internal_returns() const; boost::shared_ptr get_routes_with_regions_at (framepos_t const) const; @@ -276,21 +301,20 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool operator() (boost::shared_ptr, boost::shared_ptr b); }; - void set_order_hint (int32_t order_hint) {_order_hint = order_hint;}; - void notify_remote_id_change (); - void sync_order_keys (); + void notify_presentation_info_change (); template void foreach_route (T *obj, void (T::*func)(Route&), bool sort = true); template void foreach_route (T *obj, void (T::*func)(boost::shared_ptr), bool sort = true); template void foreach_route (T *obj, void (T::*func)(Route&, A), A arg, bool sort = true); static char session_name_is_legal (const std::string&); - bool io_name_is_legal (const std::string&); - boost::shared_ptr route_by_name (std::string); - boost::shared_ptr route_by_id (PBD::ID); - boost::shared_ptr route_by_remote_id (uint32_t id); - boost::shared_ptr route_by_selected_count (uint32_t cnt); - boost::shared_ptr track_by_diskstream_id (PBD::ID); + bool io_name_is_legal (const std::string&) const; + boost::shared_ptr route_by_name (std::string) const; + boost::shared_ptr route_by_id (PBD::ID) const; + boost::shared_ptr get_remote_nth_stripable (PresentationInfo::order_t n, PresentationInfo::Flag) const; + boost::shared_ptr get_remote_nth_route (PresentationInfo::order_t n) const; + boost::shared_ptr route_by_selected_count (uint32_t cnt) const; + boost::shared_ptr 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; @@ -316,7 +340,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void maybe_enable_record (); void disable_record (bool rt_context, bool force = false); void step_back_from_record (); - + void set_all_tracks_record_enabled(bool); void maybe_write_autosave (); @@ -435,6 +459,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void set_auto_punch_location (Location *); void set_auto_loop_location (Location *); void set_session_extents (framepos_t start, framepos_t end); + void set_end_is_free (bool); int location_name(std::string& result, std::string base = std::string("")); pframes_t get_block_size() const { return current_block_size; } @@ -472,6 +497,13 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop }; int save_as (SaveAs&); + /** save session + * @param snapshot_name name of the session (use an empty string for the current name) + * @param pending save a 'recovery', not full state (default: false) + * @param switch_to_snapshot switch to given snapshot after saving (default: false) + * @param template_only save a session template (default: false) + * @return zero on success + */ int save_state (std::string snapshot_name, bool pending = false, bool switch_to_snapshot = false, bool template_only = false); int restore_state (std::string snapshot_name); int save_template (std::string template_name, bool replace_existing = false); @@ -570,24 +602,24 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop std::list > new_audio_track ( 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, std::string name_template = "" + RouteGroup* route_group, + uint32_t how_many, + std::string name_template, + PresentationInfo::order_t order, + TrackMode mode = Normal ); std::list > new_midi_track ( const ChanCount& input, const ChanCount& output, - boost::shared_ptr instrument = boost::shared_ptr(), - TrackMode mode = Normal, - RouteGroup* route_group = 0, uint32_t how_many = 1, std::string name_template = "" + boost::shared_ptr instrument, + Plugin::PresetRecord* pset, + RouteGroup* route_group, uint32_t how_many, std::string name_template, + PresentationInfo::order_t, + TrackMode mode = Normal ); - RouteList new_midi_route (RouteGroup* route_group, uint32_t how_many, std::string name_template = "", boost::shared_ptr instrument = boost::shared_ptr()); + RouteList new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many, std::string name_template, PresentationInfo::Flag, PresentationInfo::order_t); + RouteList new_midi_route (RouteGroup* route_group, uint32_t how_many, std::string name_template, boost::shared_ptr instrument, Plugin::PresetRecord*, PresentationInfo::Flag, PresentationInfo::order_t); void remove_routes (boost::shared_ptr); void remove_route (boost::shared_ptr); @@ -644,8 +676,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool synced_to_ltc () const { return config.get_external_sync() && Config->get_sync_source() == LTC && g_atomic_int_get (const_cast(&_ltc_active)); } double transport_speed() const { return _transport_speed; } - bool transport_stopped() const { return _transport_speed == 0.0f; } - bool transport_rolling() const { return _transport_speed != 0.0f; } + bool transport_stopped() const { return _transport_speed == 0.0; } + bool transport_rolling() const { return _transport_speed != 0.0; } bool silent () { return _silent; } @@ -672,7 +704,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop boost::shared_ptr get_export_handler (); boost::shared_ptr get_export_status (); - int start_audio_export (framepos_t position); + int start_audio_export (framepos_t position, bool realtime = false); PBD::Signal1 ProcessExport; static PBD::Signal2 Exported; @@ -706,6 +738,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop */ static PBD::Signal2 AskAboutSampleRateMismatch; + /** non interactive message */ + static PBD::Signal2 NotifyAboutSampleRateMismatch; + /** handlers should return !0 for use pending state, 0 for ignore it. */ static PBD::Signal0 AskAboutPendingState; @@ -756,18 +791,17 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool soloing() const { return _non_soloed_outs_muted; } bool listening() const { return _listen_cnt > 0; } bool solo_isolated() const { return _solo_isolated_cnt > 0; } + void cancel_all_solo (); static const SessionEvent::RTeventCallback rt_cleanup; - void set_solo (boost::shared_ptr, bool, SessionEvent::RTeventCallback after = rt_cleanup, PBD::Controllable::GroupControlDisposition group_override = PBD::Controllable::UseGroup); void clear_all_solo_state (boost::shared_ptr); - void set_just_one_solo (boost::shared_ptr, bool, SessionEvent::RTeventCallback after = rt_cleanup); - void set_mute (boost::shared_ptr, bool, SessionEvent::RTeventCallback after = rt_cleanup, PBD::Controllable::GroupControlDisposition group_override = PBD::Controllable::UseGroup); - void set_listen (boost::shared_ptr, bool, SessionEvent::RTeventCallback after = rt_cleanup, PBD::Controllable::GroupControlDisposition group_override = PBD::Controllable::UseGroup); - void set_record_enabled (boost::shared_ptr, bool, SessionEvent::RTeventCallback after = rt_cleanup, PBD::Controllable::GroupControlDisposition group_override = PBD::Controllable::UseGroup); - void set_record_safe (boost::shared_ptr, bool yn, SessionEvent::RTeventCallback after = rt_cleanup, PBD::Controllable::GroupControlDisposition group_override = PBD::Controllable::UseGroup); - void set_solo_isolated (boost::shared_ptr, bool, SessionEvent::RTeventCallback after = rt_cleanup, PBD::Controllable::GroupControlDisposition group_override = PBD::Controllable::UseGroup); - void set_monitoring (boost::shared_ptr, MonitorChoice, SessionEvent::RTeventCallback after = rt_cleanup, PBD::Controllable::GroupControlDisposition group_override = PBD::Controllable::UseGroup); + + /* Control-based methods */ + + void set_controls (boost::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); + void set_control (boost::shared_ptr, double val, PBD::Controllable::GroupControlDisposition); + void set_exclusive_input_active (boost::shared_ptr rt, bool onoff, bool flip_others = false); PBD::Signal1 SoloActive; @@ -840,13 +874,11 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /** Undo some transactions. * @param n Number of transactions to undo. */ - void undo (uint32_t n) { - _history.undo (n); - } - - void redo (uint32_t n) { - _history.redo (n); - } + void undo (uint32_t n); + /** Redo some transactions. + * @param n Number of transactions to undo. + */ + void redo (uint32_t n); UndoHistory& history() { return _history; } @@ -855,13 +887,38 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop std::string next_undo() const { return _history.next_undo(); } std::string next_redo() const { return _history.next_redo(); } + /** begin collecting undo information + * + * This call must always be followed by either + * begin_reversible_command() or commit_reversible_command() + * + * @param cmd_name human readable name for the undo operation + */ void begin_reversible_command (const std::string& cmd_name); void begin_reversible_command (GQuark); + /** abort an open undo command + * This must only be called after begin_reversible_command () + */ void abort_reversible_command (); + /** finalize an undo command and commit pending transactions + * + * This must only be called after begin_reversible_command () + * @param cmd (additional) command to add + */ void commit_reversible_command (Command* cmd = 0); void add_command (Command *const cmd); + /** create an StatefulDiffCommand from the given object and add it to the stack. + * + * This function must only be called after begin_reversible_command. + * Failing to do so may lead to a crash. + * + * @param sfd the object to diff + * @returns the allocated StatefulDiffCommand (already added via add_command) + */ + PBD::StatefulDiffCommand* add_stateful_diff_command (boost::shared_ptr sfd); + /** @return The list of operations that are currently in progress */ std::list const & current_operations () { return _current_trans_quarks; @@ -939,7 +996,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop boost::shared_ptr processor_by_id (PBD::ID) const; boost::shared_ptr controllable_by_id (const PBD::ID&); - boost::shared_ptr controllable_by_descriptor (const PBD::ControllableDescriptor&); + boost::shared_ptr controllable_by_descriptor (const ARDOUR::ControllableDescriptor&); void add_controllable (boost::shared_ptr); void remove_controllable (PBD::Controllable*); @@ -948,6 +1005,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop SessionConfiguration config; + SessionConfiguration* cfg () { return &config; } + bool exporting () const { return _exporting; } @@ -1067,11 +1126,17 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void reconnect_ltc_input (); void reconnect_ltc_output (); + VCAManager& vca_manager() { return *_vca_manager; } + + bool midi_regions_use_bbt_beats () { return _midi_regions_use_bbt_beats; } + protected: friend class AudioEngine; void set_block_size (pframes_t nframes); void set_frame_rate (framecnt_t nframes); +#ifdef USE_TRACKS_CODE_FEATURES void reconnect_existing_routes (bool withLock, bool reconnect_master = true, bool reconnect_inputs = true, bool reconnect_outputs = true); +#endif protected: friend class Route; @@ -1082,6 +1147,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop int create (const std::string& mix_template, BusProfile*); void destroy (); + static guint _name_id_counter; + static void init_name_id_counter (guint n); + static unsigned int name_id_counter (); + enum SubState { PendingDeclickIn = 0x1, ///< pending de-click fade-in for start PendingDeclickOut = 0x2, ///< pending de-click fade-out for stop @@ -1103,13 +1172,14 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop process_function_type last_process_function; bool _bounce_processing_active; bool waiting_for_sync_offset; - 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 + framecnt_t _base_frame_rate; // sample-rate of the session at creation time, "native" SR + framecnt_t _nominal_frame_rate; // overridden by audioengine setting + framecnt_t _current_frame_rate; // this includes video pullup offset int transport_sub_state; mutable gint _record_status; framepos_t _transport_frame; Location* _session_range_location; ///< session range, or 0 if there is nothing in the session yet + bool _session_range_end_is_free; Slave* _slave; bool _silent; @@ -1162,8 +1232,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void process_without_events (pframes_t); void process_with_events (pframes_t); void process_audition (pframes_t); - int process_export (pframes_t); - int process_export_fw (pframes_t); + void process_export (pframes_t); + void 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); } @@ -1200,7 +1270,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool _exporting; bool _export_rolling; + bool _realtime_export; framepos_t _export_preroll; + framepos_t _export_latency; boost::shared_ptr export_handler; boost::shared_ptr export_status; @@ -1359,7 +1431,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void auto_loop_changed (Location *); void auto_loop_declick_range (Location *, framepos_t &, framepos_t &); - int ensure_engine (uint32_t desired_sample_rate); + int ensure_engine (uint32_t desired_sample_rate, bool); void pre_engine_init (std::string path); int post_engine_init (); int immediately_post_engine (); @@ -1407,6 +1479,47 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop pthread_cond_t _rt_emit_cond; bool _rt_emit_pending; + /* Auto Connect Thread */ + static void *auto_connect_thread (void *); + void auto_connect_thread_run (); + void auto_connect_thread_start (); + void auto_connect_thread_terminate (); + + pthread_t _auto_connect_thread; + bool _ac_thread_active; + pthread_mutex_t _auto_connect_mutex; + pthread_cond_t _auto_connect_cond; + + struct AutoConnectRequest { + public: + AutoConnectRequest (boost::shared_ptr r, bool ci, + const ChanCount& is, + const ChanCount& os, + const ChanCount& io, + const ChanCount& oo) + : route (boost::weak_ptr (r)) + , connect_inputs (ci) + , input_start (is) + , output_start (os) + , input_offset (io) + , output_offset (oo) + {} + + boost::weak_ptr route; + bool connect_inputs; + ChanCount input_start; + ChanCount output_start; + ChanCount input_offset; + ChanCount output_offset; + }; + + typedef std::queue AutoConnectQueue; + Glib::Threads::Mutex _auto_connect_queue_lock; + AutoConnectQueue _auto_connect_queue; + guint _latency_recompute_pending; + + void auto_connect (const AutoConnectRequest&); + void queue_latency_recompute (); /* SessionEventManager interface */ @@ -1540,6 +1653,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop TempoMap *_tempo_map; void tempo_map_changed (const PBD::PropertyChange&); + void gui_tempo_map_changed (); /* edit/mix groups */ @@ -1554,8 +1668,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop SerializedRCUManager routes; - void add_routes (RouteList&, bool input_auto_connect, bool output_auto_connect, bool save); - void add_routes_inner (RouteList&, bool input_auto_connect, bool output_auto_connect); + void add_routes (RouteList&, bool input_auto_connect, bool output_auto_connect, bool save, PresentationInfo::order_t); + void add_routes_inner (RouteList&, bool input_auto_connect, bool output_auto_connect, PresentationInfo::order_t); bool _adding_routes_in_progress; bool _reconnecting_routes_in_progress; bool _route_deletion_in_progress; @@ -1569,9 +1683,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool find_route_name (std::string const &, uint32_t& id, std::string& name, bool); void count_existing_track_channels (ChanCount& in, ChanCount& out); - void auto_connect_route (boost::shared_ptr route, ChanCount& existing_inputs, ChanCount& existing_outputs, - bool with_lock, bool connect_inputs = true, - ChanCount input_start = ChanCount (), ChanCount output_start = ChanCount ()); + void auto_connect_route (boost::shared_ptr, bool, const ChanCount&, const ChanCount&, const ChanCount& io = ChanCount(), const ChanCount& oo = ChanCount()); void midi_output_change_handler (IOChange change, void* /*src*/, boost::weak_ptr midi_track); /* track numbering */ @@ -1579,12 +1691,13 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void reassign_track_numbers (); uint32_t _track_number_decimals; - /* mixer stuff */ + /* solo/mute/notifications */ void route_listen_changed (PBD::Controllable::GroupControlDisposition, boost::weak_ptr); void route_mute_changed (); void route_solo_changed (bool self_solo_change, PBD::Controllable::GroupControlDisposition group_override, boost::weak_ptr); void route_solo_isolated_changed (boost::weak_ptr); + void update_route_solo_state (boost::shared_ptr r = boost::shared_ptr()); void listen_position_changed (); @@ -1819,15 +1932,30 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop return ev; } - void rt_set_solo (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); + /* specialized version realtime "apply to set of routes" operations */ + template SessionEvent* + get_rt_event (boost::shared_ptr rl, T1 t1arg, T2 t2arg, SessionEvent::RTeventCallback after, PBD::Controllable::GroupControlDisposition group_override, + void (Session::*method) (boost::shared_ptr, T1, T2, PBD::Controllable::GroupControlDisposition)) { + SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); + ev->rt_slot = boost::bind (method, this, rl, t1arg, t2arg, group_override); + ev->rt_return = after; + ev->event_loop = PBD::EventLoop::get_event_loop_for_thread (); + + return ev; + } + + /* specialized version realtime "apply to set of controls" operations */ + SessionEvent* get_rt_event (boost::shared_ptr cl, double arg, PBD::Controllable::GroupControlDisposition group_override) { + SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); + ev->rt_slot = boost::bind (&Session::rt_set_controls, this, cl, arg, group_override); + ev->rt_return = Session::rt_cleanup; + ev->event_loop = PBD::EventLoop::get_event_loop_for_thread (); + + return ev; + } + + void rt_set_controls (boost::shared_ptr, double val, PBD::Controllable::GroupControlDisposition group_override); void rt_clear_all_solo_state (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); - void rt_set_just_one_solo (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition /* ignored*/ ); - void rt_set_mute (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); - void rt_set_listen (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); - void rt_set_solo_isolated (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); - void rt_set_record_enabled (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); - void rt_set_record_safe (boost::shared_ptr, bool yn, PBD::Controllable::GroupControlDisposition group_override); - void rt_set_monitoring (boost::shared_ptr, MonitorChoice, PBD::Controllable::GroupControlDisposition group_override); /** temporary list of Diskstreams used only during load of 2.X sessions */ std::list > _diskstreams_2X; @@ -1858,8 +1986,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop */ GraphEdges _current_route_graph; - uint32_t next_control_id () const; - int32_t _order_hint; + void ensure_route_presentation_info_gap (PresentationInfo::order_t, uint32_t gap_size); bool ignore_route_processor_changes; MidiClockTicker* midi_clock; @@ -1885,6 +2012,14 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop static const uint32_t session_end_shift; std::string _template_state_dir; + + VCAManager* _vca_manager; + + boost::shared_ptr get_midi_nth_route_by_id (PresentationInfo::order_t n) const; + + std::string created_with; + + bool _midi_regions_use_bbt_beats; };