Move Stateful class declared in pbd/stateful.h into the PBD namespace

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index e3c5db561dd7e936106e9e58a525a8396a9d2bbc..f844d45ef122a0290f96d4dcde36cd37ed0ff0bb 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.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_audio_region_h__
@@ -72,24 +71,26 @@ class AudioRegion : public Region
        Curve& fade_out() { return _fade_out; }
        Curve& envelope() { return _envelope; }
 
-       nframes_t read_peaks (PeakData *buf, nframes_t npeaks,
-                       nframes_t offset, nframes_t cnt,
-                       uint32_t chan_n=0, double samples_per_unit= 1.0) const;
-
+       virtual nframes_t read_peaks (PeakData *buf, nframes_t npeaks,
+                                     nframes_t offset, nframes_t cnt,
+                                     uint32_t chan_n=0, double samples_per_unit= 1.0) const;
+       
        virtual nframes_t read_at (Sample *buf, Sample *mixdown_buf,
-                       float *gain_buf, nframes_t position, nframes_t cnt, 
-                       uint32_t       chan_n      = 0,
-                       nframes_t read_frames = 0,
-                       nframes_t skip_frames = 0) const;
-
-       nframes_t master_read_at (Sample *buf, Sample *mixdown_buf, 
-                       float *gain_buf,
-                       nframes_t position, nframes_t cnt, uint32_t chan_n=0) const;
+                                  float *gain_buf, nframes_t position, nframes_t cnt, 
+                                  uint32_t       chan_n      = 0) const;
+       
+       virtual nframes_t master_read_at (Sample *buf, Sample *mixdown_buf, 
+                                         float *gain_buf,
+                                         nframes_t position, nframes_t cnt, uint32_t chan_n=0) const;
+       
+       virtual nframes_t read_raw_internal (Sample*, nframes_t, nframes_t) const;
 
        XMLNode& state (bool);
        int      set_state (const XMLNode&);
 
        static void set_default_fade (float steepness, nframes_t len);
+       bool fade_in_is_default () const;
+       bool fade_out_is_default () const;
 
        enum FadeShape {
                Linear,
@@ -136,11 +137,11 @@ class AudioRegion : public Region
        AudioRegion (boost::shared_ptr<AudioSource>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
        AudioRegion (SourceList &, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
        AudioRegion (boost::shared_ptr<const AudioRegion>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
-       AudioRegion (boost::shared_ptr<const AudioRegion>);
        AudioRegion (boost::shared_ptr<AudioSource>, const XMLNode&);
        AudioRegion (SourceList &, const XMLNode&);
 
   private:
+       void init ();
        void set_default_fades ();
        void set_default_fade_in ();
        void set_default_fade_out ();
@@ -149,10 +150,8 @@ class AudioRegion : public Region
        void recompute_gain_at_start ();
 
        nframes_t _read_at (const SourceList&, Sample *buf, Sample *mixdown_buffer, 
-                                float *gain_buffer, nframes_t position, nframes_t cnt, 
-                                uint32_t chan_n = 0,
-                                nframes_t read_frames = 0,
-                                nframes_t skip_frames = 0) const;
+                           float *gain_buffer, nframes_t position, nframes_t cnt, 
+                           uint32_t chan_n = 0) const;
 
        void recompute_at_start ();
        void recompute_at_end ();
@@ -173,12 +172,17 @@ class AudioRegion : public Region
        uint32_t          _fade_out_disabled;
 
   protected:
+       /* default constructor for derived (compound) types */
+
+       AudioRegion (nframes_t, nframes_t, std::string name); 
+       AudioRegion (boost::shared_ptr<const AudioRegion>);
+
        int set_live_state (const XMLNode&, Change&, bool send);
        
-       virtual bool verify_start (jack_nframes_t);
-       virtual bool verify_start_and_length (jack_nframes_t, jack_nframes_t);
-       virtual bool verify_start_mutable (jack_nframes_t&_start);
-       virtual bool verify_length (jack_nframes_t);
+       virtual bool verify_start (nframes_t);
+       virtual bool verify_start_and_length (nframes_t, nframes_t);
+       virtual bool verify_start_mutable (nframes_t&_start);
+       virtual bool verify_length (nframes_t);
        /*virtual void recompute_at_start () = 0;
        virtual void recompute_at_end () = 0;*/
 };