X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_buffer.cc;h=247b4cfebb3f72499cd42645ea6c30fab47b2981;hb=84272b4e27e537bf2c38c9cd25675c61addea40a;hp=aa4f64755aeb9399d31e402b8703eae2dd1a4d1d;hpb=6fc1f270137a06115a79c6089004174c5cab5ed7;p=ardour.git

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index aa4f64755a..247b4cfebb 100644
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -22,7 +22,7 @@
 #include "pbd/error.h"
 #include "pbd/malign.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -43,7 +43,7 @@ AudioBuffer::AudioBuffer(size_t capacity)
 AudioBuffer::~AudioBuffer()
 {
 	if (_owns_data)
-		free(_data);
+		cache_aligned_free(_data);
 }
 
 void
@@ -57,28 +57,21 @@ AudioBuffer::resize (size_t size)
 
 	if (_data && size < _capacity) {
 		/* buffer is already large enough */
-		
-		if (size < _size) {
-			/* truncate */
-			_size = size;
-		}
-
 		return;
 	}
 
-	free (_data);
+	cache_aligned_free (_data);
 
 	cache_aligned_malloc ((void**) &_data, sizeof (Sample) * size);
 
 	_capacity = size;
-	_size = 0;
 	_silent = false;
 }
 
 bool
-AudioBuffer::check_silence (pframes_t nframes, bool wholebuffer, pframes_t& n) const
+AudioBuffer::check_silence (pframes_t nframes, pframes_t& n) const
 {
-	for (n = 0; (wholebuffer || n < _size) &&  n < nframes; ++n) {
+	for (n = 0; n < nframes; ++n) {
 		if (_data[n] != Sample (0)) {
 			return false;
 		}
@@ -87,7 +80,7 @@ AudioBuffer::check_silence (pframes_t nframes, bool wholebuffer, pframes_t& n) c
 }
 
 void
-AudioBuffer::silence (framecnt_t len, framecnt_t offset) {
+AudioBuffer::silence (samplecnt_t len, samplecnt_t offset) {
 
 	if (!_silent) {
 		assert(_capacity > 0);