Commit read-only stack security fix for 64bit processors.

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

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 36c6256d50bd5c3296f2ca65c3446f0a5b220733..4be5d27a6ba8bd1724c0cfd3a333cce5b1caab26 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -42,18 +42,6 @@ class Session;
 class AudioFilter;
 class AudioSource;
 
-struct AudioRegionState : public RegionState 
-{
-       AudioRegionState (std::string why);
-
-       Curve    _fade_in;
-       Curve    _fade_out;
-       Curve    _envelope;
-       gain_t   _scale_amplitude;
-       uint32_t _fade_in_disabled;
-       uint32_t _fade_out_disabled;
-};
-
 class AudioRegion : public Region
 {
   public:
@@ -90,24 +78,24 @@ class AudioRegion : public Region
        Curve& fade_out() { return _fade_out; }
        Curve& envelope() { return _envelope; }
 
-       jack_nframes_t read_peaks (PeakData *buf, jack_nframes_t npeaks,
-                       jack_nframes_t offset, jack_nframes_t cnt,
+       nframes_t read_peaks (PeakData *buf, nframes_t npeaks,
+                       nframes_t offset, nframes_t cnt,
                        uint32_t chan_n=0, double samples_per_unit= 1.0) const;
 
-       virtual jack_nframes_t read_at (Sample *buf, Sample *mixdown_buf,
-                       float *gain_buf, jack_nframes_t position, jack_nframes_t cnt, 
+       virtual nframes_t read_at (Sample *buf, Sample *mixdown_buf,
+                       float *gain_buf, nframes_t position, nframes_t cnt, 
                        uint32_t       chan_n      = 0,
-                       jack_nframes_t read_frames = 0,
-                       jack_nframes_t skip_frames = 0) const;
+                       nframes_t read_frames = 0,
+                       nframes_t skip_frames = 0) const;
 
-       jack_nframes_t master_read_at (Sample *buf, Sample *mixdown_buf, 
+       nframes_t master_read_at (Sample *buf, Sample *mixdown_buf, 
                        float *gain_buf,
-                       jack_nframes_t position, jack_nframes_t cnt, uint32_t chan_n=0) const;
+                       nframes_t position, nframes_t cnt, uint32_t chan_n=0) const;
 
        XMLNode& state (bool);
        int      set_state (const XMLNode&);
 
-       static void set_default_fade (float steepness, jack_nframes_t len);
+       static void set_default_fade (float steepness, nframes_t len);
 
        enum FadeShape {
                Linear,
@@ -119,20 +107,18 @@ class AudioRegion : public Region
 
        void set_fade_in_active (bool yn);
        void set_fade_in_shape (FadeShape);
-       void set_fade_in_length (jack_nframes_t);
-       void set_fade_in (FadeShape, jack_nframes_t);
+       void set_fade_in_length (nframes_t);
+       void set_fade_in (FadeShape, nframes_t);
 
        void set_fade_out_active (bool yn);
        void set_fade_out_shape (FadeShape);
-       void set_fade_out_length (jack_nframes_t);
-       void set_fade_out (FadeShape, jack_nframes_t);
+       void set_fade_out_length (nframes_t);
+       void set_fade_out (FadeShape, nframes_t);
 
        void set_envelope_active (bool yn);
 
        int separate_by_channel (ARDOUR::Session&, vector<AudioRegion*>&) const;
 
-       UndoAction get_memento() const;
-
        /* filter */
 
        int apply (AudioFilter&);
@@ -153,10 +139,10 @@ class AudioRegion : public Region
   private:
        friend class RegionFactory;
 
-       AudioRegion (boost::shared_ptr<AudioSource>, jack_nframes_t start, jack_nframes_t length);
-       AudioRegion (boost::shared_ptr<AudioSource>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
-       AudioRegion (SourceList &, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
-       AudioRegion (boost::shared_ptr<const AudioRegion>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
+       AudioRegion (boost::shared_ptr<AudioSource>, nframes_t start, nframes_t length);
+       AudioRegion (boost::shared_ptr<AudioSource>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
+       AudioRegion (SourceList &, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
+       AudioRegion (boost::shared_ptr<const AudioRegion>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
        AudioRegion (boost::shared_ptr<const AudioRegion>);
        AudioRegion (boost::shared_ptr<AudioSource>, const XMLNode&);
        AudioRegion (SourceList &, const XMLNode&);
@@ -167,28 +153,26 @@ class AudioRegion : public Region
        void set_default_fade_out ();
        void set_default_envelope ();
 
-       StateManager::State* state_factory (std::string why) const;
-       Change restore_state (StateManager::State&);
-
        void recompute_gain_at_end ();
        void recompute_gain_at_start ();
 
-       jack_nframes_t _read_at (const SourceList&, Sample *buf, Sample *mixdown_buffer, 
-                                float *gain_buffer, jack_nframes_t position, jack_nframes_t cnt, 
+       nframes_t _read_at (const SourceList&, Sample *buf, Sample *mixdown_buffer, 
+                                float *gain_buffer, nframes_t position, nframes_t cnt, 
                                 uint32_t chan_n = 0,
-                                jack_nframes_t read_frames = 0,
-                                jack_nframes_t skip_frames = 0) const;
+                                nframes_t read_frames = 0,
+                                nframes_t skip_frames = 0) const;
 
-       bool verify_start (jack_nframes_t position);
-       bool verify_length (jack_nframes_t position);
-       bool verify_start_mutable (jack_nframes_t& start);
-       bool verify_start_and_length (jack_nframes_t start, jack_nframes_t length);
+       bool verify_start (nframes_t position);
+       bool verify_length (nframes_t position);
+       bool verify_start_mutable (nframes_t& start);
+       bool verify_start_and_length (nframes_t start, nframes_t length);
        void recompute_at_start ();
        void recompute_at_end ();
 
        void envelope_changed (Change);
+       void source_offset_changed ();
 
-       void source_deleted (boost::shared_ptr<Source>);
+       void source_deleted ();
        
        SourceList        sources;
        
@@ -203,6 +187,9 @@ class AudioRegion : public Region
        gain_t            _scale_amplitude;
        uint32_t          _fade_in_disabled;
        uint32_t          _fade_out_disabled;
+
+  protected:
+       int set_live_state (const XMLNode&, Change&, bool send);
 };
 
 } /* namespace ARDOUR */