Merge with 2.0-ongoing R3082.

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 3b592a54ee3874f210a62a24216de13c2d0d815f..e88e10d521a8ae38b641ba2b461ca42f0f6d0ada 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -21,6 +21,7 @@
 #define __ardour_audio_region_h__
 
 #include <vector>
+#include <list>
 
 #include <pbd/fastlog.h>
 #include <pbd/undo.h>
@@ -38,7 +39,7 @@ namespace ARDOUR {
 class Route;
 class Playlist;
 class Session;
-class AudioFilter;
+class Filter;
 class AudioSource;
 
 class AudioRegion : public Region
@@ -67,28 +68,37 @@ class AudioRegion : public Region
        bool fade_in_active ()  const { return _flags & Region::FadeIn; }
        bool fade_out_active () const { return _flags & Region::FadeOut; }
 
-       Curve& fade_in()  { return _fade_in; }
-       Curve& fade_out() { return _fade_out; }
-       Curve& envelope() { return _envelope; }
+       boost::shared_ptr<AutomationList> fade_in()  { return _fade_in; }
+       boost::shared_ptr<AutomationList> fade_out() { return _fade_out; }
+       boost::shared_ptr<AutomationList> 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;
+       
+       /* Readable interface */
+       
+       virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const;
+       virtual nframes64_t readable_length() const { return length(); }
 
        virtual nframes_t read_at (Sample *buf, Sample *mixdown_buf,
                        float *gain_buf, nframes_t position, nframes_t cnt, 
-                       uint32_t       chan_n      = 0,
+                       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;
+       
+       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,
@@ -113,13 +123,9 @@ class AudioRegion : public Region
 
        int separate_by_channel (ARDOUR::Session&, vector<boost::shared_ptr<AudioRegion> >&) const;
 
-       /* filter */
-
-       int apply (AudioFilter&);
-
        /* export */
 
-       int exportme (ARDOUR::Session&, ARDOUR::AudioExportSpecification&);
+       int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
 
        /* xfade/fade interactions */
 
@@ -128,18 +134,20 @@ class AudioRegion : public Region
        void resume_fade_in ();
        void resume_fade_out ();
 
+       int get_transients (AnalysisFeatureList&, bool force_new = false);
+
   private:
        friend class RegionFactory;
 
        AudioRegion (boost::shared_ptr<AudioSource>, nframes_t start, nframes_t length);
        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 (const 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 ();
@@ -148,10 +156,11 @@ 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,
+                           nframes_t read_frames = 0,
+                           nframes_t skip_frames = 0,
+                           bool raw = false) const;
 
        void recompute_at_start ();
        void recompute_at_end ();
@@ -161,25 +170,24 @@ class AudioRegion : public Region
        void fade_out_changed ();
        void source_offset_changed ();
        void listen_to_my_curves ();
+       void listen_to_my_sources ();
 
-       mutable Curve     _fade_in;
-       FadeShape         _fade_in_shape;
-       mutable Curve     _fade_out;
-       FadeShape         _fade_out_shape;
-       mutable Curve     _envelope;
-       gain_t            _scale_amplitude;
-       uint32_t          _fade_in_disabled;
-       uint32_t          _fade_out_disabled;
+       boost::shared_ptr<AutomationList> _fade_in;
+       FadeShape                         _fade_in_shape;
+       boost::shared_ptr<AutomationList> _fade_out;
+       FadeShape                         _fade_out_shape;
+       boost::shared_ptr<AutomationList> _envelope;
+       gain_t                            _scale_amplitude;
+       uint32_t                          _fade_in_disabled;
+       uint32_t                          _fade_out_disabled;
 
   protected:
+       /* default constructor for derived (compound) types */
+
+       AudioRegion (Session& s, 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 void recompute_at_start () = 0;
-       virtual void recompute_at_end () = 0;*/
 };
 
 } /* namespace ARDOUR */