X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fregion.h;h=fc14e98cb89c9ad01b7f54e114e520cd62afd578;hb=bc38f2c48969be068b93525bdbcce6c1ff4e1d7c;hp=a66047a02a1a2d026df9b515f0c977a3f980e6af;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index a66047a02a..fc14e98cb8 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -27,7 +27,6 @@ #include "pbd/undo.h" #include "pbd/signals.h" - #include "ardour/ardour.h" #include "ardour/data_type.h" #include "ardour/automatable.h" @@ -58,6 +57,7 @@ namespace Properties { LIBARDOUR_API extern PBD::PropertyDescriptor start; LIBARDOUR_API extern PBD::PropertyDescriptor length; LIBARDOUR_API extern PBD::PropertyDescriptor position; + LIBARDOUR_API extern PBD::PropertyDescriptor beat; LIBARDOUR_API extern PBD::PropertyDescriptor sync_position; LIBARDOUR_API extern PBD::PropertyDescriptor layer; LIBARDOUR_API extern PBD::PropertyDescriptor ancestral_start; @@ -101,8 +101,6 @@ class LIBARDOUR_API Region const DataType& data_type () const { return _type; } - AnalysisFeatureList transients () { return _transients; }; - /** How the region parameters play together: * * POSITION: first frame of the region along the timeline @@ -132,7 +130,6 @@ class LIBARDOUR_API Region frameoffset_t sync_offset (int& dir) const; framepos_t sync_position () const; - framepos_t sync_point () const; framepos_t adjust_to_sync (framepos_t) const; @@ -153,7 +150,7 @@ class LIBARDOUR_API Region Evoral::Range last_range () const { return Evoral::Range (_last_position, _last_position + _last_length - 1); } - + Evoral::Range range () const { return Evoral::Range (first_frame(), last_frame()); } @@ -164,7 +161,6 @@ class LIBARDOUR_API Region bool locked () const { return _locked; } bool position_locked () const { return _position_locked; } bool video_locked () const { return _video_locked; } - bool valid_transients () const { return _valid_transients; } bool automatic () const { return _automatic; } bool whole_file () const { return _whole_file; } bool captured () const { return !(_import || _external); } @@ -176,9 +172,13 @@ class LIBARDOUR_API Region Trimmable::CanTrim can_trim () const; PositionLockStyle position_lock_style () const { return _position_lock_style; } - void set_position_lock_style (PositionLockStyle ps); - void recompute_position_from_lock_style (); + void recompute_position_from_lock_style (const int32_t sub_num); + + double beat () const { return _beat; } + void set_beat (double beat) { _beat = beat; } + double pulse () const { return _pulse; } + void set_pulse (double pulse) { _pulse = pulse; } void suspend_property_changes (); @@ -202,30 +202,34 @@ class LIBARDOUR_API Region bool region_list_equivalent (boost::shared_ptr) const; bool source_equivalent (boost::shared_ptr) const; bool any_source_equivalent (boost::shared_ptr) const; - bool uses_source (boost::shared_ptr) const; + bool uses_source (boost::shared_ptr, bool shallow = false) const; + void deep_sources (std::set >&) const; std::string source_string () const; /* EDITING OPERATIONS */ - void set_length (framecnt_t); + void set_length (framecnt_t, const int32_t sub_num); void set_start (framepos_t); - void set_position (framepos_t); + void set_position (framepos_t, int32_t sub_num = 0); + void set_initial_position (framepos_t); void special_set_position (framepos_t); - virtual void update_after_tempo_map_change (); + virtual void update_after_tempo_map_change (bool send_change = true); void nudge_position (frameoffset_t); bool at_natural_position () const; void move_to_natural_position (); - void move_start (frameoffset_t distance); - void trim_front (framepos_t new_position); - void trim_end (framepos_t new_position); - void trim_to (framepos_t position, framecnt_t length); + void move_start (frameoffset_t distance, const int32_t sub_num = 0); + void trim_front (framepos_t new_position, const int32_t sub_num = 0); + void trim_end (framepos_t new_position, const int32_t sub_num = 0); + void trim_to (framepos_t position, framecnt_t length, const int32_t sub_num = 0); + + virtual void fade_range (framepos_t, framepos_t) {} - void cut_front (framepos_t new_position); - void cut_end (framepos_t new_position); + void cut_front (framepos_t new_position, const int32_t sub_num = 0); + void cut_end (framepos_t new_position, const int32_t sub_num = 0); void set_layer (layer_t l); /* ONLY Playlist can call this */ void raise (); @@ -288,37 +292,45 @@ class LIBARDOUR_API Region // no transients, but its OK } - virtual int update_transient (framepos_t /* old_position */, framepos_t /* new_position */) { + virtual void clear_transients () { // no transients, but its OK - return 0; } - virtual void remove_transient (framepos_t /* where */) { + virtual void update_transient (framepos_t /* old_position */, framepos_t /* new_position */) { // no transients, but its OK } - virtual int set_transients (AnalysisFeatureList&) { + virtual void remove_transient (framepos_t /* where */) { // no transients, but its OK - return 0; } - virtual int get_transients (AnalysisFeatureList&, bool force_new = false) { - (void) force_new; + virtual void set_onsets (AnalysisFeatureList&) { // no transients, but its OK - return 0; } - virtual int adjust_transients (frameoffset_t /*delta*/) { + /** merges _onsets and _user_transients into given list + * and removed exact duplicates. + */ + void transients (AnalysisFeatureList&); + + /** merges _onsets OR _transients with _user_transients into given list + * if _onsets and _transients are unset, run analysis. + * list is not thinned, duplicates remain in place. + * + * intended for: Playlist::find_next_transient () + */ + virtual void get_transients (AnalysisFeatureList&) { // no transients, but its OK - return 0; } + bool has_transients () const; + virtual int separate_by_channel (ARDOUR::Session&, std::vector< boost::shared_ptr >&) const { return 0; } - void invalidate_transients (); + void maybe_invalidate_transients (); void drop_sources (); @@ -332,7 +344,7 @@ class LIBARDOUR_API Region Region (boost::shared_ptr); /** Construct a region from another region, at an offset within that region */ - Region (boost::shared_ptr, frameoffset_t start_offset); + Region (boost::shared_ptr, frameoffset_t start_offset, const int32_t sub_num); /** Construct a region as a copy of another region, but with different sources */ Region (boost::shared_ptr, const SourceList&); @@ -349,10 +361,12 @@ class LIBARDOUR_API Region void send_change (const PBD::PropertyChange&); virtual int _set_state (const XMLNode&, int version, PBD::PropertyChange& what_changed, bool send_signal); void post_set (const PBD::PropertyChange&); - virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute); - virtual void set_length_internal (framecnt_t); - virtual void set_start_internal (framecnt_t); - + virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute, const int32_t sub_num); + virtual void set_length_internal (framecnt_t, const int32_t sub_num); + virtual void set_start_internal (framecnt_t, const int32_t sub_num = 0); + bool verify_start_and_length (framepos_t, framecnt_t&); + void first_edit (); + DataType _type; PBD::Property _sync_marked; @@ -362,31 +376,43 @@ class LIBARDOUR_API Region PBD::Property _start; PBD::Property _length; PBD::Property _position; + PBD::Property _beat; /** Sync position relative to the start of our file */ PBD::Property _sync_position; - + + double _pulse; + SourceList _sources; /** Used when timefx are applied, so we can always use the original source */ SourceList _master_sources; - AnalysisFeatureList _transients; - boost::weak_ptr _playlist; - + + void merge_features (AnalysisFeatureList&, const AnalysisFeatureList&, const frameoffset_t) const; + + AnalysisFeatureList _onsets; // used by the Ferret (Aubio OnsetDetector) + + // _transient_user_start is covered by _valid_transients + AnalysisFeatureList _user_transients; // user added + framepos_t _transient_user_start; // region's _start relative to user_transients + + // these are used by Playlist::find_next_transient() in absence of onsets + AnalysisFeatureList _transients; // Source Analysis (QM Transient), user read-only + framepos_t _transient_analysis_start; + framepos_t _transient_analysis_end; + private: void mid_thaw (const PBD::PropertyChange&); - void trim_to_internal (framepos_t position, framecnt_t length); - void modify_front (framepos_t new_position, bool reset_fade); - void modify_end (framepos_t new_position, bool reset_fade); + virtual void trim_to_internal (framepos_t position, framecnt_t length, const int32_t sub_num); + void modify_front (framepos_t new_position, bool reset_fade, const int32_t sub_num); + void modify_end (framepos_t new_position, bool reset_fade, const int32_t sub_num); void maybe_uncopy (); - void first_edit (); bool verify_start (framepos_t); - bool verify_start_and_length (framepos_t, framecnt_t&); bool verify_start_mutable (framepos_t&_start); - bool verify_length (framecnt_t); + bool verify_length (framecnt_t&); virtual void recompute_at_start () = 0; virtual void recompute_at_end () = 0; @@ -411,7 +437,6 @@ class LIBARDOUR_API Region framecnt_t _last_length; framepos_t _last_position; mutable RegionEditState _first_edit; - Timecode::BBT_Time _bbt_time; layer_t _layer; void register_properties ();