summaryrefslogtreecommitdiffstats
path: root/src/server/AudioBuffer.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-23 18:57:14 +0000
committerDavid Robillard <d@drobilla.net>2012-05-23 18:57:14 +0000
commited081d30c860eb8ad3e9d9ec6136422dc2e2d9d0 (patch)
tree600beb40780b0aae88fedcc8740276169823e1f4 /src/server/AudioBuffer.hpp
parent77cfdf0f5086e26c7811330c6b44ca02eb3337dd (diff)
downloadingen-ed081d30c860eb8ad3e9d9ec6136422dc2e2d9d0.tar.gz
ingen-ed081d30c860eb8ad3e9d9ec6136422dc2e2d9d0.tar.bz2
ingen-ed081d30c860eb8ad3e9d9ec6136422dc2e2d9d0.zip
Move mixing stuff to mix.cpp.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4452 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/AudioBuffer.hpp')
-rw-r--r--src/server/AudioBuffer.hpp29
1 files changed, 0 insertions, 29 deletions
diff --git a/src/server/AudioBuffer.hpp b/src/server/AudioBuffer.hpp
index b4d023c9..4836b05b 100644
--- a/src/server/AudioBuffer.hpp
+++ b/src/server/AudioBuffer.hpp
@@ -44,7 +44,6 @@ public:
void set_block(Sample val, size_t start_offset, size_t end_offset);
void copy(const Sample* src, size_t start_sample, size_t end_sample);
void copy(Context& context, const Buffer* src);
- void accumulate(Context& context, const AudioBuffer* src);
float peak(Context& context) const;
@@ -80,34 +79,6 @@ private:
FrameTime _set_time; ///< Time _set_value was set (to reset next cycle)
};
-/** Accumulate a block of @a src into buffer.
- */
-inline void
-AudioBuffer::accumulate(Context& context, const AudioBuffer* const src)
-{
- Sample* const buf = data();
- const Sample* const src_buf = src->data();
-
- if (is_control()) {
- if (src->is_control()) { // control => control
- buf[0] += src_buf[0];
- } else { // audio => control
- buf[0] += src_buf[context.offset()];
- }
- } else {
- const SampleCount end = context.offset() + context.nframes();
- if (src->is_control()) { // control => audio
- for (SampleCount i = context.offset(); i < end; ++i) {
- buf[i] += src_buf[0];
- }
- } else { // audio => audio
- for (SampleCount i = context.offset(); i < end; ++i) {
- buf[i] += src_buf[i];
- }
- }
- }
-}
-
} // namespace Server
} // namespace Ingen