optimize some performance bottlenecks; remove jack_nframes_t that crept back into the code

git-svn-id: svn://localhost/ardour2/branches/midi@1779 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 18 insertions, 15 deletions

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index 6000872bdd..b890afbb03 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -60,12 +60,12 @@ public:
 	bool silent() const { return _silent; }
 
 	/** Clear (eg zero, or empty) buffer starting at TIME @a offset */
-	virtual void silence(jack_nframes_t len, jack_nframes_t offset=0) = 0;
+	virtual void silence(nframes_t len, nframes_t offset=0) = 0;
 	
 	/** Clear the entire buffer */
 	virtual void clear() { silence(_capacity, 0); }
 
-	virtual void read_from(const Buffer& src, jack_nframes_t offset, jack_nframes_t len) = 0;
+	virtual void read_from(const Buffer& src, nframes_t offset, nframes_t len) = 0;
 
 protected:
 	Buffer(DataType type, size_t capacity)
@@ -95,7 +95,7 @@ public:
 	
 	~AudioBuffer();
 
-	void silence(jack_nframes_t len, jack_nframes_t offset=0)
+	void silence(nframes_t len, nframes_t offset=0)
 	{
 		if (!_silent) {
 			assert(_capacity > 0);
@@ -108,25 +108,25 @@ public:
 	}
 	
 	/** Read @a len frames FROM THE START OF @a src into self at @a offset */
-	void read_from(const Buffer& src, jack_nframes_t len, jack_nframes_t offset)
+	void read_from(const Buffer& src, nframes_t len, nframes_t offset)
 	{
 		assert(_capacity > 0);
 		assert(src.type() == _type == DataType::AUDIO);
 		assert(offset + len <= _capacity);
-		memcpy(_data + offset, ((AudioBuffer&)src).data(len), sizeof(Sample) * len);
+		memcpy(_data + offset, ((AudioBuffer&)src).data(), sizeof(Sample) * len);
 		_silent = src.silent();
 	}
 	
 	/** Accumulate (add)@a len frames FROM THE START OF @a src into self at @a offset */
-	void accumulate_from(const AudioBuffer& src, jack_nframes_t len, jack_nframes_t offset)
+	void accumulate_from(const AudioBuffer& src, nframes_t len, nframes_t offset)
 	{
 		assert(_capacity > 0);
 		assert(offset + len <= _capacity);
 
 		Sample*       const dst_raw = _data + offset;
-		const Sample* const src_raw = src.data(len);
+		const Sample* const src_raw = src.data();
 
-		for (jack_nframes_t n = 0; n < len; ++n) {
+		for (nframes_t n = 0; n < len; ++n) {
 			dst_raw[n] += src_raw[n];
 		}
 
@@ -135,20 +135,20 @@ public:
 	
 	/** Accumulate (add) @a len frames FROM THE START OF @a src into self at @a offset
 	 * scaling by @a gain_coeff */
-	void accumulate_with_gain_from(const AudioBuffer& src, jack_nframes_t len, jack_nframes_t offset, gain_t gain_coeff)
+	void accumulate_with_gain_from(const AudioBuffer& src, nframes_t len, nframes_t offset, gain_t gain_coeff)
 	{
 		assert(_capacity > 0);
 		assert(offset + len <= _capacity);
 
 		Sample*       const dst_raw = _data + offset;
-		const Sample* const src_raw = src.data(len);
+		const Sample* const src_raw = src.data();
 
 		mix_buffers_with_gain (dst_raw, src_raw, len, gain_coeff);
 
 		_silent = ( (src.silent() && _silent) || (_silent && gain_coeff == 0) );
 	}
 	
-	void apply_gain(gain_t gain, jack_nframes_t len, jack_nframes_t offset=0) {
+	void apply_gain(gain_t gain, nframes_t len, nframes_t offset=0) {
 		apply_gain_to_buffer (_data + offset, len, gain);
 	}
 
@@ -165,10 +165,13 @@ public:
 		_silent = false;
 	}
 
-	const Sample* data(jack_nframes_t nframes, jack_nframes_t offset=0) const
+	const Sample* data () const { return _data; }
+	Sample* data () { return _data; }
+
+	const Sample* data(nframes_t nframes, nframes_t offset) const
 		{ assert(offset + nframes <= _capacity); return _data + offset; }
 
-	Sample* data(jack_nframes_t nframes, jack_nframes_t offset=0)
+	Sample* data (nframes_t nframes, nframes_t offset)
 		{ assert(offset + nframes <= _capacity); return _data + offset; }
 
 private:
@@ -190,9 +193,9 @@ public:
 	
 	~MidiBuffer();
 
-	void silence(jack_nframes_t dur, jack_nframes_t offset=0);
+	void silence(nframes_t dur, nframes_t offset=0);
 	
-	void read_from(const Buffer& src, jack_nframes_t nframes, jack_nframes_t offset);
+	void read_from(const Buffer& src, nframes_t nframes, nframes_t offset);
 
 	bool push_back(const MidiEvent& event);