Enable rendering for Channel Groups

monocasual · May 24, 2024 · 1114fc0 · 1114fc0
1 parent d0ee4b2
commit 1114fc0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/core/rendering/renderer.cpp b/src/core/rendering/renderer.cpp
@@ -157,7 +157,7 @@ void Renderer::advanceChannels(
     int                                    quantizerStep) const
 {
 	for (const model::ChannelView& view : views)
-		if (!view.channel->isInternal())
+		if (!view.channel->isInternal() && !view.channel->isGrouped())
 			advanceChannel(view, events, block, quantizerStep);
 }
 
@@ -180,6 +180,9 @@ void Renderer::advanceChannel(
 			rendering::advanceMidiChannel(ch, e, m_kernelMidi);
 		else if (ch.type == ChannelType::SAMPLE)
 			rendering::advanceSampleChannel(ch, e);
+		else if (ch.type == ChannelType::GROUP)
+			for (const Channel* child : view.children)
+				advanceChannel({child, {}}, events, block, quantizerStep);
 	}
 }
 
@@ -193,7 +196,7 @@ void Renderer::renderNormalChannels(
     bool                                   seqIsRunning) const
 {
 	for (const model::ChannelView& view : views)
-		if (!view.channel->isInternal())
+		if (!view.channel->isInternal() && !view.channel->isGrouped())
 			renderNormalChannel(view, out, in, hasSolos, seqIsRunning);
 }
 
@@ -218,6 +221,10 @@ void Renderer::renderNormalChannel(
 	{
 		renderMidiChannel(ch);
 	}
+	else if (ch.type == ChannelType::GROUP)
+	{
+		renderGroupChannel(view, in, mixerHasSolos, seqIsRunning);
+	}
 
 	if (ch.isAudible(mixerHasSolos))
 		out.sum(ch.shared->audioBuffer, ch.volume * ch.shared->volumeInternal.load(), calcPanning_(ch.pan));
@@ -274,4 +281,23 @@ void Renderer::renderMidiChannel(const Channel& ch) const
 
 	rendering::renderAudioAndMidiPlugins(ch, m_pluginHost);
 }
+
+/* -------------------------------------------------------------------------- */
+
+void Renderer::renderGroupChannel(
+    const model::ChannelView& view,
+    const mcl::AudioBuffer&   in,
+    bool                      mixerHasSolos,
+    bool                      seqIsRunning) const
+{
+	assert(view.channel->type == ChannelType::GROUP);
+
+	for (const Channel* child : view.children)
+	{
+		const model::ChannelView childView = {child, {}};
+		mcl::AudioBuffer&        buffer    = child->shared->audioBuffer;
+		renderNormalChannel(childView, buffer, in, mixerHasSolos, seqIsRunning);
+	}
+	rendering::renderAudioPlugins(*view.channel, m_pluginHost);
+}
 } // namespace giada::m::rendering
diff --git a/src/core/rendering/renderer.h b/src/core/rendering/renderer.h
@@ -109,6 +109,12 @@ class Renderer
 	void renderSampleChannel(const Channel&, const mcl::AudioBuffer& in, bool seqIsRunning) const;
 	void renderMidiChannel(const Channel&) const;
 
+	void renderGroupChannel(
+	    const model::ChannelView&,
+	    const mcl::AudioBuffer& in,
+	    bool                    mixerHasSolos,
+	    bool                    seqIsRunning) const;
+
 	Sequencer&  m_sequencer;
 	Mixer&      m_mixer;
 	PluginHost& m_pluginHost;