X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioregion.h;h=e385863efa7af60482ba23c9a531074e178e98c3;hb=33c61757fc8352fdb1280bca28b54d1adee183ff;hp=8d929827c5b00a3c40ed57af0888c3df8d367f97;hpb=48493b444b9279c8ca76a92bfa82648ac80eb9f0;p=ardour.git

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 8d929827c5..e385863efa 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -28,7 +28,7 @@
 
 #include "ardour/ardour.h"
 #include "ardour/automatable.h"
-#include "ardour/gain.h"
+#include "ardour/automation_list.h"
 #include "ardour/logcurve.h"
 #include "ardour/region.h"
 
@@ -102,23 +102,20 @@ class AudioRegion : public Region
 		ReadOpsNone = 0x0,
 		ReadOpsOwnAutomation = 0x1,
 		ReadOpsOwnScaling = 0x2,
-		ReadOpsCount = 0x4,
-		ReadOpsFades = 0x8
+		ReadOpsFades = 0x4
 	};
 
 	virtual framecnt_t read (Sample*, framepos_t pos, framecnt_t cnt, int channel) const;
 	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 ();
@@ -157,10 +154,6 @@ class AudioRegion : public Region
 		return _automatable.control(id);
 	}
 
-	/* export */
-
-	int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&);
-
 	/* xfade/fade interactions */
 
 	void suspend_fade_in ();
@@ -196,7 +189,7 @@ class AudioRegion : public Region
 	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 (const PBD::PropertyChange&);
 
@@ -212,8 +205,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 ();