From d60971a8cbaa281c10da8316c8e0c45150aca42e Mon Sep 17 00:00:00 2001 From: lnd3 Date: Mon, 2 Sep 2024 07:33:14 +0200 Subject: [PATCH] In node groups add the output node to the list of group content because it will fix the issue when the group has output nodes as well as when the group has nodes that use an external output for example speakers or debug print. --- packages/nodegraph/include/nodegraph/NodeGraph.h | 1 + packages/nodegraph/include/nodegraph/NodeGraphOperations.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/packages/nodegraph/include/nodegraph/NodeGraph.h b/packages/nodegraph/include/nodegraph/NodeGraph.h index 93e990e4..69fce110 100644 --- a/packages/nodegraph/include/nodegraph/NodeGraph.h +++ b/packages/nodegraph/include/nodegraph/NodeGraph.h @@ -250,6 +250,7 @@ namespace l::nodegraph { NodeGraphGroup() { SetNumInputs(1); SetNumOutputs(1); + mOutputNodes.push_back(&mOutputNode); } ~NodeGraphGroup() = default; diff --git a/packages/nodegraph/include/nodegraph/NodeGraphOperations.h b/packages/nodegraph/include/nodegraph/NodeGraphOperations.h index a0ce48b4..dd54696b 100644 --- a/packages/nodegraph/include/nodegraph/NodeGraphOperations.h +++ b/packages/nodegraph/include/nodegraph/NodeGraphOperations.h @@ -287,6 +287,8 @@ namespace l::nodegraph { class GraphOutputSpeaker : public NodeGraphOp { public: + std::string defaultOutStrings[2] = { "Left", "Right"}; + GraphOutputSpeaker(NodeGraphBase* node, l::audio::AudioStream* stream = nullptr) : NodeGraphOp(node, 2, 0, 0), mAudioStream(stream), @@ -301,6 +303,10 @@ namespace l::nodegraph { void ProcessSubGraph(std::vector& inputs, std::vector& outputs) override; virtual void Tick(float time, float elapsed) override; + std::string_view GetOutputName(int8_t outputChannel) { + return defaultOutStrings[outputChannel]; + } + std::string_view GetName() override { return "Speaker"; }