Fixes to bundle manager to make it vaguely usable.

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

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index 8444304832384e2a7df76d2f0532c66d6c78063f..506b34eb04d8202378866f85cde01279c6fea1e4 100644 (file)
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -17,6 +17,10 @@
 */
 
 #include <ardour/audio_buffer.h>
+#include <pbd/error.h>
+#include <errno.h>
+
+#include "i18n.h"
 
 #ifdef __x86_64__
 static const int CPU_CACHE_ALIGN = 64;
@@ -24,8 +28,8 @@ static const int CPU_CACHE_ALIGN = 64;
 static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */
 #endif
 
-namespace ARDOUR {
-
+using namespace PBD;
+using namespace ARDOUR;
 
 AudioBuffer::AudioBuffer(size_t capacity)
        : Buffer(DataType::AUDIO, capacity)
@@ -35,6 +39,7 @@ AudioBuffer::AudioBuffer(size_t capacity)
        if (_capacity > 0) {
                _owns_data = true; // prevent resize() from gagging
                resize (_capacity);
+               _silent = false; // force silence on the intial buffer state
                silence (_capacity);
        }
 }
@@ -45,10 +50,28 @@ AudioBuffer::~AudioBuffer()
                free(_data);
 }
 
+/* called to replace a pointer to an external buffer (e.g. JACK) with 
+   buffer-owned memory.
+*/
+
+void
+AudioBuffer::replace_data (size_t capacity)
+{
+       _owns_data = true;
+       _data = 0;
+       _capacity = 0; // force reallocation
+       resize (capacity);
+}
+
 void
 AudioBuffer::resize (size_t size)
 {
-       if (!_owns_data || (size < _capacity)) {
+       if (!_owns_data) {
+               return;
+       }
+
+       if (size < _capacity) {
+               _size = size;
                return;
        }
 
@@ -63,11 +86,17 @@ AudioBuffer::resize (size_t size)
 #ifdef NO_POSIX_MEMALIGN
        _data =  (Sample *) malloc(sizeof(Sample) * _capacity);
 #else
-       posix_memalign((void**)&_data, CPU_CACHE_ALIGN, sizeof(Sample) * _capacity);
+       if (posix_memalign((void**)&_data, CPU_CACHE_ALIGN, sizeof(Sample) * _capacity)) {
+               fatal << string_compose (_("Memory allocation error: posix_memalign (%1 * %2) failed (%3)"),
+                               CPU_CACHE_ALIGN, sizeof (Sample) * _capacity, strerror (errno)) << endmsg;
+       }
 #endif 
-       
-       _owns_data = true;
+
 }
 
-} // namespace ARDOUR
+void
+AudioBuffer::copy_to_internal (Sample* p, nframes_t cnt, nframes_t offset)
+{
+       memcpy (_data + offset, p, sizeof(Sample*) * cnt);
+}