Tidy.

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

diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 62ab1f775da65324a3afe81602710ef0cc9a9992..b0785a6e594e1d2d29acdf04a27131d43b0e290d 100644 (file)
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_overlap_h__
@@ -24,7 +23,6 @@
 #include <vector>
 #include <algorithm>
 #include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 
 #include <sigc++/signal.h>
 
@@ -32,16 +30,16 @@
 #include <pbd/statefuldestructible.h> 
 
 #include <ardour/ardour.h>
-#include <ardour/curve.h>
 #include <ardour/audioregion.h>
 #include <ardour/crossfade_compare.h>
+#include <evoral/Curve.hpp>
 
 namespace ARDOUR {
 
 class AudioRegion;
 class Playlist;
 
-class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_from_this<ARDOUR::Crossfade>
+class Crossfade : public ARDOUR::AudioRegion
 {
   public:
 
@@ -67,7 +65,7 @@ class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_
        /* copy constructor to copy a crossfade with new regions. used (for example)
           when a playlist copy is made 
        */
-       Crossfade (const Crossfade &, boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>);
+       Crossfade (boost::shared_ptr<Crossfade>, boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>);
        
        /* the usual XML constructor */
 
@@ -86,7 +84,7 @@ class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_
                                float *gain_buffer, nframes_t position, nframes_t cnt, 
                                uint32_t chan_n,
                                nframes_t read_frames = 0,
-                               nframes_t skip_frames = 0);
+                               nframes_t skip_frames = 0) const;
        
        bool refresh ();
 
@@ -106,13 +104,11 @@ class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_
                return (_in == a && _out == b) || (_in == b && _out == a);
        }
 
-       nframes_t length() const { return _length; }
        nframes_t overlap_length() const;
-       nframes_t position() const { return _position; }
 
        void invalidate();
 
-       sigc::signal<void,boost::shared_ptr<Crossfade> > Invalidated;
+       sigc::signal<void,boost::shared_ptr<Region> > Invalidated;
        sigc::signal<void,Change>     StateChanged;
 
        bool covers (nframes_t frame) const {
@@ -130,10 +126,15 @@ class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_
        bool can_follow_overlap() const;
        void set_follow_overlap (bool yn);
 
-       Curve& fade_in() { return _fade_in; } 
-       Curve& fade_out() { return _fade_out; }
+       AutomationList& fade_in() { return _fade_in; } 
+       AutomationList& fade_out() { return _fade_out; }
 
        nframes_t set_length (nframes_t);
+
+       bool is_dependent() const { return true; }
+       bool depends_on (boost::shared_ptr<Region> other) const { 
+               return other == _in || other == _out; 
+       }
        
        static nframes_t short_xfade_length() { return _short_xfade_length; }
        static void set_short_xfade_length (nframes_t n);
@@ -152,14 +153,14 @@ class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_
        bool                 _active;
        bool                 _in_update;
        OverlapType           overlap_type;
-       nframes_t       _length;
-       nframes_t       _position;
        AnchorPoint          _anchor_point;
        bool                 _follow_overlap;
        bool                 _fixed;
        int32_t               layer_relation;
-       Curve _fade_in;
-       Curve _fade_out;
+
+
+       mutable AutomationList _fade_in;
+       mutable AutomationList _fade_out;
 
        static Sample* crossfade_buffer_out;
        static Sample* crossfade_buffer_in;
@@ -168,7 +169,8 @@ class Crossfade : public PBD::StatefulDestructible, public boost::enable_shared_
        int  compute (boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>, CrossfadeModel);
        bool update ();
 
-       void member_changed (ARDOUR::Change);
+  protected:
+       nframes_t read_raw_internal (Sample*, nframes_t, nframes_t) const;      
 };