fixes from chris cannam for rb_effect bugs

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 5bc59a715a07ea36b941885793527dbdea0bb176..614211ffebbb5a8bba6acde341f17b77328a884a 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -69,7 +69,8 @@ class AudioRegion : public Region
 
        uint32_t n_channels() const { return sources.size(); }
        vector<string> master_source_names();
-       void set_master_sources (SourceList&);
+       void set_master_sources (const SourceList&);
+       const SourceList& get_master_sources() const { return master_sources; }
 
        bool envelope_active () const { return _flags & Region::EnvelopeActive; }
        bool fade_in_active ()  const { return _flags & Region::FadeIn; }
@@ -148,7 +149,7 @@ class AudioRegion : public Region
 
        void set_playlist (boost::weak_ptr<Playlist>);
 
-       int get_transients (std::vector<nframes64_t>&);
+       int get_transients (AnalysisFeatureList&, bool force_new = false);
 
   private:
        friend class RegionFactory;
@@ -169,7 +170,8 @@ class AudioRegion : public Region
        void recompute_gain_at_end ();
        void recompute_gain_at_start ();
 
-       nframes_t _read_at (const SourceList&, Sample *buf, Sample *mixdown_buffer, 
+       nframes_t _read_at (const SourceList&, nframes_t limit,
+                           Sample *buf, Sample *mixdown_buffer, 
                            float *gain_buffer, nframes_t position, nframes_t cnt, 
                            uint32_t chan_n = 0,
                            nframes_t read_frames = 0,
@@ -188,6 +190,7 @@ class AudioRegion : public Region
        void fade_out_changed ();
        void source_offset_changed ();
        void listen_to_my_curves ();
+       void listen_to_my_sources ();
 
        void source_deleted ();