Merge branch 'master' into saveas

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

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index a36ad81c2ae118d39195a9e874e92e6eb1b38f67..de2c1ddf00b916701e889e9bae3f96ded2e9d807 100644 (file)
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -57,12 +57,6 @@ AudioBuffer::resize (size_t size)
 
        if (_data && size < _capacity) {
                /* buffer is already large enough */
-               
-               if (size < _size) {
-                       /* truncate */
-                       _size = size;
-               }
-
                return;
        }
 
@@ -71,17 +65,30 @@ AudioBuffer::resize (size_t size)
        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;
+}