Remove unused parameters to AudioRegion::read_at

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 0a3e53039e13f126e4b80d7bd861e229e8d81b06..b418a2c4093821df0a5ccee7e2e1e5615eda4fca 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -27,7 +27,7 @@
 #include "pbd/undo.h"
 
 #include "ardour/ardour.h"
-#include "ardour/automatable_controls.h"
+#include "ardour/automatable.h"
 #include "ardour/gain.h"
 #include "ardour/logcurve.h"
 #include "ardour/region.h"
@@ -44,7 +44,6 @@ namespace Properties {
        extern PBD::PropertyDescriptor<bool> fade_in_active;
        extern PBD::PropertyDescriptor<bool> fade_out_active;
        extern PBD::PropertyDescriptor<float> scale_amplitude;
-       extern PBD::PropertyDescriptor<float> scale_amplitude;
 
        /* the envelope and fades are not scalar items and so
           currently (2010/02) are not stored using Property.
@@ -82,7 +81,8 @@ class AudioRegion : public Region
        void   set_scale_amplitude (gain_t);
        gain_t scale_amplitude() const { return _scale_amplitude; }
 
-       void normalize_to (float target_in_dB = 0.0f);
+       void normalize (float, float target_in_dB = 0.0f);
+       double maximum_amplitude (Progress* p = 0) const;
 
        bool envelope_active () const { return _envelope_active; }
        bool fade_in_active ()  const { return _fade_in_active; }
@@ -92,8 +92,8 @@ class AudioRegion : public Region
        boost::shared_ptr<AutomationList> fade_out() { return _fade_out; }
        boost::shared_ptr<AutomationList> envelope() { return _envelope; }
 
-       virtual nframes_t read_peaks (PeakData *buf, nframes_t npeaks,
-                       nframes_t offset, nframes_t cnt,
+       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;
 
        /* Readable interface */
@@ -110,32 +110,22 @@ class AudioRegion : public Region
        virtual framecnt_t readable_length() const { return length(); }
 
        virtual framecnt_t read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf,
-                                    framepos_t position,
-                                    framecnt_t cnt,
-                                    uint32_t  chan_n      = 0,
-                                    framecnt_t read_frames = 0,
-                                    framecnt_t skip_frames = 0) const;
-       
+                                   framepos_t position,
+                                   framecnt_t cnt,
+                                   uint32_t   chan_n = 0) const;
+
        virtual framecnt_t master_read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf,
                                           framepos_t position, framecnt_t cnt, uint32_t chan_n=0) const;
-       
+
        virtual framecnt_t read_raw_internal (Sample*, framepos_t, framecnt_t, int channel) const;
 
-       XMLNode& state (bool);
+       XMLNode& state ();
        int set_state (const XMLNode&, int version);
 
        static void set_default_fade (float steepness, framecnt_t len);
        bool fade_in_is_default () const;
        bool fade_out_is_default () const;
 
-       enum FadeShape {
-               Linear,
-               Fast,
-               Slow,
-               LogA,
-               LogB
-       };
-
        void set_fade_in_active (bool yn);
        void set_fade_in_shape (FadeShape);
        void set_fade_in_length (framecnt_t);
@@ -176,8 +166,14 @@ class AudioRegion : public Region
        void resume_fade_in ();
        void resume_fade_out ();
 
+       void add_transient (framepos_t where);
+       void remove_transient (framepos_t where);
+       int set_transients (AnalysisFeatureList&);
        int get_transients (AnalysisFeatureList&, bool force_new = false);
-       std::list<std::pair<frameoffset_t, framecnt_t> > find_silence (Sample, framecnt_t, InterThreadInfo&) const;
+       int update_transient (framepos_t old_position, framepos_t new_position);
+       int adjust_transients (framepos_t delta);
+
+       AudioIntervalResult find_silence (Sample, framecnt_t, InterThreadInfo&) const;
 
   private:
        friend class RegionFactory;
@@ -185,7 +181,8 @@ class AudioRegion : public Region
 
        AudioRegion (boost::shared_ptr<AudioSource>);
        AudioRegion (const SourceList &);
-       AudioRegion (boost::shared_ptr<const AudioRegion>, frameoffset_t offset = 0, bool offset_relative = true);
+       AudioRegion (boost::shared_ptr<const AudioRegion>);
+       AudioRegion (boost::shared_ptr<const AudioRegion>, frameoffset_t offset);
        AudioRegion (boost::shared_ptr<const AudioRegion>, const SourceList&);
        AudioRegion (SourceList &);
 
@@ -195,10 +192,11 @@ class AudioRegion : public Region
        PBD::Property<bool>     _default_fade_out;
        PBD::Property<bool>     _fade_in_active;
        PBD::Property<bool>     _fade_out_active;
+       /** linear gain to apply to the whole region */
        PBD::Property<gain_t>   _scale_amplitude;
-       
+
        void register_properties ();
-       void post_set ();
+       void post_set (const PBD::PropertyChange&);
 
        void init ();
        void set_default_fades ();
@@ -212,8 +210,6 @@ class AudioRegion : public Region
                             Sample *buf, Sample *mixdown_buffer, float *gain_buffer,
                             framepos_t position, framecnt_t cnt,
                             uint32_t chan_n = 0,
-                            framecnt_t read_frames = 0,
-                            framecnt_t skip_frames = 0,
                             ReadOps readops = ReadOps (~0)) const;
 
        void recompute_at_start ();
@@ -227,7 +223,7 @@ class AudioRegion : public Region
        void connect_to_analysis_changed ();
        void connect_to_header_position_offset_changed ();
 
-       AutomatableControls _automatable;
+       Automatable _automatable;
 
        boost::shared_ptr<AutomationList> _fade_in;
        boost::shared_ptr<AutomationList> _fade_out;