X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fregion.h;h=3ee829ed122dee2860e456cfa6b7c58b848e4210;hb=e17f75b351356279778e4ea4adbb6c0d544ba755;hp=78a0e5ab9b53871dbc0daefb52fb352571b3b5e1;hpb=6c575f1385301979113f2971d7f8b326e2bd4822;p=ardour.git diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 78a0e5ab9b..3ee829ed12 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -45,6 +45,7 @@ namespace Properties { extern PBD::PropertyDescriptor muted; extern PBD::PropertyDescriptor opaque; extern PBD::PropertyDescriptor locked; + extern PBD::PropertyDescriptor video_locked; extern PBD::PropertyDescriptor automatic; extern PBD::PropertyDescriptor whole_file; extern PBD::PropertyDescriptor import; @@ -65,6 +66,7 @@ namespace Properties { extern PBD::PropertyDescriptor stretch; extern PBD::PropertyDescriptor shift; extern PBD::PropertyDescriptor position_lock_style; + extern PBD::PropertyDescriptor layering_index; }; class Playlist; @@ -127,7 +129,7 @@ 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; @@ -140,16 +142,34 @@ 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 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); } - 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 +187,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 +202,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,7 +213,6 @@ 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 special_set_position (framepos_t); virtual void update_after_tempo_map_change (); void nudge_position (frameoffset_t); @@ -217,6 +242,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,14 +279,12 @@ 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 } @@ -285,7 +309,7 @@ class Region return 0; } - virtual int adjust_transients (framepos_t /*delta*/) { + virtual int adjust_transients (frameoffset_t /*delta*/) { // no transients, but its OK return 0; } @@ -297,14 +321,6 @@ class Region void invalidate_transients (); - void set_pending_explicit_relayer (bool p) { - _pending_explicit_relayer = p; - } - - bool pending_explicit_relayer () const { - return _pending_explicit_relayer; - } - void drop_sources (); protected: @@ -335,7 +351,8 @@ class Region 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 (framepos_t pos); + virtual void set_length_internal (framecnt_t); + virtual void set_start_internal (framecnt_t); DataType _type; @@ -348,7 +365,6 @@ class Region PBD::Property _position; /** Sync position relative to the start of our file */ PBD::Property _sync_position; - PBD::Property _layer; SourceList _sources; /** Used when timefx are applied, so we can always use the original source */ @@ -379,6 +395,7 @@ class Region PBD::Property _muted; PBD::Property _opaque; PBD::Property _locked; + PBD::Property _video_locked; PBD::Property _automatic; PBD::Property _whole_file; PBD::Property _import; @@ -390,16 +407,13 @@ class Region 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; - - uint64_t _last_layer_op; ///< timestamp - - /** true if this region has had its layer explicitly set since the playlist last relayered */ - bool _pending_explicit_relayer; + layer_t _layer; void register_properties ();