Merge branch 'master' into cairocanvas

[ardour.git] / libs / ardour / ardour / buffer.h

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index 15e97ccc104a86027faeaa57595855a6c1f75d1f..d6f333a5a127495fc4879f5364ccb78c14fde29b 100644 (file)
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -19,15 +19,13 @@
 #ifndef __ardour_buffer_h__
 #define __ardour_buffer_h__
 
-#include <cstdlib>
-#include <cassert>
-#include <cstring>
-#include <iostream>
+#include <stddef.h>
+
 #include <boost/utility.hpp>
 
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/data_type.h"
-#include "ardour/runtime_functions.h"
 
 namespace ARDOUR {
 
@@ -41,7 +39,7 @@ namespace ARDOUR {
  *
  * To actually read/write buffer contents, use the appropriate derived class.
  */
-class Buffer : public boost::noncopyable
+class LIBARDOUR_API Buffer : public boost::noncopyable
 {
 public:
        virtual ~Buffer() {}
@@ -64,7 +62,6 @@ public:
        DataType type() const { return _type; }
 
        bool silent() const { return _silent; }
-       void is_silent(bool yn) { _silent = yn; }
 
        /** Reallocate the buffer used internally to handle at least @a size_t units of data.
         *
@@ -83,8 +80,8 @@ public:
        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, size_t capacity)
-               : _type(type), _capacity(capacity), _size(0), _silent(true)
+       Buffer(DataType type)
+               : _type(type), _capacity(0), _size(0), _silent (true)
        {}
 
        DataType  _type;