use per-channel signals to pick up scene changes, rather than global ones

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 67946caa6f7d4f65d9b4f15493e2bfe05c6ba1a9..c3e9eec1f91127c37d67834f1b10e44b060a35d0 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -40,17 +40,17 @@ class PlaylistReadTest;
 namespace ARDOUR {
 
 namespace Properties {
-       extern PBD::PropertyDescriptor<bool> envelope_active;
-       extern PBD::PropertyDescriptor<bool> default_fade_in;
-       extern PBD::PropertyDescriptor<bool> default_fade_out;
-       extern PBD::PropertyDescriptor<bool> fade_in_active;
-       extern PBD::PropertyDescriptor<bool> fade_out_active;
-       extern PBD::PropertyDescriptor<float> scale_amplitude;
-       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;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<bool> envelope_active;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<bool> default_fade_in;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<bool> default_fade_out;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<bool> fade_in_active;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<bool> fade_out_active;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<float> scale_amplitude;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_in;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_in;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_out;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_out;
+       LIBARDOUR_API extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > envelope;
 }
 
 class Playlist;
@@ -59,7 +59,7 @@ class Filter;
 class AudioSource;
 
 
-class AudioRegion : public Region
+class LIBARDOUR_API AudioRegion : public Region
 {
   public:
        static void make_property_quarks ();
@@ -94,7 +94,7 @@ class AudioRegion : public Region
 
        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 */
 
@@ -112,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);
@@ -237,9 +238,9 @@ class AudioRegion : public Region
 /* 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);
+       LIBARDOUR_API 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);
+       LIBARDOUR_API uint32_t region_length_from_c (void *arg);
+       LIBARDOUR_API uint32_t sourcefile_length_from_c (void *arg, double);
 }
 
 #endif /* __ardour_audio_region_h__ */