Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

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

diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 7b5ac28379dbde18f1acd60e6bab16eca808710d..20bbcccdf53db2938ca8b73c2ecbd7cd6083a3e2 100644 (file)
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -30,7 +30,6 @@
 
 #include "ardour/ardour.h"
 #include "ardour/audioregion.h"
-#include "ardour/crossfade_compare.h"
 #include "evoral/Curve.hpp"
 
 namespace ARDOUR {
@@ -40,7 +39,12 @@ namespace ARDOUR {
                extern PBD::PropertyDescriptor<bool> follow_overlap;
        }
 
-class AudioRegion;
+enum AnchorPoint {
+       StartOfIn,
+       EndOfIn,
+       EndOfOut
+};
+
 class Playlist;
 
 class Crossfade : public ARDOUR::AudioRegion
@@ -55,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);
 
@@ -73,13 +76,11 @@ class Crossfade : public ARDOUR::AudioRegion
 
        /* the usual XML constructor */
 
-       Crossfade (const Playlist&, XMLNode&);
+       Crossfade (const Playlist&, XMLNode const &);
        virtual ~Crossfade();
 
        static void make_property_quarks ();
 
-       bool operator== (const ARDOUR::Crossfade&);
-
        XMLNode& get_state (void);
        int set_state (const XMLNode&, int version);
 
@@ -88,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 ();
 
@@ -114,10 +113,6 @@ class Crossfade : public ARDOUR::AudioRegion
 
        PBD::Signal1<void,boost::shared_ptr<Region> > Invalidated;
 
-       bool covers (framecnt_t frame) const {
-               return _position <= frame && frame < _position + _length;
-       }
-
        OverlapType coverage (framepos_t start, framepos_t end) const;
 
        static void set_buffer_size (framecnt_t);
@@ -142,6 +137,9 @@ class Crossfade : public ARDOUR::AudioRegion
        static framecnt_t short_xfade_length() { return _short_xfade_length; }
        static void set_short_xfade_length (framecnt_t n);
 
+       /** emitted when the actual fade curves change, as opposed to one of the Stateful properties */
+       PBD::Signal0<void> FadesChanged;
+
   private:
        friend struct CrossfadeComparePtr;
        friend class AudioPlaylist;
@@ -169,6 +167,8 @@ class Crossfade : public ARDOUR::AudioRegion
        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;
 };