Add comment and fix type.

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

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index 7a6767dd32a23de957595aa3c6cdc1bea76b142b..8b2d5c744f116310f24d9453ae9da02b2a3f2547 100644 (file)
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -1,33 +1,29 @@
 /*
-    Copyright (C) 2006-2007 Paul Davis 
-    
+    Copyright (C) 2006-2007 Paul Davis
+
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
     Software Foundation; either version 2 of the License, or (at your option)
     any later version.
-    
+
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
     for more details.
-    
+
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     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)
 {
@@ -75,28 +58,13 @@ AudioBuffer::resize (size_t size)
                return;
        }
 
-       if (_data) {
-               free (_data);
-       }
+       free (_data);
 
        _capacity = 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);
-}