Respond to MMC even when synced to JACK. Fixes #3700.

[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 ca1b36e0b133d18667fef0175691a3af18a8c0a5..6c5a0a0832b2fe2e6aa7b3583691ec787e224da5 100644 (file)
--- a/libs/ardour/ardour/audio_buffer.h
+++ b/libs/ardour/ardour/audio_buffer.h
@@ -1,16 +1,16 @@
 /*
-    Copyright (C) 2006 Paul Davis 
-    
+    Copyright (C) 2006 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.
@@ -30,7 +30,7 @@ public:
        AudioBuffer(size_t capacity);
        ~AudioBuffer();
 
-       void silence (nframes_t len, nframes_t offset = 0) {
+       void silence (framecnt_t len, framecnt_t offset = 0) {
                if (!_silent) {
                        assert(_capacity > 0);
                        assert(offset + len <= _capacity);
@@ -41,9 +41,9 @@ public:
                }
                _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, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) {
+       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);
@@ -56,9 +56,16 @@ public:
                }
                _written = true;
        }
-       
+
        /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/
-       void accumulate_from (const AudioBuffer& src, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) {
+       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*/
+       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);
 
@@ -70,10 +77,10 @@ public:
                _silent = (src.silent() && _silent);
                _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, nframes_t len, gain_t gain_coeff, nframes_t dst_offset = 0, nframes_t src_offset = 0) {
+       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) {
 
                assert(_capacity > 0);
                assert(len <= _capacity);
@@ -93,7 +100,7 @@ public:
 
        /** Accumulate (add) @a len frames FROM THE START OF @a src into self
         * scaling by @a gain_coeff */
-       void accumulate_with_gain_from (const Sample* src_raw, nframes_t len, gain_t gain_coeff, nframes_t dst_offset = 0) {
+       void accumulate_with_gain_from (const Sample* src_raw, framecnt_t len, gain_t gain_coeff, framecnt_t dst_offset = 0) {
 
                assert(_capacity > 0);
                assert(len <= _capacity);
@@ -105,13 +112,13 @@ public:
                _silent = (_silent && gain_coeff == 0);
                _written = true;
        }
-       
-       void apply_gain (gain_t gain, nframes_t len) {
+
+       void apply_gain (gain_t gain, framecnt_t len) {
                apply_gain_to_buffer (_data, len, gain);
        }
 
        /** Set the data contained by this buffer manually (for setting directly to jack buffer).
-        * 
+        *
         * Constructor MUST have been passed capacity=0 or this will die (to prevent mem leaks).
         */
        void set_data (Sample* data, size_t size) {
@@ -124,20 +131,20 @@ public:
        }
 
        /** Reallocate the buffer used internally to handle at least @nframes of data
-        * 
+        *
         * Constructor MUST have been passed capacity!=0 or this will die (to prevent mem leaks).
         */
        void resize (size_t nframes);
 
 
-       const Sample* data (nframes_t offset = 0) const { 
-               assert(offset <= _capacity); 
-               return _data + offset; 
+       const Sample* data (framecnt_t offset = 0) const {
+               assert(offset <= _capacity);
+               return _data + offset;
        }
 
-       Sample* data (nframes_t offset = 0) { 
-               assert(offset <= _capacity); 
-               return _data + offset; 
+       Sample* data (framecnt_t offset = 0) {
+               assert(offset <= _capacity);
+               return _data + offset;
        }
 
        void prepare () { _written = false; }
@@ -147,7 +154,7 @@ public:
        bool    _owns_data;
        bool    _written;
        Sample* _data; ///< Actual buffer contents
-       
+
 };