Region pulse is no longer a property.

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

diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 7f41cb6e5a7cf7b5e377730c6bc64e0d926ecf61..fc14e98cb89c9ad01b7f54e114e520cd62afd578 100644 (file)
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -57,6 +57,7 @@ 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<framecnt_t>        sync_position;
        LIBARDOUR_API extern PBD::PropertyDescriptor<layer_t>           layer;
        LIBARDOUR_API extern PBD::PropertyDescriptor<framepos_t>        ancestral_start;
@@ -172,10 +173,12 @@ class LIBARDOUR_API Region
 
        PositionLockStyle position_lock_style () const { return _position_lock_style; }
        void set_position_lock_style (PositionLockStyle ps);
-       void recompute_position_from_lock_style (const int32_t& sub_num);
+       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 ();
 
@@ -207,7 +210,7 @@ class LIBARDOUR_API Region
 
        /* EDITING OPERATIONS */
 
-       void set_length (framecnt_t, const int32_t& sub_num);
+       void set_length (framecnt_t, const int32_t sub_num);
        void set_start (framepos_t);
        void set_position (framepos_t, int32_t sub_num = 0);
        void set_initial_position (framepos_t);
@@ -218,15 +221,15 @@ class LIBARDOUR_API Region
        bool at_natural_position () const;
        void move_to_natural_position ();
 
-       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);
+       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, const int32_t& sub_num = 0);
-       void cut_end (framepos_t new_position, const int32_t& sub_num = 0);
+       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 ();
@@ -341,7 +344,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, const int32_t& sub_num);
+       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&);
@@ -358,9 +361,9 @@ 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, 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);
+       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 ();
 
@@ -373,9 +376,12 @@ class LIBARDOUR_API Region
        PBD::Property<framepos_t>  _start;
        PBD::Property<framecnt_t>  _length;
        PBD::Property<framepos_t>  _position;
+       PBD::Property<double>      _beat;
        /** Sync position relative to the start of our file */
        PBD::Property<framepos_t>  _sync_position;
 
+       double                  _pulse;
+
        SourceList              _sources;
        /** Used when timefx are applied, so we can always use the original source */
        SourceList              _master_sources;
@@ -398,9 +404,9 @@ class LIBARDOUR_API Region
   private:
        void mid_thaw (const PBD::PropertyChange&);
 
-       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);
+       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 ();
 
@@ -431,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 ();