Initialize uninitialized variable

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

diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc
index a57891a27d7c0a04c699adf7cb849ab89a688cd4..afc1e14ccad7d95c1b329286da352f9bcb88004d 100644 (file)
--- a/libs/ardour/audio_buffer.cc
+++ b/libs/ardour/audio_buffer.cc
@@ -1,20 +1,22 @@
 /*
-    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.
-*/
+ * Copyright (C) 2007-2010 David Robillard <d@drobilla.net>
+ * Copyright (C) 2007-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2013-2014 Robin Gareus <robin@gareus.org>
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <errno.h>
 
@@ -22,51 +24,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;
+}