X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fardour%2Fbuffer.h;h=349dfbd4b266ac6897a1b528660f5ec355458bb2;hb=e4d3ebfb666e2c4e9cf134d8f3ed42152da343bf;hp=d6f333a5a127495fc4879f5364ccb78c14fde29b;hpb=6fc1f270137a06115a79c6089004174c5cab5ed7;p=ardour.git

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index d6f333a5a1..349dfbd4b2 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -47,16 +47,9 @@ public:
 	/** Factory function */
 	static Buffer* create(DataType type, size_t capacity);
 
-	/** Maximum capacity of buffer.
-	 * Note in some cases the entire buffer may not contain valid data, use size. */
+	/** Maximum capacity of buffer. */
 	size_t capacity() const { return _capacity; }
 
-	/** Amount of valid data in buffer.  Use this over capacity almost always. */
-	size_t size() const { return _size; }
-
-	/** Return true if the buffer contains no data, false otherwise */
-	virtual bool empty() const { return _size == 0; }
-
 	/** Type of this buffer.
 	 * Based on this you can static cast a Buffer* to the desired type. */
 	DataType type() const { return _type; }
@@ -71,22 +64,21 @@ public:
 	virtual void resize (size_t) = 0;
 
 	/** Clear (eg zero, or empty) buffer */
-	virtual void silence (framecnt_t len, framecnt_t offset = 0) = 0;
+	virtual void silence (samplecnt_t len, samplecnt_t offset = 0) = 0;
 
 	/** Clear the entire buffer */
 	virtual void clear() { silence(_capacity, 0); }
 
-	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;
+	virtual void read_from (const Buffer& src, samplecnt_t len, sampleoffset_t dst_offset = 0, sampleoffset_t src_offset = 0) = 0;
+	virtual void merge_from (const Buffer& src, samplecnt_t len, sampleoffset_t dst_offset = 0, sampleoffset_t src_offset = 0) = 0;
 
   protected:
 	Buffer(DataType type)
-		: _type(type), _capacity(0), _size(0), _silent (true)
+		: _type(type), _capacity(0), _silent (true)
 	{}
 
 	DataType  _type;
 	pframes_t _capacity;
-	pframes_t _size;
 	bool      _silent;
 };