X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fregion.h;h=29f4244dffb448cc3779886f131f8a415d116060;hb=da5119583aca2caec4082e3d13cfb1f687a5989d;hp=a2cc3f4cf76069b3ba42ca696757de8a59bad254;hpb=75e6adcf03078c24d13ddc7c9c714582a6cf7891;p=ardour.git diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index a2cc3f4cf7..29f4244dff 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" @@ -38,33 +37,34 @@ class XMLNode; - namespace ARDOUR { namespace Properties { - extern PBD::PropertyDescriptor muted; - extern PBD::PropertyDescriptor opaque; - extern PBD::PropertyDescriptor locked; - extern PBD::PropertyDescriptor automatic; - extern PBD::PropertyDescriptor whole_file; - extern PBD::PropertyDescriptor import; - extern PBD::PropertyDescriptor external; - extern PBD::PropertyDescriptor sync_marked; - extern PBD::PropertyDescriptor left_of_split; - extern PBD::PropertyDescriptor right_of_split; - extern PBD::PropertyDescriptor hidden; - extern PBD::PropertyDescriptor position_locked; - extern PBD::PropertyDescriptor valid_transients; - extern PBD::PropertyDescriptor start; - extern PBD::PropertyDescriptor length; - extern PBD::PropertyDescriptor position; - extern PBD::PropertyDescriptor sync_position; - extern PBD::PropertyDescriptor layer; - extern PBD::PropertyDescriptor ancestral_start; - extern PBD::PropertyDescriptor ancestral_length; - extern PBD::PropertyDescriptor stretch; - extern PBD::PropertyDescriptor shift; - extern PBD::PropertyDescriptor position_lock_style; + LIBARDOUR_API extern PBD::PropertyDescriptor muted; + LIBARDOUR_API extern PBD::PropertyDescriptor opaque; + LIBARDOUR_API extern PBD::PropertyDescriptor locked; + LIBARDOUR_API extern PBD::PropertyDescriptor video_locked; + LIBARDOUR_API extern PBD::PropertyDescriptor automatic; + LIBARDOUR_API extern PBD::PropertyDescriptor whole_file; + LIBARDOUR_API extern PBD::PropertyDescriptor import; + LIBARDOUR_API extern PBD::PropertyDescriptor external; + LIBARDOUR_API extern PBD::PropertyDescriptor sync_marked; + LIBARDOUR_API extern PBD::PropertyDescriptor left_of_split; + LIBARDOUR_API extern PBD::PropertyDescriptor right_of_split; + LIBARDOUR_API extern PBD::PropertyDescriptor hidden; + LIBARDOUR_API extern PBD::PropertyDescriptor position_locked; + LIBARDOUR_API extern PBD::PropertyDescriptor valid_transients; + LIBARDOUR_API extern PBD::PropertyDescriptor start; + LIBARDOUR_API extern PBD::PropertyDescriptor length; + LIBARDOUR_API extern PBD::PropertyDescriptor position; + LIBARDOUR_API extern PBD::PropertyDescriptor sync_position; + LIBARDOUR_API extern PBD::PropertyDescriptor layer; + LIBARDOUR_API extern PBD::PropertyDescriptor ancestral_start; + LIBARDOUR_API extern PBD::PropertyDescriptor ancestral_length; + LIBARDOUR_API extern PBD::PropertyDescriptor stretch; + LIBARDOUR_API extern PBD::PropertyDescriptor shift; + LIBARDOUR_API extern PBD::PropertyDescriptor position_lock_style; + LIBARDOUR_API extern PBD::PropertyDescriptor layering_index; }; class Playlist; @@ -72,14 +72,14 @@ class Filter; class ExportSpecification; class Progress; -enum RegionEditState { +enum LIBARDOUR_API RegionEditState { EditChangesNothing = 0, EditChangesName = 1, EditChangesID = 2 }; -class Region +class LIBARDOUR_API Region : public SessionObject , public boost::enable_shared_from_this , public Readable @@ -100,8 +100,6 @@ class 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 @@ -127,11 +125,10 @@ class Region float stretch () const { return _stretch; } float shift () const { return _shift; } - void set_ancestral_data (framepos_t start, framepos_t length, float stretch, float shift); + void set_ancestral_data (framepos_t start, framecnt_t length, float stretch, float shift); 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; @@ -140,16 +137,33 @@ class Region framepos_t first_frame () const { return _position; } framepos_t last_frame () const { return _position + _length - 1; } + /** Return the earliest possible value of _position given the + * value of _start within the region's sources + */ + framepos_t earliest_possible_position () const; + /** Return the last possible value of _last_frame given the + * value of _startin the regions's sources + */ + framepos_t latest_possible_frame () const; + + 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()); + } + bool hidden () const { return _hidden; } bool muted () const { return _muted; } bool opaque () const { return _opaque; } bool locked () const { return _locked; } bool position_locked () const { return _position_locked; } - bool valid_transients () const { return _valid_transients; } + bool video_locked () const { return _video_locked; } bool automatic () const { return _automatic; } bool whole_file () const { return _whole_file; } bool captured () const { return !(_import || _external); } - bool can_move () const { return !_position_locked; } + bool can_move () const { return !_position_locked && !_locked; } bool sync_marked () const { return _sync_marked; } bool external () const { return _external; } bool import () const { return _import; } @@ -167,8 +181,14 @@ class Region return first_frame() <= frame && frame <= last_frame(); } - OverlapType coverage (framepos_t start, framepos_t end) const { - return ARDOUR::coverage (first_frame(), last_frame(), start, end); + /** @return coverage of this region with the given range; + * OverlapInternal: the range is internal to this region. + * OverlapStart: the range overlaps the start of this region. + * OverlapEnd: the range overlaps the end of this region. + * OverlapExternal: the range overlaps all of this region. + */ + Evoral::OverlapType coverage (framepos_t start, framepos_t end) const { + return Evoral::coverage (first_frame(), last_frame(), start, end); } bool equivalent (boost::shared_ptr) const; @@ -176,8 +196,8 @@ class Region bool overlap_equivalent (boost::shared_ptr) const; 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_path (const std::string&) const; std::string source_string () const; @@ -187,19 +207,21 @@ class Region void set_length (framecnt_t); void set_start (framepos_t); void set_position (framepos_t); - void set_position_on_top (framepos_t); + void set_initial_position (framepos_t); void special_set_position (framepos_t); - void update_position_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 trim_start (framepos_t new_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); + virtual void fade_range (framepos_t, framepos_t) {} + void cut_front (framepos_t new_position); void cut_end (framepos_t new_position); @@ -217,6 +239,7 @@ class Region void set_automatic (bool yn); void set_opaque (bool yn); void set_locked (bool yn); + void set_video_locked (bool yn); void set_position_locked (bool yn); int apply (Filter &, Progress* progress = 0); @@ -253,57 +276,55 @@ class Region virtual boost::shared_ptr get_parent() const; - uint64_t last_layer_op() const { return _last_layer_op; } - void set_last_layer_op (uint64_t when); + uint64_t layering_index () const { return _layering_index; } + void set_layering_index (uint64_t when) { _layering_index = when; } virtual bool is_dependent() const { return false; } virtual bool depends_on (boost::shared_ptr /*other*/) const { return false; } - virtual int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&) = 0; - virtual void add_transient (framepos_t) { // 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 (framepos_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 set_pending_explicit_relayer (bool p) { - _pending_explicit_relayer = p; - } - - bool pending_explicit_relayer () const { - return _pending_explicit_relayer; - } + void maybe_invalidate_transients (); void drop_sources (); @@ -330,12 +351,49 @@ class Region } protected: + 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); + + DataType _type; + + PBD::Property _sync_marked; + PBD::Property _left_of_split; + PBD::Property _right_of_split; + PBD::Property _valid_transients; + PBD::Property _start; + PBD::Property _length; + PBD::Property _position; + /** Sync position relative to the start of our file */ + PBD::Property _sync_position; + + SourceList _sources; + /** Used when timefx are applied, so we can always use the original source */ + SourceList _master_sources; + + 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); - virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute); - virtual void set_length_internal (framepos_t pos); void modify_front (framepos_t new_position, bool reset_fade); void modify_end (framepos_t new_position, bool reset_fade); @@ -345,59 +403,36 @@ class Region 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; - DataType _type; - PBD::Property _muted; PBD::Property _opaque; PBD::Property _locked; + PBD::Property _video_locked; PBD::Property _automatic; PBD::Property _whole_file; PBD::Property _import; PBD::Property _external; - PBD::Property _sync_marked; - PBD::Property _left_of_split; - PBD::Property _right_of_split; PBD::Property _hidden; PBD::Property _position_locked; - PBD::Property _valid_transients; - PBD::Property _start; - PBD::Property _length; - PBD::Property _position; - /** Sync position relative to the start of our file */ - PBD::Property _sync_position; - PBD::Property _layer; PBD::Property _ancestral_start; PBD::Property _ancestral_length; PBD::Property _stretch; PBD::Property _shift; PBD::EnumProperty _position_lock_style; + PBD::Property _layering_index; framecnt_t _last_length; framepos_t _last_position; mutable RegionEditState _first_edit; - Timecode::BBT_Time _bbt_time; - AnalysisFeatureList _transients; - - uint64_t _last_layer_op; ///< timestamp - SourceList _sources; - /** Used when timefx are applied, so we can always use the original source */ - SourceList _master_sources; - - /** true if this region has had its layer explicitly set since the playlist last relayered */ - bool _pending_explicit_relayer; - - boost::weak_ptr _playlist; - - virtual int _set_state (const XMLNode&, int version, PBD::PropertyChange& what_changed, bool send_signal); + double _beat; + layer_t _layer; void register_properties (); -protected: void use_sources (SourceList const &); };