projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tempo ramps - new (old) map solving strategy.
[ardour.git]
/
libs
/
ardour
/
ardour
/
buffer.h
diff --git
a/libs/ardour/ardour/buffer.h
b/libs/ardour/ardour/buffer.h
index 15e97ccc104a86027faeaa57595855a6c1f75d1f..8293a22beb5dc475621c6095d3d970a735143558 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__
#ifndef __ardour_buffer_h__
#define __ardour_buffer_h__
-#include <cstdlib>
-#include <cassert>
-#include <cstring>
-#include <iostream>
+#include <stddef.h>
+
#include <boost/utility.hpp>
#include <boost/utility.hpp>
+#include "ardour/libardour_visibility.h"
#include "ardour/types.h"
#include "ardour/data_type.h"
#include "ardour/types.h"
#include "ardour/data_type.h"
-#include "ardour/runtime_functions.h"
namespace ARDOUR {
namespace ARDOUR {
@@
-41,7
+39,7
@@
namespace ARDOUR {
*
* To actually read/write buffer contents, use the appropriate derived class.
*/
*
* 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() {}
{
public:
virtual ~Buffer() {}
@@
-49,22
+47,14
@@
public:
/** Factory function */
static Buffer* create(DataType type, size_t capacity);
/** 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; }
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; }
bool silent() const { return _silent; }
/** Type of this buffer.
* Based on this you can static cast a Buffer* to the desired type. */
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.
*
/** Reallocate the buffer used internally to handle at least @a size_t units of data.
*
@@
-83,13
+73,12
@@
public:
virtual void merge_from (const Buffer& src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) = 0;
protected:
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), _silent
(true)
{}
DataType _type;
pframes_t _capacity;
{}
DataType _type;
pframes_t _capacity;
- pframes_t _size;
bool _silent;
};
bool _silent;
};