Selection of visible note range (full range vs fit contents, selectable from midi...

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

diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index 1321f6c1072fa7b8d68f51d1086408f9a1a9da8b..18c83f8bfb6e3fafca80650781faee2eace23747 100644 (file)
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -19,19 +19,17 @@
 #ifndef __ardour_buffer_h__
 #define __ardour_buffer_h__
 
-#define _XOPEN_SOURCE 600
-#include <cstdlib> // for posix_memalign
+#include <cstdlib>
 #include <cassert>
+#include <iostream>
+#include <boost/utility.hpp>
 #include <ardour/types.h>
 #include <ardour/data_type.h>
+#include <ardour/runtime_functions.h>
 
 namespace ARDOUR {
 
 
-/* Yes, this is a bit of a mess right now.  I'll clean it up when everything
- * using it works out.. */
-
-
 /** A buffer of recordable/playable data.
  *
  * This is a datatype-agnostic base class for all buffers (there are no
@@ -41,15 +39,14 @@ namespace ARDOUR {
  * 
  * To actually read/write buffer contents, use the appropriate derived class.
  */
-class Buffer
+class Buffer : public boost::noncopyable
 {
 public:
-       Buffer(DataType type, size_t capacity)
-       : _type(type), _capacity(capacity), _size(0) 
-       {}
-
        virtual ~Buffer() {}
 
+       /** 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. */
        size_t capacity() const { return _capacity; }
@@ -61,74 +58,25 @@ public:
         * 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; }
 
-/* Inside every class with a type in it's name is a template waiting to get out... */
-
-
-/** 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
-};
+       /** Clear (eg zero, or empty) buffer starting at TIME @a offset */
+       virtual void silence(nframes_t len, nframes_t offset=0) = 0;
+       
+       /** Clear the entire buffer */
+       virtual void clear() { silence(_capacity, 0); }
 
+       virtual void read_from(const Buffer& src, nframes_t offset, nframes_t len) = 0;
 
+protected:
+       Buffer(DataType type, size_t capacity)
+       : _type(type), _capacity(capacity), _size(0), _silent(true)
+       {}
 
-/** Buffer containing 8-bit unsigned char (MIDI) data. */
-class MidiBuffer : public Buffer
-{
-public:
-       MidiBuffer(size_t capacity)
-               : Buffer(DataType::MIDI, capacity)
-               , _data(NULL)
-       {
-               _size = capacity; // For audio buffers, size = capacity (always)
-#ifdef NO_POSIX_MEMALIGN
-               _data =  (RawMidi *) malloc(sizeof(RawMidi) * capacity);
-#else
-               posix_memalign((void**)_data, 16, sizeof(RawMidi) * capacity);
-#endif 
-               assert(_data);
-               memset(_data, 0, sizeof(RawMidi) * capacity);
-       }
-
-       const RawMidi* data() const { return _data; }
-       RawMidi*       data()       { return _data; }
-
-private:
-       // These are undefined (prevent copies)
-       MidiBuffer(const MidiBuffer& copy);            
-       MidiBuffer& operator=(const MidiBuffer& copy);
-
-       RawMidi* _data; ///< Actual buffer contents
+       DataType _type;
+       size_t   _capacity;
+       size_t   _size;
+       bool     _silent;
 };