X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsession.h;h=562b8a94c2d986b092f7247e186004ed332fa079;hb=bbe62da55a5fb06ba39e02c9671a94ab6e24bb08;hp=7ae2fb4bd825b88246a8d90858ef4548f524d974;hpb=0e658529011d859e508e3ef62d29fa2fe56535eb;p=ardour.git diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7ae2fb4bd8..562b8a94c2 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -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& created_version); static std::string get_snapshot_from_instant (const std::string& session_dir); /** a monotonic counter used for naming user-visible things uniquely @@ -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); @@ -348,7 +349,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 (); @@ -450,7 +451,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 { @@ -562,6 +563,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 +583,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); @@ -974,6 +998,17 @@ 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); + + 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. */ @@ -1340,7 +1375,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; @@ -1500,7 +1534,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; @@ -1582,7 +1616,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; @@ -1873,6 +1907,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); + void run_click (framepos_t start, framecnt_t nframes); + void add_click (framepos_t pos, bool emphasis); + framecnt_t _count_in_samples; std::vector master_outs; @@ -1889,6 +1926,12 @@ 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; + /* main outs */ uint32_t main_outs; @@ -2005,7 +2048,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; @@ -2026,7 +2071,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;