X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbuffer.h;h=7d6fa75620138bd36234b4a71a4a9c18616bbf5e;hb=a4a87f56e9dc8e2351101439aeea7a87064fa146;hp=d6f333a5a127495fc4879f5364ccb78c14fde29b;hpb=d15fda6d751a465d278f477923075d4783f3b1ca;p=ardour.git

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index d6f333a5a1..7d6fa75620 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; }
@@ -76,17 +69,16 @@ public:
 	/** 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, framecnt_t len, frameoffset_t dst_offset = 0, frameoffset_t src_offset = 0) = 0;
+	virtual void merge_from (const Buffer& src, framecnt_t len, frameoffset_t dst_offset = 0, frameoffset_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;
 };