X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_buffer.h;h=f3ec2ed25a4b157e701966f5cb9ba187f2cf8a9c;hb=b728d3c9ff7541251ab9d11123125a54d000e740;hp=6b771814db67d20f2bc1f4c40934a70522634e9f;hpb=c1c5151ca40621d85ff67431e9ab841d141919a0;p=ardour.git

diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h
index 6b771814db..f3ec2ed25a 100644
--- a/libs/ardour/ardour/audio_buffer.h
+++ b/libs/ardour/ardour/audio_buffer.h
@@ -27,21 +27,33 @@
 namespace ARDOUR {
 
 /** Buffer containing audio data. */
-class AudioBuffer : public Buffer
+class LIBARDOUR_API AudioBuffer : public Buffer
 {
 public:
 	AudioBuffer(size_t capacity);
 	~AudioBuffer();
 
-	void silence (framecnt_t len, framecnt_t offset = 0) {
-		if (!_silent) {
-			assert(_capacity > 0);
-			assert(offset + len <= _capacity);
-			memset(_data + offset, 0, sizeof (Sample) * len);
-			if (len == _capacity) {
-				_silent = true;
-			}
+	void silence (framecnt_t len, framecnt_t offset = 0);
+
+	/** Read @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/
+	void read_from (const Sample* src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
+		assert(src != 0);
+		assert(_capacity > 0);
+		assert(len <= _capacity);
+		memcpy(_data + dst_offset, src + src_offset, sizeof(Sample) * len);
+		_silent = false;
+		_written = true;
+	}
+
+        void read_from_with_gain (const Sample* src, framecnt_t len, gain_t gain, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
+		assert(src != 0);
+		assert(_capacity > 0);
+		assert(len <= _capacity);
+		src += src_offset;
+		for (framecnt_t n = 0; n < len; ++n) {
+			_data[dst_offset+n] = src[n] * gain;
 		}
+		_silent = false;
 		_written = true;
 	}
 
@@ -50,9 +62,9 @@ public:
 		assert(&src != this);
 		assert(_capacity > 0);
 		assert(src.type() == DataType::AUDIO);
-		assert(len <= _capacity);
+		assert(dst_offset + len <= _capacity);
 		assert( src_offset <= ((framecnt_t) src.capacity()-len));
-		memcpy(_data + dst_offset, ((AudioBuffer&)src).data() + src_offset, sizeof(Sample) * len);
+		memcpy(_data + dst_offset, ((const AudioBuffer&)src).data() + src_offset, sizeof(Sample) * len);
 		if (dst_offset == 0 && src_offset == 0 && len == _capacity) {
 			_silent = src.silent();
 		} else {
@@ -82,6 +94,20 @@ public:
 		_written = true;
 	}
 
+	/** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @a dst_offset */
+	void accumulate_from (const Sample* src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
+		assert(_capacity > 0);
+		assert(len <= _capacity);
+
+		Sample*       const dst_raw = _data + dst_offset;
+		const Sample* const src_raw = src + src_offset;
+
+		mix_buffers_no_gain(dst_raw, src_raw, len);
+
+		_silent = false;
+		_written = true;
+	}
+
 	/** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @dst_offset
 	 * scaling by @a gain_coeff */
 	void accumulate_with_gain_from (const AudioBuffer& src, framecnt_t len, gain_t gain_coeff, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
@@ -147,7 +173,6 @@ public:
 	void set_data (Sample* data, size_t size) {
 		assert(!_owns_data); // prevent leaks
 		_capacity = size;
-		_size = size;
 		_data = data;
 		_silent = false;
 		_written = false;
@@ -159,8 +184,6 @@ public:
 	 */
 	void resize (size_t nframes);
 
-	bool empty() const { return _size == 0; }
-
 	const Sample* data (framecnt_t offset = 0) const {
 		assert(offset <= _capacity);
 		return _data + offset;
@@ -168,9 +191,12 @@ public:
 
 	Sample* data (framecnt_t offset = 0) {
 		assert(offset <= _capacity);
+		_silent = false;
 		return _data + offset;
 	}
 
+	bool check_silence (pframes_t, pframes_t&) const;
+
 	void prepare () { _written = false; _silent = false; }
 	bool written() const { return _written; }
 	void set_written(bool w) { _written = w; }