remove offset from process callback tree. some breakage may have occured. yes, really.

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

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index 915fdeb948adc75ec1d988ca2638cd59891dc962..c5717f05282d5d13dd7b4d9190d65bc442d8f603 100644 (file)
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -16,22 +16,16 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <ardour/audio_buffer.h>
-#include <pbd/error.h>
 #include <errno.h>
 
-#include "i18n.h"
+#include "ardour/audio_buffer.h"
+#include "pbd/error.h"
+#include "pbd/malign.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
+#include "i18n.h"
 
 using namespace PBD;
-
-namespace ARDOUR {
-
+using namespace ARDOUR;
 
 AudioBuffer::AudioBuffer(size_t capacity)
        : Buffer(DataType::AUDIO, capacity)
@@ -41,6 +35,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);
        }
 }
@@ -54,7 +49,12 @@ AudioBuffer::~AudioBuffer()
 void
 AudioBuffer::resize (size_t size)
 {
-       if (!_owns_data || (size < _capacity)) {
+       if (!_owns_data) {
+               return;
+       }
+
+       if (size < _capacity) {
+               _size = size;
                return;
        }
 
@@ -66,17 +66,7 @@ AudioBuffer::resize (size_t size)
        _size = size;
        _silent = false;
 
-#ifdef NO_POSIX_MEMALIGN
-       _data =  (Sample *) malloc(sizeof(Sample) * _capacity);
-#else
-       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;
+       cache_aligned_malloc ((void**) &_data, sizeof (Sample) * _capacity);
 }
 
-} // namespace ARDOUR