Add history_suffix to ardour/filename_extensions.cc

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

diff --git a/libs/ardour/buffer.cc b/libs/ardour/buffer.cc
index fa4669cef6d4d02c1006237aa4e9131f3a4b7b6f..8abe238a4752c98d428de8321b5ec8dca525d672 100644 (file)
--- a/libs/ardour/buffer.cc
+++ b/libs/ardour/buffer.cc
@@ -17,7 +17,14 @@
 */
 
 #include <ardour/buffer.h>
-#include <iostream>
+#include <ardour/audio_buffer.h>
+#include <ardour/midi_buffer.h>
+
+#ifdef __x86_64__
+static const int CPU_CACHE_ALIGN = 64;
+#else
+static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */
+#endif
 
 namespace ARDOUR {
 
@@ -34,77 +41,5 @@ Buffer::create(DataType type, size_t capacity)
 }
 
 
-AudioBuffer::AudioBuffer(size_t capacity)
-       : Buffer(DataType::AUDIO, capacity)
-       , _data(NULL)
-{
-       _size = capacity; // For audio buffers, size = capacity (always)
-       if (capacity > 0) {
-#ifdef NO_POSIX_MEMALIGN
-               _data =  (Sample *) malloc(sizeof(Sample) * capacity);
-#else
-               posix_memalign((void**)&_data, 16, sizeof(Sample) * capacity);
-#endif 
-               assert(_data);
-               clear();
-               _owns_data = true;
-       } else {
-               _owns_data = false;
-       }
-}
-
-AudioBuffer::~AudioBuffer()
-{
-       if (_owns_data)
-               free(_data);
-}
-
-// FIXME: mirroring for MIDI buffers?
-MidiBuffer::MidiBuffer(size_t capacity)
-       : Buffer(DataType::MIDI, capacity)
-       , _owns_data(true)
-       , _data(NULL)
-{
-       assert(capacity > 0);
-
-       _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);
-}
-
-MidiBuffer::~MidiBuffer()
-{
-       if (_owns_data)
-               free(_data);
-}
-
-
-/** Note that offset and nframes refer to sample time, not actual buffer locations */
-void
-MidiBuffer::read_from(const Buffer& src, jack_nframes_t nframes, jack_nframes_t offset)
-{
-       // FIXME: offsets?  param semantics?
-       assert(src.type() == _type);
-       assert(src.type() == DataType::MIDI);
-       assert(offset == 0);
-       MidiBuffer& msrc = (MidiBuffer&)src;
-       _size = 0;
-       for (size_t i=0; i < msrc.size() && msrc.data()[i].time < nframes; ++i) {
-               assert(i < _capacity);
-               _data[i] = msrc.data()[i];
-               ++_size;
-       }
-       assert(_size == msrc.size());
-
-       //if (_size > 0)
-       //      std::cerr << "MidiBuffer wrote " << _size << " events.\n";
-}
-
-
 } // namespace ARDOUR