summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/AudioBuffer.hpp29
-rw-r--r--src/server/mix.cpp114
-rw-r--r--src/server/mix.hpp72
-rw-r--r--src/server/wscript1
4 files changed, 126 insertions, 90 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
diff --git a/src/server/mix.cpp b/src/server/mix.cpp
new file mode 100644
index 00000000..ca2ce42b
--- /dev/null
+++ b/src/server/mix.cpp
@@ -0,0 +1,114 @@
+/*
+ This file is part of Ingen.
+ Copyright 2007-2012 David Robillard <http://drobilla.net/>
+
+ Ingen is free software: you can redistribute it and/or modify it under the
+ terms of the GNU Affero General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or any later version.
+
+ Ingen 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 Affero General Public License for details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with Ingen. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "ingen/shared/URIs.hpp"
+#include "raul/log.hpp"
+
+#include "AudioBuffer.hpp"
+#include "Buffer.hpp"
+#include "Context.hpp"
+
+namespace Ingen {
+namespace Server {
+
+static inline bool
+is_audio(Shared::URIs& uris, LV2_URID type)
+{
+ return type == uris.atom_Float || type == uris.atom_Sound;
+}
+
+static inline void
+audio_accumulate(Context& context, AudioBuffer* dst, const AudioBuffer* src)
+{
+ Sample* const dst_buf = dst->data();
+ const Sample* const src_buf = src->data();
+
+ if (dst->is_control()) {
+ if (src->is_control()) { // control => control
+ dst_buf[0] += src_buf[0];
+ } else { // audio => control
+ dst_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) {
+ dst_buf[i] += src_buf[0];
+ }
+ } else { // audio => audio
+ for (SampleCount i = context.offset(); i < end; ++i) {
+ dst_buf[i] += src_buf[i];
+ }
+ }
+ }
+}
+
+void
+mix(Context& context,
+ Shared::URIs& uris,
+ Buffer* dst,
+ const Buffer*const* srcs,
+ uint32_t num_srcs)
+{
+ if (num_srcs == 1) {
+ dst->copy(context, srcs[0]);
+ } else if (is_audio(uris, dst->type())) {
+ // Copy the first source
+ dst->copy(context, srcs[0]);
+
+ // Mix in the rest
+ for (uint32_t i = 1; i < num_srcs; ++i) {
+ assert(is_audio(uris, srcs[i]->type()));
+ audio_accumulate(context,
+ (AudioBuffer*)dst,
+ (const AudioBuffer*)srcs[i]);
+ }
+ } else {
+ std::cerr << "FIXME: event mix" << std::endl;
+ }
+#if 0
+ case PortType::EVENTS:
+ dst->clear();
+ for (uint32_t i = 0; i < num_srcs; ++i) {
+ assert(srcs[i]->type() == PortType::EVENTS);
+ srcs[i]->rewind();
+ }
+
+ while (true) {
+ const EventBuffer* first = NULL;
+ for (uint32_t i = 0; i < num_srcs; ++i) {
+ const EventBuffer* const src = (const EventBuffer*)srcs[i];
+ if (src->is_valid()) {
+ if (!first || src->get_event()->frames < first->get_event()->frames)
+ first = src;
+ }
+ }
+ if (first) {
+ const LV2_Event* const ev = first->get_event();
+ ((EventBuffer*)dst)->append(
+ ev->frames, ev->subframes, ev->type, ev->size,
+ (const uint8_t*)ev + sizeof(LV2_Event));
+ first->increment();
+ } else {
+ break;
+ }
+ }
+ dst->rewind();
+#endif
+}
+
+} // namespace Server
+} // namespace Ingen
diff --git a/src/server/mix.hpp b/src/server/mix.hpp
index f0a14d79..65dd8de2 100644
--- a/src/server/mix.hpp
+++ b/src/server/mix.hpp
@@ -17,73 +17,23 @@
#ifndef INGEN_ENGINE_MIX_HPP
#define INGEN_ENGINE_MIX_HPP
-#include "ingen/shared/URIs.hpp"
-#include "raul/log.hpp"
-
-#include "AudioBuffer.hpp"
-#include "Buffer.hpp"
-#include "Context.hpp"
+#include <stdint.h>
namespace Ingen {
-namespace Server {
-inline bool
-is_audio(Shared::URIs& uris, LV2_URID type)
-{
- return type == uris.atom_Float || type == uris.atom_Sound;
-}
+namespace Shared { class URIs; }
-inline void
-mix(Context& context,
- Shared::URIs& uris,
- Buffer* dst,
- Buffer** srcs,
- uint32_t num_srcs)
-{
- if (num_srcs == 1) {
- dst->copy(context, srcs[0]);
- } else if (is_audio(uris, dst->type())) {
- // Copy the first source
- dst->copy(context, srcs[0]);
+namespace Server {
- // Mix in the rest
- for (uint32_t i = 1; i < num_srcs; ++i) {
- assert(is_audio(uris, srcs[i]->type()));
- ((AudioBuffer*)dst)->accumulate(context, (AudioBuffer*)srcs[i]);
- }
- } else {
- std::cerr << "FIXME: event mix" << std::endl;
- }
-#if 0
- case PortType::EVENTS:
- dst->clear();
- for (uint32_t i = 0; i < num_srcs; ++i) {
- assert(srcs[i]->type() == PortType::EVENTS);
- srcs[i]->rewind();
- }
+class Context;
+class Buffer;
- while (true) {
- const EventBuffer* first = NULL;
- for (uint32_t i = 0; i < num_srcs; ++i) {
- const EventBuffer* const src = (const EventBuffer*)srcs[i];
- if (src->is_valid()) {
- if (!first || src->get_event()->frames < first->get_event()->frames)
- first = src;
- }
- }
- if (first) {
- const LV2_Event* const ev = first->get_event();
- ((EventBuffer*)dst)->append(
- ev->frames, ev->subframes, ev->type, ev->size,
- (const uint8_t*)ev + sizeof(LV2_Event));
- first->increment();
- } else {
- break;
- }
- }
- dst->rewind();
-#endif
-}
+void
+mix(Context& context,
+ Shared::URIs& uris,
+ Buffer* dst,
+ const Buffer*const* srcs,
+ uint32_t num_srcs);
} // namespace Server
} // namespace Ingen
diff --git a/src/server/wscript b/src/server/wscript
index 1d80b926..610ffb25 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -46,6 +46,7 @@ def build(bld):
internals/Delay.cpp
internals/Note.cpp
internals/Trigger.cpp
+ mix.cpp
'''
obj = bld(features = 'cxx cxxshlib',
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 18:28:46 +0000