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

git-svn-id: svn://localhost/ardour2/branches/3.0@4999 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 34 deletions

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index 7a6767dd32..c5717f0528 100644
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -16,18 +16,14 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <errno.h>
+
 #include "ardour/audio_buffer.h"
 #include "pbd/error.h"
-#include <errno.h>
+#include "pbd/malign.h"
 
 #include "i18n.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
-
 using namespace PBD;
 using namespace ARDOUR;
 
@@ -50,19 +46,6 @@ 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)
 {
@@ -83,20 +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	
-
+	cache_aligned_malloc ((void**) &_data, sizeof (Sample) * _capacity);
 }
 
-void
-AudioBuffer::copy_to_internal (Sample* p, nframes_t cnt, nframes_t offset)
-{
-	memcpy (_data + offset, p, sizeof(Sample*) * cnt);
-}