don't add a [shared] panner for the sends to monitoing section

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 077f90c95a1529f333db7677e08ca2d235efe7c2..83cd227bce0136d2179b217aedd4cb56b472d7b6 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -34,7 +34,8 @@
 #include "ardour/region.h"
 
 class XMLNode;
-
+class AudioRegionReadTest;
+class PlaylistReadTest;
 
 namespace ARDOUR {
 
@@ -45,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;
@@ -88,9 +84,13 @@ class AudioRegion : public Region
        bool fade_in_active ()  const { return _fade_in_active; }
        bool fade_out_active () const { return _fade_out_active; }
 
-       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,
@@ -98,13 +98,6 @@ class AudioRegion : public Region
 
        /* 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(); }
 
@@ -119,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);
@@ -137,6 +131,11 @@ class AudioRegion : public Region
        void set_fade_out (FadeShape, framecnt_t);
        void set_fade_out (boost::shared_ptr<AutomationList>);
 
+       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 ();
 
@@ -172,7 +171,6 @@ class AudioRegion : public Region
 
   private:
        friend class RegionFactory;
-       friend class Crossfade;
 
        AudioRegion (boost::shared_ptr<AudioSource>);
        AudioRegion (const SourceList &);
@@ -182,6 +180,9 @@ class AudioRegion : public Region
        AudioRegion (SourceList &);
 
   private:
+       friend class ::AudioRegionReadTest;
+       friend class ::PlaylistReadTest;
+       
        PBD::Property<bool>     _envelope_active;
        PBD::Property<bool>     _default_fade_in;
        PBD::Property<bool>     _default_fade_out;
@@ -195,17 +196,11 @@ class AudioRegion : public Region
 
        void init ();
        void set_default_fades ();
-       void set_default_fade_in ();
-       void set_default_fade_out ();
 
        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 ();
@@ -218,13 +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;
+       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 */