675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <ardour/audio_buffer.h>
+#include <errno.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 "ardour/audio_buffer.h"
+#include "pbd/error.h"
+#include "pbd/malign.h"
-namespace ARDOUR {
+#include "i18n.h"
+using namespace PBD;
+using namespace ARDOUR;
AudioBuffer::AudioBuffer(size_t capacity)
: Buffer(DataType::AUDIO, capacity)
, _owns_data (false)
, _data (0)
{
- if (_capacity) {
+ if (_capacity > 0) {
_owns_data = true; // prevent resize() from gagging
resize (_capacity);
+ _silent = false; // force silence on the intial buffer state
silence (_capacity);
}
}
void
AudioBuffer::resize (size_t size)
{
- if (!_owns_data || (size < _capacity)) {
+ if (!_owns_data) {
+ return;
+ }
+
+ if (size < _capacity) {
+ _size = size;
return;
}
_size = size;
_silent = false;
-#ifdef NO_POSIX_MEMALIGN
- _data = (Sample *) malloc(sizeof(Sample) * _capacity);
-#else
- posix_memalign((void**)&_data, CPU_CACHE_ALIGN, sizeof(Sample) * _capacity);
-#endif
-
- _owns_data = true;
+ cache_aligned_malloc ((void**) &_data, sizeof (Sample) * _capacity);
}
-} // namespace ARDOUR