Remove unused parameters to AudioRegion::read_at

git-svn-id: svn://localhost/ardour2/branches/3.0@9899 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 13 insertions, 25 deletions

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 0b9efd76a7..b418a2c409 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -110,11 +110,9 @@ 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;
@@ -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 ();
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 130508c21a..11bea700de 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -90,9 +90,7 @@ class Crossfade : public ARDOUR::AudioRegion
 
 	framecnt_t read_at (Sample *buf, Sample *mixdown_buffer,
 			    float *gain_buffer, framepos_t position, framecnt_t cnt,
-			    uint32_t chan_n,
-			    framecnt_t read_frames = 0,
-			    framecnt_t skip_frames = 0) const;
+			    uint32_t chan_n) const;
 
 	bool refresh ();
 
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 70cd9ec3f5..af075608ad 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -286,8 +286,6 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, fr
 	Glib::RecMutex::Lock rm (region_lock);
 
 	framepos_t const end = start + cnt - 1;
-	framecnt_t read_frames = 0;
-	framecnt_t skip_frames = 0;
 	_read_data_count = 0;
 
 	_read_data_count = 0;
@@ -345,7 +343,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, fr
 			boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(*i);
                         DEBUG_TRACE (DEBUG::AudioPlayback, string_compose ("read from region %1\n", ar->name()));
 			assert(ar);
-			ar->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n, read_frames, skip_frames);
+			ar->read_at (buf, mixdown_buffer, gain_buffer, start, cnt, chan_n);
 			_read_data_count += ar->read_data_count();
 		}
 
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 0a7e3f122c..808d45bbad 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -346,17 +346,16 @@ framecnt_t
 AudioRegion::read (Sample* buf, framepos_t timeline_position, framecnt_t cnt, int channel) const
 {
 	/* raw read, no fades, no gain, nada */
-	return _read_at (_sources, _length, buf, 0, 0, _position + timeline_position, cnt, channel, 0, 0, ReadOps (0));
+	return _read_at (_sources, _length, buf, 0, 0, _position + timeline_position, cnt, channel, ReadOps (0));
 }
 
 framecnt_t
 AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer,
-		      framepos_t file_position, framecnt_t cnt, uint32_t chan_n,
-		      framecnt_t read_frames, framecnt_t skip_frames) const
+		      framepos_t file_position, framecnt_t cnt, uint32_t chan_n) const
 {
 	/* regular diskstream/butler read complete with fades etc */
 	return _read_at (_sources, _length, buf, mixdown_buffer, gain_buffer,
-			file_position, cnt, chan_n, read_frames, skip_frames, ReadOps (~0));
+			file_position, cnt, chan_n, ReadOps (~0));
 }
 
 framecnt_t
@@ -366,7 +365,7 @@ AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_bu
 	/* do not read gain/scaling/fades and do not count this disk i/o in statistics */
 
 	return _read_at (_master_sources, _master_sources.front()->length(_master_sources.front()->timeline_position()),
-			 buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, 0, 0, ReadOps (0));
+			 buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, ReadOps (0));
 }
 
 framecnt_t
@@ -375,8 +374,6 @@ AudioRegion::_read_at (const SourceList& /*srcs*/, framecnt_t limit,
 		       framepos_t position,
 		       framecnt_t cnt,
 		       uint32_t chan_n,
-		       framecnt_t /*read_frames*/,
-		       framecnt_t /*skip_frames*/,
 		       ReadOps rops) const
 {
 	frameoffset_t internal_offset;
diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index d6fe1243b5..9cbbbf1898 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -315,7 +315,7 @@ Crossfade::read_raw_internal (Sample* buf, framecnt_t start, framecnt_t cnt, int
 	float* gain = new float[cnt];
 	framecnt_t ret;
 
-	ret = read_at (buf, mixdown, gain, start, cnt, channel, cnt);
+	ret = read_at (buf, mixdown, gain, start, cnt, channel);
 
 	delete [] mixdown;
 	delete [] gain;
@@ -325,8 +325,7 @@ Crossfade::read_raw_internal (Sample* buf, framecnt_t start, framecnt_t cnt, int
 
 framecnt_t
 Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
-		    float *gain_buffer, framepos_t start, framecnt_t cnt, uint32_t chan_n,
-		    framecnt_t read_frames, framecnt_t skip_frames) const
+		    float *gain_buffer, framepos_t start, framecnt_t cnt, uint32_t chan_n) const
 {
 	frameoffset_t offset;
 	framecnt_t to_write;
@@ -368,8 +367,8 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
 		memset (crossfade_buffer_in, 0, sizeof (Sample) * to_write);
 	}
 
-	_out->read_at (crossfade_buffer_out, mixdown_buffer, gain_buffer, start, to_write, chan_n, read_frames, skip_frames);
-	_in->read_at (crossfade_buffer_in, mixdown_buffer, gain_buffer, start, to_write, chan_n, read_frames, skip_frames);
+	_out->read_at (crossfade_buffer_out, mixdown_buffer, gain_buffer, start, to_write, chan_n);
+	_in->read_at (crossfade_buffer_in, mixdown_buffer, gain_buffer, start, to_write, chan_n);
 
 	float* fiv = new float[to_write];
 	float* fov = new float[to_write];