X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbuffer.h;h=8293a22beb5dc475621c6095d3d970a735143558;hb=e973e39f06c81fc301c8b059c5240cc17c6671ad;hp=8a88802ecb1c25b88bf92dca9bf3ea6c25edfaf6;hpb=959438031cf5fe15fef1145c6e5970fdba4e2f35;p=ardour.git

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index 8a88802ecb..8293a22beb 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -1,16 +1,16 @@
 /*
-    Copyright (C) 2006 Paul Davis 
-    
+    Copyright (C) 2006 Paul Davis
+
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
     Software Foundation; either version 2 of the License, or (at your option)
     any later version.
-    
+
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
     for more details.
-    
+
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     675 Mass Ave, Cambridge, MA 02139, USA.
@@ -19,17 +19,15 @@
 #ifndef __ardour_buffer_h__
 #define __ardour_buffer_h__
 
-#define _XOPEN_SOURCE 600
-#include <cstdlib> // for posix_memalign
-#include <cassert>
-#include <ardour/types.h>
-#include <ardour/data_type.h>
+#include <stddef.h>
 
-namespace ARDOUR {
+#include <boost/utility.hpp>
 
+#include "ardour/libardour_visibility.h"
+#include "ardour/types.h"
+#include "ardour/data_type.h"
 
-/* Yes, this is a bit of a mess right now.  I'll clean it up when everything
- * using it works out.. */
+namespace ARDOUR {
 
 
 /** A buffer of recordable/playable data.
@@ -38,66 +36,50 @@ namespace ARDOUR {
  * methods to actually access the data).  This provides a way for code that
  * doesn't care about the data type to still deal with buffers (which is
  * why the base class can't be a template).
- * 
+ *
  * To actually read/write buffer contents, use the appropriate derived class.
  */
-class Buffer
+class LIBARDOUR_API Buffer : public boost::noncopyable
 {
 public:
-	Buffer(DataType type, size_t capacity)
-	: _type(type), _capacity(capacity), _size(0) 
-	{}
-
 	virtual ~Buffer() {}
 
-	/** Maximum capacity of buffer.
-	 * Note in some cases the entire buffer may not contain valid data, use size. */
-	size_t capacity() const { return _capacity; }
+	/** Factory function */
+	static Buffer* create(DataType type, size_t capacity);
 
-	/** Amount of valid data in buffer.  Use this over capacity almost always. */
-	size_t size() const { return _size; }
+	/** Maximum capacity of buffer. */
+	size_t capacity() const { return _capacity; }
 
 	/** Type of this buffer.
 	 * Based on this you can static cast a Buffer* to the desired type. */
 	DataType type() const { return _type; }
 
-protected:
-	DataType _type;
-	size_t   _capacity;
-	size_t   _size;
-};
+	bool silent() const { return _silent; }
 
+	/** Reallocate the buffer used internally to handle at least @a size_t units of data.
+	 *
+	 * The buffer is not silent after this operation. the @a capacity argument
+	 * passed to the constructor must have been non-zero.
+	 */
+	virtual void resize (size_t) = 0;
 
-/* Inside every class with a type in it's name is a template waiting to get out... */
+	/** Clear (eg zero, or empty) buffer */
+	virtual void silence (framecnt_t len, framecnt_t offset = 0) = 0;
 
+	/** Clear the entire buffer */
+	virtual void clear() { silence(_capacity, 0); }
 
-/** Buffer containing 32-bit floating point (audio) data. */
-class AudioBuffer : public Buffer
-{
-public:
-	AudioBuffer(size_t capacity)
-		: Buffer(DataType::AUDIO, capacity)
-		, _data(NULL)
-	{
-		_size = capacity; // For audio buffers, size = capacity (always)
-#ifdef NO_POSIX_MEMALIGN
-		_data =  (Sample *) malloc(sizeof(Sample) * capacity);
-#else
-		posix_memalign((void**)_data, 16, sizeof(Sample) * capacity);
-#endif	
-		assert(_data);
-		memset(_data, 0, sizeof(Sample) * capacity);
-	}
-
-	const Sample* data() const { return _data; }
-	Sample*       data()       { return _data; }
-
-private:
-	// These are undefined (prevent copies)
-	AudioBuffer(const AudioBuffer& copy);            
-	AudioBuffer& operator=(const AudioBuffer& copy);
-
-	Sample* _data; ///< Actual buffer contents
+	virtual void read_from (const Buffer& src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) = 0;
+	virtual void merge_from (const Buffer& src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) = 0;
+
+  protected:
+	Buffer(DataType type)
+		: _type(type), _capacity(0), _silent (true)
+	{}
+
+	DataType  _type;
+	pframes_t _capacity;
+	bool      _silent;
 };