X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_buffer.cc;h=247b4cfebb3f72499cd42645ea6c30fab47b2981;hb=dec10f2f3c6fffe27e72243d9bf36713d8f084f9;hp=c5717f05282d5d13dd7b4d9190d65bc442d8f603;hpb=28368793415ba934132994d8c10a5e149c1a8d9d;p=ardour.git

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index c5717f0528..247b4cfebb 100644
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -1,16 +1,16 @@
 /*
-    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.
@@ -22,51 +22,73 @@
 #include "pbd/error.h"
 #include "pbd/malign.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;
 
 AudioBuffer::AudioBuffer(size_t capacity)
-	: Buffer(DataType::AUDIO, capacity)
+	: Buffer (DataType::AUDIO)
 	, _owns_data (false)
 	, _data (0)
 {
-	if (_capacity > 0) {
+	if (capacity) {
 		_owns_data = true; // prevent resize() from gagging
-		resize (_capacity);
+		resize (capacity);
 		_silent = false; // force silence on the intial buffer state
-		silence (_capacity);
+		clear ();
 	}
 }
 
 AudioBuffer::~AudioBuffer()
 {
 	if (_owns_data)
-		free(_data);
+		cache_aligned_free(_data);
 }
 
 void
 AudioBuffer::resize (size_t size)
 {
 	if (!_owns_data) {
+		/* XXX how the hell is this enforced? */
+		_capacity = size;
 		return;
 	}
 
-	if (size < _capacity) {
-		_size = size;
+	if (_data && size < _capacity) {
+		/* buffer is already large enough */
 		return;
 	}
 
-	if (_data) {
-		free (_data);
-	}
+	cache_aligned_free (_data);
+
+	cache_aligned_malloc ((void**) &_data, sizeof (Sample) * size);
 
 	_capacity = size;
-	_size = size;
 	_silent = false;
+}
 
-	cache_aligned_malloc ((void**) &_data, sizeof (Sample) * _capacity);
+bool
+AudioBuffer::check_silence (pframes_t nframes, pframes_t& n) const
+{
+	for (n = 0; n < nframes; ++n) {
+		if (_data[n] != Sample (0)) {
+			return false;
+		}
+	}
+	return true;
 }
 
+void
+AudioBuffer::silence (samplecnt_t len, samplecnt_t offset) {
 
+	if (!_silent) {
+		assert(_capacity > 0);
+		assert(offset + len <= _capacity);
+		memset(_data + offset, 0, sizeof (Sample) * len);
+		if (len == _capacity) {
+			_silent = true;
+		}
+	}
+	_written = true;
+}