merge with master

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 87d515d39975323eb9188630c2bf69e10ca87390..13e46e4979da16cd7ee06dcee34226a5a9a59c97 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -34,7 +34,7 @@
 #include "ardour/region.h"
 
 class XMLNode;
-class AudioRegionTest;
+class AudioRegionReadTest;
 class PlaylistReadTest;
 
 namespace ARDOUR {
@@ -46,16 +46,11 @@ namespace Properties {
        extern PBD::PropertyDescriptor<bool> fade_in_active;
        extern PBD::PropertyDescriptor<bool> fade_out_active;
        extern PBD::PropertyDescriptor<float> scale_amplitude;
-
-       /* the envelope and fades are not scalar items and so
-          currently (2010/02) are not stored using Property.
-          However, these descriptors enable us to notify
-          about changes to them via PropertyChange.
-       */
-
-       extern PBD::PropertyDescriptor<bool> envelope;
-       extern PBD::PropertyDescriptor<bool> fade_in;
-       extern PBD::PropertyDescriptor<bool> fade_out;
+       extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_in;
+       extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_in;
+       extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_out;
+       extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_out;
+       extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > envelope;
 }
 
 class Playlist;
@@ -89,30 +84,20 @@ class AudioRegion : public Region
        bool fade_in_active ()  const { return _fade_in_active; }
        bool fade_out_active () const { return _fade_out_active; }
 
-       bool fade_in_is_xfade() const { return _fade_in_is_xfade; }
-       void set_fade_in_is_xfade (bool yn);
-       bool fade_out_is_xfade() const { return _fade_out_is_xfade; }
-       void set_fade_out_is_xfade (bool yn);
-
-       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; }
+       boost::shared_ptr<AutomationList> fade_in()  { return _fade_in.val (); }
+       boost::shared_ptr<AutomationList> inverse_fade_in()  { return _inverse_fade_in.val (); }
+       boost::shared_ptr<AutomationList> fade_out() { return _fade_out.val (); }
+       boost::shared_ptr<AutomationList> inverse_fade_out()  { return _inverse_fade_out.val (); }
+       boost::shared_ptr<AutomationList> envelope() { return _envelope.val (); }
 
        Evoral::Range<framepos_t> body_range () const;
 
        virtual framecnt_t read_peaks (PeakData *buf, framecnt_t npeaks,
                        framecnt_t offset, framecnt_t cnt,
-                       uint32_t chan_n=0, double samples_per_unit= 1.0) const;
+                       uint32_t chan_n=0, double frames_per_pixel = 1.0) const;
 
        /* Readable interface */
 
-       enum ReadOps {
-               ReadOpsNone = 0x0,
-               ReadOpsOwnAutomation = 0x1,
-               ReadOpsOwnScaling = 0x2,
-               ReadOpsFades = 0x4
-       };
-
        virtual framecnt_t read (Sample*, framepos_t pos, framecnt_t cnt, int channel) const;
        virtual framecnt_t readable_length() const { return length(); }
 
@@ -127,6 +112,7 @@ class AudioRegion : public Region
        virtual framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int channel) const;
 
        XMLNode& state ();
+       XMLNode& get_basic_state ();
        int set_state (const XMLNode&, int version);
 
        static void set_default_fade (float steepness, framecnt_t len);
@@ -147,6 +133,8 @@ class AudioRegion : public Region
 
        void set_default_fade_in ();
        void set_default_fade_out ();
+
+       framecnt_t verify_xfade_bounds (framecnt_t, bool start);
        
        void set_envelope_active (bool yn);
        void set_default_envelope ();
@@ -183,7 +171,6 @@ class AudioRegion : public Region
 
   private:
        friend class RegionFactory;
-       friend class Crossfade;
 
        AudioRegion (boost::shared_ptr<AudioSource>);
        AudioRegion (const SourceList &);
@@ -193,7 +180,7 @@ class AudioRegion : public Region
        AudioRegion (SourceList &);
 
   private:
-       friend class ::AudioRegionTest;
+       friend class ::AudioRegionReadTest;
        friend class ::PlaylistReadTest;
        
        PBD::Property<bool>     _envelope_active;
@@ -213,11 +200,7 @@ class AudioRegion : public Region
        void recompute_gain_at_end ();
        void recompute_gain_at_start ();
 
-       framecnt_t _read_at (const SourceList&, framecnt_t limit,
-                            Sample *buf, Sample *mixdown_buffer, float *gain_buffer,
-                            framepos_t position, framecnt_t cnt,
-                            uint32_t chan_n = 0,
-                            ReadOps readops = ReadOps (~0)) const;
+       framecnt_t read_from_sources (SourceList const &, framecnt_t, Sample *, framepos_t, framecnt_t, uint32_t) const;
 
        void recompute_at_start ();
        void recompute_at_end ();
@@ -230,18 +213,17 @@ class AudioRegion : public Region
        void connect_to_analysis_changed ();
        void connect_to_header_position_offset_changed ();
 
-       Automatable _automatable;
 
-       boost::shared_ptr<AutomationList> _fade_in;
-       boost::shared_ptr<AutomationList> _fade_out;
-       boost::shared_ptr<AutomationList> _envelope;
-       uint32_t                          _fade_in_suspended;
-       uint32_t                          _fade_out_suspended;
-       /* This is not a Property because its not subject to user control,
-          or undo/redo. XXX this may prove to be a mistake.
-       */
-       bool                              _fade_in_is_xfade;
-       bool                              _fade_out_is_xfade;
+       AutomationListProperty _fade_in;
+       AutomationListProperty _inverse_fade_in;
+       AutomationListProperty _fade_out;
+       AutomationListProperty _inverse_fade_out;
+       AutomationListProperty _envelope;
+       Automatable            _automatable;
+       uint32_t               _fade_in_suspended;
+       uint32_t               _fade_out_suspended;
+
+       boost::shared_ptr<ARDOUR::Region> get_single_other_xfade_region (bool start) const;
 
   protected:
        /* default constructor for derived (compound) types */
@@ -253,12 +235,4 @@ class AudioRegion : public Region
 
 } /* namespace ARDOUR */
 
-/* access from C objects */
-
-extern "C" {
-       int    region_read_peaks_from_c   (void *arg, uint32_t npeaks, uint32_t start, uint32_t length, intptr_t data, uint32_t n_chan, double samples_per_unit);
-       uint32_t region_length_from_c (void *arg);
-       uint32_t sourcefile_length_from_c (void *arg, double);
-}
-
 #endif /* __ardour_audio_region_h__ */