X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioregion.h;h=a2c43460ed5a4f729c931388b37ae74d0ec3afc6;hb=bde3edf1c8f5075af5913eaea4dc81b199a17138;hp=c3e9eec1f91127c37d67834f1b10e44b060a35d0;hpb=2e27e21d3a09889311e18a8efe11abcaa6d9c8b3;p=ardour.git

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index c3e9eec1f9..a2c43460ed 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -74,12 +74,25 @@ class LIBARDOUR_API 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; }
 
 	void normalize (float, float target_in_dB = 0.0f);
+
+	/** @return the maximum (linear) amplitude of the region, or a -ve
+	 *  number if the Progress object reports that the process was cancelled.
+	 */
 	double maximum_amplitude (Progress* p = 0) const;
 
+	/** @return the maximum (rms) signal power of the region, or a -1
+	 *  if the Progress object reports that the process was cancelled.
+	 */
+	double rms (Progress* p = 0) const;
+
 	bool envelope_active () const { return _envelope_active; }
 	bool fade_in_active ()  const { return _fade_in_active; }
 	bool fade_out_active () const { return _fade_out_active; }
@@ -115,7 +128,8 @@ class LIBARDOUR_API 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 +149,7 @@ class LIBARDOUR_API 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 +176,12 @@ class LIBARDOUR_API 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 +189,16 @@ class LIBARDOUR_API 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>, ARDOUR::MusicFrame offset);
 	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;