change input/output button context menus for mixer strip to be non-additive: when...

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

diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h
index 403a70232fe61bbf9945a3dea3d78ec3dd8f0f89..5c04a7f43a321276079f63237315b8b8d30501d7 100644 (file)
--- a/libs/ardour/ardour/audio_buffer.h
+++ b/libs/ardour/ardour/audio_buffer.h
@@ -20,10 +20,13 @@
 #define __ardour_audio_buffer_h__
 
 #include <cstring>
+
 #include "ardour/buffer.h"
+#include "ardour/runtime_functions.h"
 
 namespace ARDOUR {
 
+/** Buffer containing audio data. */
 class AudioBuffer : public Buffer
 {
 public:
@@ -48,7 +51,8 @@ public:
                assert(_capacity > 0);
                assert(src.type() == DataType::AUDIO);
                assert(len <= _capacity);
-               memcpy(_data + dst_offset, ((AudioBuffer&)src).data() + src_offset, sizeof(Sample) * len);
+               assert( src_offset <= ((framecnt_t) src.capacity()-len));
+               memcpy(_data + dst_offset, ((const AudioBuffer&)src).data() + src_offset, sizeof(Sample) * len);
                if (dst_offset == 0 && src_offset == 0 && len == _capacity) {
                        _silent = src.silent();
                } else {
@@ -57,14 +61,14 @@ public:
                _written = true;
        }
 
-       /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/
+       /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @a dst_offset */
        void merge_from (const Buffer& src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
                const AudioBuffer* ab = dynamic_cast<const AudioBuffer*>(&src);
                assert (ab);
                accumulate_from (*ab, len, dst_offset, src_offset);
        }
 
-       /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/
+       /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @a dst_offset */
        void accumulate_from (const AudioBuffer& src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
                assert(_capacity > 0);
                assert(len <= _capacity);
@@ -78,7 +82,7 @@ public:
                _written = true;
        }
 
-       /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @ dst_offset
+       /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @dst_offset
         * scaling by @a gain_coeff */
        void accumulate_with_gain_from (const AudioBuffer& src, framecnt_t len, gain_t gain_coeff, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
 
@@ -121,12 +125,12 @@ public:
                assert(len <= _capacity);
 
                Sample* dst = _data + dst_offset;
-                gain_t  gain_delta = (target - initial)/len;
+               gain_t  gain_delta = (target - initial)/len;
 
-                for (framecnt_t n = 0; n < len; ++n) {
-                        *dst++ += (*src++ * initial);
-                        initial += gain_delta;
-                }
+               for (framecnt_t n = 0; n < len; ++n) {
+                       *dst++ += (*src++ * initial);
+                       initial += gain_delta;
+               }
 
                _silent = (_silent && initial == 0 && target == 0);
                _written = true;
@@ -155,6 +159,7 @@ public:
         */
        void resize (size_t nframes);
 
+       bool empty() const { return _size == 0; }
 
        const Sample* data (framecnt_t offset = 0) const {
                assert(offset <= _capacity);
@@ -166,14 +171,14 @@ public:
                return _data + offset;
        }
 
-       void prepare () { _written = false; }
+       void prepare () { _written = false; _silent = false; }
        bool written() const { return _written; }
+       void set_written(bool w) { _written = w; }
 
   private:
        bool    _owns_data;
        bool    _written;
        Sample* _data; ///< Actual buffer contents
-
 };