X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbuffer.h;h=18c83f8bfb6e3fafca80650781faee2eace23747;hb=6698f5f686bef82b0c9568558c83a3b9b3344700;hp=accdd9c18180917ed60a97d70ef3d0a6e480e924;hpb=30ab1fd61569f9d7fb7410d483fa68cbf9865c37;p=ardour.git

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index accdd9c181..18c83f8bfb 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -22,8 +22,10 @@
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
+#include <boost/utility.hpp>
 #include <ardour/types.h>
 #include <ardour/data_type.h>
+#include <ardour/runtime_functions.h>
 
 namespace ARDOUR {
 
@@ -37,7 +39,7 @@ namespace ARDOUR {
  * 
  * To actually read/write buffer contents, use the appropriate derived class.
  */
-class Buffer
+class Buffer : public boost::noncopyable
 {
 public:
 	virtual ~Buffer() {}
@@ -56,142 +58,28 @@ public:
 	 * Based on this you can static cast a Buffer* to the desired type. */
 	DataType type() const { return _type; }
 
+	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)
-	: _type(type), _capacity(capacity), _size(0) 
+	: _type(type), _capacity(capacity), _size(0), _silent(true)
 	{}
 
 	DataType _type;
 	size_t   _capacity;
 	size_t   _size;
-
-private:
-	// Prevent copies (undefined)
-	Buffer(const Buffer& copy);
-	void operator=(const Buffer& other);
-};
-
-
-/* Inside every class with a type in it's name is a template waiting to get out... */
-
-
-/** Buffer containing 32-bit floating point (audio) data. */
-class AudioBuffer : public Buffer
-{
-public:
-	AudioBuffer(size_t capacity);
-	
-	~AudioBuffer();
-
-	void silence(jack_nframes_t len, jack_nframes_t offset=0)
-	{
-		assert(_capacity > 0);
-		assert(offset + len <= _capacity);
-		memset(_data + offset, 0, sizeof (Sample) * len);
-	}
-	
-	/** 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)
-	{
-		assert(_capacity > 0);
-		assert(src.type() == _type == DataType::AUDIO);
-		assert(offset + len <= _capacity);
-		memcpy(_data + offset, ((AudioBuffer&)src).data(len), sizeof(Sample) * len);
-	}
-	
-	/** 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)
-	{
-		assert(_capacity > 0);
-		assert(offset + len <= _capacity);
-
-		Sample*       const dst_raw = _data + offset;
-		const Sample* const src_raw = src.data(len);
-
-		for (jack_nframes_t n = 0; n < len; ++n) {
-			dst_raw[n] += src_raw[n];
-		}
-	}
-	
-	/** 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)
-	{
-		assert(_capacity > 0);
-		assert(offset + len <= _capacity);
-
-		Sample*       const dst_raw = _data + offset;
-		const Sample* const src_raw = src.data(len);
-
-		for (jack_nframes_t n = 0; n < len; ++n) {
-			dst_raw[n] += src_raw[n] * gain_coeff;
-		}
-	}
-	
-	/** Set the data contained by this buffer manually (for setting directly to jack buffer).
-	 * 
-	 * Constructor MUST have been passed capacity=0 or this will die (to prevent mem leaks).
-	 */
-	void set_data(Sample* data, size_t size)
-	{
-		assert(!_owns_data); // prevent leaks
-		_capacity = size;
-		_size = size;
-		_data = data;
-	}
-
-	const Sample* data(jack_nframes_t nframes, jack_nframes_t offset=0) const
-		{ assert(offset + nframes <= _capacity); return _data + offset; }
-
-	Sample* data(jack_nframes_t nframes, jack_nframes_t offset=0)
-		{ assert(offset + nframes <= _capacity); return _data + offset; }
-
-private:
-	// These are undefined (prevent copies)
-	AudioBuffer(const AudioBuffer& copy);            
-	AudioBuffer& operator=(const AudioBuffer& copy);
-
-	bool    _owns_data;
-	Sample* _data; ///< Actual buffer contents
+	bool     _silent;
 };
 
 
-
-/** Buffer containing 8-bit unsigned char (MIDI) data. */
-class MidiBuffer : public Buffer
-{
-public:
-	MidiBuffer(size_t capacity);
-	
-	~MidiBuffer();
-
-	// FIXME: clear events starting at offset in time
-	void silence(jack_nframes_t len, jack_nframes_t offset=0) { assert(offset == 0); _size = 0; }
-	
-	void read_from(const Buffer& src, jack_nframes_t nframes, jack_nframes_t offset);
-
-	void set_size(size_t size) { _size = size; }
-
-	const RawMidi* data() const { return _data; }
-	RawMidi*       data()       { return _data; }
-
-private:
-	// These are undefined (prevent copies)
-	MidiBuffer(const MidiBuffer& copy);            
-	MidiBuffer& operator=(const MidiBuffer& copy);
-
-	bool     _owns_data;
-	RawMidi* _data; ///< Actual buffer contents
-};
-
 } // namespace ARDOUR
 
 #endif // __ardour_buffer_h__