provide an RC configuration variable to "shadow" Evoral::ControlList::thinning_factor

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

diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 15b9b3d2a70677af409e161a8d63de1f18cec70c..1c7075eb7dfc690d765ae82a9e42c5197944824d 100644 (file)
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -30,12 +30,21 @@
 
 #include "ardour/ardour.h"
 #include "ardour/audioregion.h"
-#include "ardour/crossfade_compare.h"
 #include "evoral/Curve.hpp"
 
 namespace ARDOUR {
+       namespace Properties {
+               /* "active" is defined elsewhere but we use it with crossfade also */
+               extern PBD::PropertyDescriptor<bool> active;
+               extern PBD::PropertyDescriptor<bool> follow_overlap;
+       }
+
+enum AnchorPoint {
+       StartOfIn,
+       EndOfIn,
+       EndOfOut
+};
 
-class AudioRegion;
 class Playlist;
 
 class Crossfade : public ARDOUR::AudioRegion
@@ -50,7 +59,6 @@ class Crossfade : public ARDOUR::AudioRegion
        /* constructor for "fixed" xfades at each end of an internal overlap */
 
        Crossfade (boost::shared_ptr<ARDOUR::AudioRegion> in, boost::shared_ptr<ARDOUR::AudioRegion> out,
-                  framepos_t position,
                   framecnt_t initial_length,
                   AnchorPoint);
 
@@ -68,10 +76,10 @@ class Crossfade : public ARDOUR::AudioRegion
 
        /* the usual XML constructor */
 
-       Crossfade (const Playlist&, XMLNode&);
+       Crossfade (const Playlist&, XMLNode const &);
        virtual ~Crossfade();
 
-       bool operator== (const ARDOUR::Crossfade&);
+       static void make_property_quarks ();
 
        XMLNode& get_state (void);
        int set_state (const XMLNode&, int version);
@@ -81,9 +89,7 @@ class Crossfade : public ARDOUR::AudioRegion
 
        framecnt_t read_at (Sample *buf, Sample *mixdown_buffer,
                            float *gain_buffer, framepos_t position, framecnt_t cnt,
-                           uint32_t chan_n,
-                           framecnt_t read_frames = 0,
-                           framecnt_t skip_frames = 0) const;
+                           uint32_t chan_n) const;
 
        bool refresh ();
 
@@ -106,11 +112,6 @@ class Crossfade : public ARDOUR::AudioRegion
        framecnt_t overlap_length() const;
 
        PBD::Signal1<void,boost::shared_ptr<Region> > Invalidated;
-       PBD::Signal1<void,PBD::PropertyChange>     StateChanged;
-
-       bool covers (framecnt_t frame) const {
-               return _position <= frame && frame < _position + _length;
-       }
 
        OverlapType coverage (framepos_t start, framepos_t end) const;
 
@@ -136,8 +137,8 @@ class Crossfade : public ARDOUR::AudioRegion
        static framecnt_t short_xfade_length() { return _short_xfade_length; }
        static void set_short_xfade_length (framecnt_t n);
 
-       static PBD::PropertyChange ActiveChanged;
-       static PBD::PropertyChange FollowOverlapChanged;
+       /** emitted when the actual fade curves change, as opposed to one of the Stateful properties */
+       PBD::Signal0<void> FadesChanged;
 
   private:
        friend struct CrossfadeComparePtr;
@@ -147,11 +148,11 @@ class Crossfade : public ARDOUR::AudioRegion
 
        boost::shared_ptr<ARDOUR::AudioRegion> _in;
        boost::shared_ptr<ARDOUR::AudioRegion> _out;
-       bool                 _active;
+       PBD::Property<bool>  _active;
+       PBD::Property<bool>  _follow_overlap;
        bool                 _in_update;
        OverlapType           overlap_type;
        AnchorPoint          _anchor_point;
-       bool                 _follow_overlap;
        bool                 _fixed;
        int32_t               layer_relation;
 
@@ -163,9 +164,12 @@ class Crossfade : public ARDOUR::AudioRegion
        static Sample* crossfade_buffer_in;
 
        void initialize ();
+       void register_properties ();
        int  compute (boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>, CrossfadeModel);
        bool update ();
 
+       bool operator== (const ARDOUR::Crossfade&);
+
   protected:
        framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int) const;
 };