fix up wscript/build issues in exportvis after merge with master

[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 10f5f27ec31670095df7868a1d8dcbd2bc9527da..5f72065d63cefd10faa5df3db87749869026dcac 100644 (file)
--- a/libs/ardour/ardour/audio_buffer.h
+++ b/libs/ardour/ardour/audio_buffer.h
@@ -20,11 +20,14 @@
 #define __ardour_audio_buffer_h__
 
 #include <cstring>
+
 #include "ardour/buffer.h"
+#include "ardour/runtime_functions.h"
 
 namespace ARDOUR {
 
-class AudioBuffer : public Buffer
+/** Buffer containing audio data. */
+class LIBARDOUR_API AudioBuffer : public Buffer
 {
 public:
        AudioBuffer(size_t capacity);
@@ -42,13 +45,36 @@ public:
                _written = true;
        }
 
+       /** Read @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/
+       void read_from (const Sample* src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
+               assert(src != 0);
+               assert(_capacity > 0);
+               assert(len <= _capacity);
+               memcpy(_data + dst_offset, src + src_offset, sizeof(Sample) * len);
+               _silent = false;
+               _written = true;
+       }
+
+        void read_from_with_gain (const Sample* src, framecnt_t len, gain_t gain, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
+               assert(src != 0);
+               assert(_capacity > 0);
+               assert(len <= _capacity);
+               src += src_offset;
+               for (framecnt_t n = 0; n < len; ++n) {
+                       _data[dst_offset+n] = src[n] * gain;
+               }
+               _silent = false;
+               _written = true;
+       }
+
        /** Read @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/
        void read_from (const Buffer& src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
                assert(&src != this);
                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 +83,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 +104,21 @@ 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 accumulate_from (const Sample* src, framecnt_t len, framecnt_t dst_offset = 0, framecnt_t src_offset = 0) {
+               assert(_capacity > 0);
+               assert(len <= _capacity);
+
+               Sample*       const dst_raw = _data + dst_offset;
+               const Sample* const src_raw = src + src_offset;
+
+               mix_buffers_no_gain(dst_raw, src_raw, len);
+               
+               _silent = false;
+               _written = true;
+       }
+
+       /** 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 +161,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 +195,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,8 +207,11 @@ public:
                return _data + offset;
        }
 
+        bool check_silence (pframes_t, pframes_t&) const;
+
        void prepare () { _written = false; _silent = false; }
        bool written() const { return _written; }
+       void set_written(bool w) { _written = w; }
 
   private:
        bool    _owns_data;