X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsession.h;h=6a61293642034f840a09e4a83f4531203d696b76;hb=cb0d9f5607da6465efa619cc7f5fb2152bf1b498;hp=213e9dcf4b87937eeade373f0a597a278c747937;hpb=aeb1c7121136008fad747d371b756314a3f7e944;p=ardour.git diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 213e9dcf4b..6a61293642 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -114,7 +114,7 @@ class Bundle; class Butler; class Click; class ControllableDescriptor; -class Diskstream; +class CoreSelection; class ExportHandler; class ExportStatus; class Graph; @@ -199,7 +199,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop virtual ~Session (); - static int get_info_from_path (const std::string& xmlpath, float& sample_rate, SampleFormat& data_format); + static int get_info_from_path (const std::string& xmlpath, float& sample_rate, SampleFormat& data_format, std::string& program_version); static std::string get_snapshot_from_instant (const std::string& session_dir); /** a monotonic counter used for naming user-visible things uniquely @@ -248,7 +248,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop std::string format_audio_source_name (const std::string& legalized_base, uint32_t nchan, uint32_t chan, bool destructive, bool take_required, uint32_t cnt, bool related_exists); 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&); + std::string new_midi_source_path (const std::string&, bool need_source_lock = true); /** 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 @@ -258,7 +258,8 @@ 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 get_paths_for_new_sources (bool allow_replacing, const std::string& import_file_path, uint32_t channels); + std::vector get_paths_for_new_sources (bool allow_replacing, const std::string& import_file_path, + uint32_t channels, std::vector const & smf_track_names); int bring_all_sources_into_session (boost::function callback); @@ -281,13 +282,13 @@ 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 get_routes() const { return routes.reader (); } + CoreSelection& selection () { return *_selection; } + /* 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 @@ -296,10 +297,12 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop */ void get_stripables (StripableList&) const; + StripableList get_stripables () 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; + uint32_t nstripables (bool with_monitor = false) const; uint32_t nroutes() const { return routes.reader()->size(); } uint32_t ntracks () const; uint32_t nbusses () const; @@ -308,10 +311,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop return _bundles.reader (); } - struct LIBARDOUR_API RoutePublicOrderSorter { - bool operator() (boost::shared_ptr, boost::shared_ptr b); - }; - void notify_presentation_info_change (); template void foreach_route (T *obj, void (T::*func)(Route&), bool sort = true); @@ -322,10 +321,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop 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 stripable_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; @@ -348,7 +347,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop } bool record_enabling_legal () const; - void maybe_enable_record (); + void maybe_enable_record (bool rt_context = false); void disable_record (bool rt_context, bool force = false); void step_back_from_record (); @@ -425,16 +424,14 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop framepos_t last_transport_start () const { return _last_roll_location; } void goto_end (); - void goto_start (); + void goto_start (bool and_roll = false); void use_rf_shuttle_speed (); 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); 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(post_transport_work()&PostTransportLocate); } bool declick_out_pending() const { return static_cast(transport_sub_state&(PendingDeclickOut)); } @@ -450,7 +447,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop 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; } + double samples_per_timecode_frame() const { return _samples_per_timecode_frame; } framecnt_t timecode_frames_per_hour() const { return _timecode_frames_per_hour; } MIDI::byte get_mtc_timecode_bits() const { @@ -471,6 +468,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); + bool end_is_free () const { return _session_range_end_is_free; } void set_end_is_free (bool); int location_name(std::string& result, std::string base = std::string("")); @@ -524,10 +522,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop FLAC_24BIT }; - int archive_session (const std::string&, const std::string&, ArchiveEncode compress_audio = FLAC_16BIT, Progress* p = 0); + 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); @@ -562,6 +560,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop XMLNode& get_state(); int set_state(const XMLNode& node, int version); // not idempotent XMLNode& get_template(); + bool export_track_state (boost::shared_ptr rl, const std::string& path); /// The instant xml file is written to the session directory void add_instant_xml (XMLNode&, bool write_to_config = true); @@ -581,23 +580,45 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop StateOfTheState state_of_the_state() const { return _state_of_the_state; } class StateProtector { - public: - StateProtector (Session* s) : _session (s) { - g_atomic_int_inc (&s->_suspend_save); - } - ~StateProtector () { - if (g_atomic_int_dec_and_test (&_session->_suspend_save)) { - while (_session->_save_queued) { - _session->_save_queued = false; - _session->save_state (""); + public: + StateProtector (Session* s) : _session (s) { + g_atomic_int_inc (&s->_suspend_save); + } + ~StateProtector () { + if (g_atomic_int_dec_and_test (&_session->_suspend_save)) { + while (_session->_save_queued) { + _session->_save_queued = false; + _session->save_state (""); + } } } - } - private: - Session * _session; + private: + Session * _session; + }; + + class ProcessorChangeBlocker { + public: + ProcessorChangeBlocker (Session* s, bool rc = true) + : _session (s) + , _reconfigure_on_delete (rc) + { + g_atomic_int_inc (&s->_ignore_route_processor_changes); + } + ~ProcessorChangeBlocker () { + if (g_atomic_int_dec_and_test (&_session->_ignore_route_processor_changes)) { + if (_reconfigure_on_delete) { + _session->route_processors_changed (RouteProcessorChange ()); + } + } + } + private: + Session* _session; + bool _reconfigure_on_delete; }; + RouteGroup* new_route_group (const std::string&); void add_route_group (RouteGroup *); + void remove_route_group (RouteGroup* rg) { if (rg) remove_route_group (*rg); } void remove_route_group (RouteGroup&); void reorder_route_groups (std::list); @@ -631,7 +652,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop ); std::list > new_midi_track ( - const ChanCount& input, const ChanCount& output, + const ChanCount& input, const ChanCount& output, bool strict_io, boost::shared_ptr instrument, Plugin::PresetRecord* pset, RouteGroup* route_group, uint32_t how_many, std::string name_template, @@ -640,7 +661,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop ); 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); + RouteList new_midi_route (RouteGroup* route_group, uint32_t how_many, std::string name_template, bool strict_io, boost::shared_ptr instrument, Plugin::PresetRecord*, PresentationInfo::Flag, PresentationInfo::order_t); void remove_routes (boost::shared_ptr); void remove_route (boost::shared_ptr); @@ -657,7 +678,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop framepos_t transport_frame () const {return _transport_frame; } framepos_t record_location () const {return _last_record_location; } - framepos_t audible_frame () const; + framepos_t audible_frame (bool* latent_locate = NULL) const; framepos_t requested_return_frame() const { return _requested_return_frame; } void set_requested_return_frame(framepos_t return_to); @@ -696,9 +717,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool synced_to_mtc () const { return config.get_external_sync() && Config->get_sync_source() == MTC && g_atomic_int_get (const_cast(&_mtc_active)); } 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; } + double transport_speed() const { return _count_in_samples > 0 ? 0. : _transport_speed; } bool transport_stopped() const { return _transport_speed == 0.0; } - bool transport_rolling() const { return _transport_speed != 0.0; } + bool transport_rolling() const { return _transport_speed != 0.0 && _count_in_samples == 0; } bool silent () { return _silent; } @@ -725,7 +746,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, bool realtime = false); + int start_audio_export (framepos_t position, bool realtime = false, bool region_export = false, bool comensate_master_latency = false); PBD::Signal1 ProcessExport; static PBD::Signal2 Exported; @@ -774,7 +795,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop boost::shared_ptr source_by_id (const PBD::ID&); boost::shared_ptr audio_source_by_path_and_channel (const std::string&, uint16_t) const; - boost::shared_ptr midi_source_by_path (const std::string&) const; + boost::shared_ptr midi_source_by_path (const std::string&, bool need_source_lock) const; uint32_t count_sources_by_origin (const std::string&); void add_playlist (boost::shared_ptr, bool unused = false); @@ -799,6 +820,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop uint32_t registered_lua_function_count () const { return _n_lua_scripts; } void scripts_changed (); // called from lua, updates _n_lua_scripts + PBD::Signal0 LuaScriptsChanged; + /* flattening stuff */ boost::shared_ptr write_one_track (Track&, framepos_t start, framepos_t end, @@ -809,6 +832,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /* session-wide solo/mute/rec-enable */ + bool muted() const; + std::vector > cancel_all_mute (); + bool soloing() const { return _non_soloed_outs_muted; } bool listening() const { return _listen_cnt > 0; } bool solo_isolated() const { return _solo_isolated_cnt > 0; } @@ -827,12 +853,14 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop PBD::Signal1 SoloActive; PBD::Signal0 SoloChanged; + PBD::Signal0 MuteChanged; PBD::Signal0 IsolatedChanged; PBD::Signal0 MonitorChanged; PBD::Signal0 session_routes_reconnected; /* monitor/master out */ + int add_master_bus (ChanCount const&); void add_monitor_section (); void reset_monitor_section (); @@ -842,6 +870,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop boost::shared_ptr monitor_out() const { return _monitor_out; } boost::shared_ptr master_out() const { return _master_out; } + PresentationInfo::order_t master_order_key () const { return _master_out ? _master_out->presentation_info ().order () : -1; } + bool ensure_stripable_sort_order (); + void globally_add_internal_sends (boost::shared_ptr dest, Placement p, bool); void globally_set_send_gains_from_track (boost::shared_ptr dest); void globally_set_send_gains_to_zero (boost::shared_ptr dest); @@ -974,6 +1005,18 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void maybe_update_session_range (framepos_t, framepos_t); + /* preroll */ + framecnt_t preroll_samples (framepos_t) const; + + void request_preroll_record_punch (framepos_t start, framecnt_t preroll); + void request_preroll_record_trim (framepos_t start, framecnt_t preroll); + void request_count_in_record (); + + framepos_t preroll_record_punch_pos () const { return _preroll_record_punch_pos; } + bool preroll_record_punch_enabled () const { return _preroll_record_punch_pos >= 0; } + + framecnt_t preroll_record_trim_len () const { return _preroll_record_trim_len; } + /* temporary hacks to allow selection to be pushed from GUI into backend. Whenever we move the selection object into libardour, these will go away. */ @@ -987,6 +1030,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop gain_t* gain_automation_buffer () const; gain_t* trim_automation_buffer () const; gain_t* send_gain_automation_buffer () const; + gain_t* scratch_automation_buffer () const; pan_t** pan_automation_buffer () const; void ensure_buffer_set (BufferSet& buffers, const ChanCount& howmany); @@ -1017,6 +1061,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 automation_control_by_id (const PBD::ID&); boost::shared_ptr controllable_by_descriptor (const ARDOUR::ControllableDescriptor&); void add_controllable (boost::shared_ptr); @@ -1107,6 +1152,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop */ static PBD::Signal3 MissingFile; + void set_missing_file_replacement (const std::string& mfr) { + _missing_file_replacement = mfr; + } + /** Emitted when the session wants Ardour to quit */ static PBD::Signal0 Quit; @@ -1148,8 +1197,10 @@ 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 (); - bool midi_regions_use_bbt_beats () { return _midi_regions_use_bbt_beats; } protected: friend class AudioEngine; @@ -1221,6 +1272,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool _under_nsm_control; unsigned int _xrun_count; + std::string _missing_file_replacement; + void mtc_status_changed (bool); PBD::ScopedConnection mtc_status_connection; void ltc_status_changed (bool); @@ -1283,6 +1336,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool _exporting; bool _export_rolling; bool _realtime_export; + bool _region_export; framepos_t _export_preroll; framepos_t _export_latency; @@ -1338,7 +1392,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop * 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; framepos_t last_loopend; @@ -1363,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 */ @@ -1397,7 +1451,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop static const PostTransportWork ProcessCannotProceedMask = PostTransportWork ( PostTransportInputChange| - PostTransportSpeed| PostTransportReverse| PostTransportCurveRealloc| PostTransportAudition| @@ -1498,7 +1551,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void auto_connect_thread_terminate (); pthread_t _auto_connect_thread; - bool _ac_thread_active; + gint _ac_thread_active; pthread_mutex_t _auto_connect_mutex; pthread_cond_t _auto_connect_cond; @@ -1530,6 +1583,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop AutoConnectQueue _auto_connect_queue; guint _latency_recompute_pending; + void get_physical_ports (std::vector& inputs, std::vector& outputs, DataType type, + MidiPortFlags include = MidiPortFlags (0), + MidiPortFlags exclude = MidiPortFlags (0)); + void auto_connect (const AutoConnectRequest&); void queue_latency_recompute (); @@ -1576,7 +1633,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop 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 */ + double _samples_per_timecode_frame; /* has to be floating point because of drop frame */ framecnt_t _frames_per_hour; framecnt_t _timecode_frames_per_hour; @@ -1617,6 +1674,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop 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); + PBD::ScopedConnectionList ltc_tx_connections; + void reset_record_status (); @@ -1638,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 (); @@ -1665,7 +1723,6 @@ 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 */ @@ -1842,12 +1899,19 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void update_latency (bool playback); - XMLNode& state(bool); + enum snapshot_t { + NormalSave, + SnapshotKeep, + SwitchToSnapshot + }; + + XMLNode& state(bool, snapshot_t snapshot_type = NormalSave); /* click track */ typedef std::list Clicks; Clicks clicks; bool _clicking; + bool _click_rec_only; boost::shared_ptr _click_io; boost::shared_ptr _click_gain; Sample* click_data; @@ -1867,8 +1931,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void setup_click_sounds (Sample**, Sample const *, framecnt_t*, framecnt_t, std::string const &); void clear_clicks (); void click (framepos_t start, framecnt_t nframes); - - std::vector master_outs; + void run_click (framepos_t start, framecnt_t nframes); + void add_click (framepos_t pos, bool emphasis); + framecnt_t _count_in_samples; /* range playback */ @@ -1883,6 +1948,13 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop Evoral::Range _range_selection; Evoral::Range _object_selection; + void unset_preroll_record_punch (); + void unset_preroll_record_trim (); + + framepos_t _preroll_record_punch_pos; + framecnt_t _preroll_record_trim_len; + bool _count_in_once; + /* main outs */ uint32_t main_outs; @@ -1891,17 +1963,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void auto_connect_master_bus (); - /* Windows VST support */ - - long _windows_vst_callback ( - WindowsVSTPlugin*, - long opcode, - long index, - long value, - void* ptr, - float opt - ); - int find_all_sources (std::string path, std::set& result); int find_all_sources_across_snapshots (std::set& result, bool exclude_this_snapshot); @@ -1969,9 +2030,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop 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); - /** temporary list of Diskstreams used only during load of 2.X sessions */ - std::list > _diskstreams_2X; - void set_session_range_location (framepos_t, framepos_t); void setup_midi_machine_control (); @@ -1999,7 +2057,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop GraphEdges _current_route_graph; void ensure_route_presentation_info_gap (PresentationInfo::order_t, uint32_t gap_size); - bool ignore_route_processor_changes; + + friend class ProcessorChangeBlocker; + gint _ignore_route_processor_changes; /* atomic */ MidiClockTicker* midi_clock; @@ -2020,7 +2080,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void save_as_bring_callback (uint32_t, uint32_t, std::string); - static int get_session_info_from_path (XMLTree& state_tree, const std::string& xmlpath); static const uint32_t session_end_shift; std::string _template_state_dir; @@ -2031,7 +2090,12 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop std::string created_with; - bool _midi_regions_use_bbt_beats; + void midi_track_presentation_info_changed (PBD::PropertyChange const &, boost::weak_ptr); + void rewire_selected_midi (boost::shared_ptr); + void rewire_midi_selection_ports (); + boost::weak_ptr current_midi_target; + + CoreSelection* _selection; };