Amend f3c0c1a865 (Add quarter-note position methods).

[ardour.git] / libs / ardour / ardour / region.h

diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 383bc6675d2e600476c4e12d2d027e3972437f85..9dc51e2d4a4bc447940c82917486612f9b806b11 100644 (file)
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -57,6 +57,8 @@ namespace Properties {
        LIBARDOUR_API extern PBD::PropertyDescriptor<framepos_t>        start;
        LIBARDOUR_API extern PBD::PropertyDescriptor<framecnt_t>        length;
        LIBARDOUR_API extern PBD::PropertyDescriptor<framepos_t>        position;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<double>            beat;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<double>            pulse;
        LIBARDOUR_API extern PBD::PropertyDescriptor<framecnt_t>        sync_position;
        LIBARDOUR_API extern PBD::PropertyDescriptor<layer_t>           layer;
        LIBARDOUR_API extern PBD::PropertyDescriptor<framepos_t>        ancestral_start;
@@ -171,9 +173,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 ();
 
@@ -197,33 +203,34 @@ class LIBARDOUR_API Region
        bool region_list_equivalent (boost::shared_ptr<const Region>) const;
        bool source_equivalent (boost::shared_ptr<const Region>) const;
        bool any_source_equivalent (boost::shared_ptr<const Region>) const;
-       bool uses_source (boost::shared_ptr<const Source>) const;
+       bool uses_source (boost::shared_ptr<const Source>, bool shallow = false) const;
+       void deep_sources (std::set<boost::shared_ptr<Source> >&) 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 ();
@@ -310,7 +317,7 @@ class LIBARDOUR_API Region
        /** 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&) {
@@ -338,7 +345,7 @@ class LIBARDOUR_API Region
        Region (boost::shared_ptr<const Region>);
 
        /** Construct a region from another region, at an offset within that region */
-       Region (boost::shared_ptr<const Region>, frameoffset_t start_offset);
+       Region (boost::shared_ptr<const Region>, 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 Region>, const SourceList&);
@@ -355,9 +362,11 @@ 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;
 
@@ -368,6 +377,8 @@ class LIBARDOUR_API Region
        PBD::Property<framepos_t>  _start;
        PBD::Property<framecnt_t>  _length;
        PBD::Property<framepos_t>  _position;
+       PBD::Property<double>      _beat;
+       PBD::Property<double>      _pulse;
        /** Sync position relative to the start of our file */
        PBD::Property<framepos_t>  _sync_position;
 
@@ -393,15 +404,13 @@ class LIBARDOUR_API Region
   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&);
 
@@ -428,7 +437,6 @@ class LIBARDOUR_API Region
        framecnt_t              _last_length;
        framepos_t              _last_position;
        mutable RegionEditState _first_edit;
-       double                  _beat;
        layer_t                 _layer;
 
        void register_properties ();