X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioregion.h;h=c3003e587bba29b9dbaaaa7e0d5c843da0af12fe;hb=faefc3ba9a42417b133235e0a9efeaba467aad5f;hp=13e46e4979da16cd7ee06dcee34226a5a9a59c97;hpb=ce8731b32d5e91f56396cb5f6ca0798bc7fed48a;p=ardour.git

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 13e46e4979..c3003e587b 100644
--- 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 ();
@@ -74,6 +74,10 @@ class AudioRegion : public Region
 
 	boost::shared_ptr<AudioSource> audio_source (uint32_t n=0) const;
 
+    // if several audio files associated with a region,
+    // information about file with MAX channel count will be provided
+    uint32_t get_related_audio_file_channel_count () const;
+
 	void   set_scale_amplitude (gain_t);
 	gain_t scale_amplitude() const { return _scale_amplitude; }
 
@@ -115,7 +119,8 @@ class AudioRegion : public Region
 	XMLNode& get_basic_state ();
 	int set_state (const XMLNode&, int version);
 
-	static void set_default_fade (float steepness, framecnt_t len);
+	void fade_range (framepos_t, framepos_t);
+
 	bool fade_in_is_default () const;
 	bool fade_out_is_default () const;
 
@@ -135,7 +140,7 @@ class AudioRegion : public Region
 	void set_default_fade_out ();
 
 	framecnt_t verify_xfade_bounds (framecnt_t, bool start);
-	
+
 	void set_envelope_active (bool yn);
 	void set_default_envelope ();
 
@@ -162,12 +167,12 @@ class AudioRegion : public Region
 
 	void add_transient (framepos_t where);
 	void remove_transient (framepos_t where);
-	int set_transients (AnalysisFeatureList&);
-	int get_transients (AnalysisFeatureList&, bool force_new = false);
-	int update_transient (framepos_t old_position, framepos_t new_position);
-	int adjust_transients (frameoffset_t delta);
+	void clear_transients ();
+	void set_onsets (AnalysisFeatureList&);
+	void get_transients (AnalysisFeatureList&);
+	void update_transient (framepos_t old_position, framepos_t new_position);
 
-	AudioIntervalResult find_silence (Sample, framecnt_t, InterThreadInfo&) const;
+	AudioIntervalResult find_silence (Sample, framecnt_t, framecnt_t, InterThreadInfo&) const;
 
   private:
 	friend class RegionFactory;
@@ -175,14 +180,16 @@ class AudioRegion : public Region
 	AudioRegion (boost::shared_ptr<AudioSource>);
 	AudioRegion (const SourceList &);
 	AudioRegion (boost::shared_ptr<const AudioRegion>);
-	AudioRegion (boost::shared_ptr<const AudioRegion>, frameoffset_t offset);
+	AudioRegion (boost::shared_ptr<const AudioRegion>, frameoffset_t offset, const int32_t sub_num);
 	AudioRegion (boost::shared_ptr<const AudioRegion>, const SourceList&);
 	AudioRegion (SourceList &);
 
   private:
 	friend class ::AudioRegionReadTest;
 	friend class ::PlaylistReadTest;
-	
+
+	void build_transients ();
+
 	PBD::Property<bool>     _envelope_active;
 	PBD::Property<bool>     _default_fade_in;
 	PBD::Property<bool>     _default_fade_out;
@@ -235,4 +242,12 @@ class AudioRegion : public Region
 
 } /* namespace ARDOUR */
 
+/* access from C objects */
+
+extern "C" {
+	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__ */