enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

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

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index a36ad81c2ae118d39195a9e874e92e6eb1b38f67..89e210c7728a7c323e8bc3940264a71fcae6c2fd 100644 (file)
--- 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,31 +57,38 @@ 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, pframes_t& n) const
 {
-       for (n = 0; n < _size && n < nframes; ++n) {
+       for (n = 0; n < nframes; ++n) {
                if (_data[n] != Sample (0)) {
                        return false;
                }
        }
        return true;
 }
+
+void
+AudioBuffer::silence (framecnt_t len, framecnt_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;
+}