merge fix

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index c3e9eec1f91127c37d67834f1b10e44b060a35d0..086544f3aa33ab46a30e927370cfe9839bfc58c8 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -73,7 +73,11 @@ class LIBARDOUR_API AudioRegion : public Region
        bool speed_mismatch (float) const;
 
        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 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;