From b7a559ab58f8bb58ebb88cb651b2341a5c337741 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 23 Jul 2021 12:58:26 -0700 Subject: [PATCH] viewer: add option to remove tex/samp inputs --- app/node/output/viewer/viewer.cpp | 17 ++++++++++++----- app/node/output/viewer/viewer.h | 2 +- app/node/project/footage/footage.cpp | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp index 910480576..a92d90584 100644 --- a/app/node/output/viewer/viewer.cpp +++ b/app/node/output/viewer/viewer.cpp @@ -36,7 +36,7 @@ const uint64_t ViewerOutput::kVideoParamEditMask = VideoParamEdit::kWidthHeight #define super Node -ViewerOutput::ViewerOutput(bool create_default_streams) : +ViewerOutput::ViewerOutput(bool create_buffer_inputs, bool create_default_streams) : last_length_(0), video_length_(0), audio_length_(0), @@ -52,8 +52,10 @@ ViewerOutput::ViewerOutput(bool create_default_streams) : connect(this, &Node::InputArraySizeChanged, this, &ViewerOutput::InputResized); - AddInput(kTextureInput, NodeValue::kTexture, InputFlags(kInputFlagNotKeyframable)); - AddInput(kSamplesInput, NodeValue::kSamples, InputFlags(kInputFlagNotKeyframable)); + if (create_buffer_inputs) { + AddInput(kTextureInput, NodeValue::kTexture, InputFlags(kInputFlagNotKeyframable)); + AddInput(kSamplesInput, NodeValue::kSamples, InputFlags(kInputFlagNotKeyframable)); + } if (create_default_streams) { AddStream(Track::kVideo, QVariant()); @@ -293,8 +295,13 @@ void ViewerOutput::Retranslate() SetInputName(kVideoParamsInput, tr("Video Parameters")); SetInputName(kAudioParamsInput, tr("Audio Parameters")); - SetInputName(kTextureInput, tr("Texture")); - SetInputName(kSamplesInput, tr("Samples")); + if (HasInputWithID(kTextureInput)) { + SetInputName(kTextureInput, tr("Texture")); + } + + if (HasInputWithID(kSamplesInput)) { + SetInputName(kSamplesInput, tr("Samples")); + } } void ViewerOutput::VerifyLength() diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h index df5fda49d..072310680 100644 --- a/app/node/output/viewer/viewer.h +++ b/app/node/output/viewer/viewer.h @@ -44,7 +44,7 @@ class ViewerOutput : public Node { Q_OBJECT public: - ViewerOutput(bool create_default_streams = true); + ViewerOutput(bool create_buffer_inputs = true, bool create_default_streams = true); NODE_DEFAULT_DESTRUCTOR(ViewerOutput) diff --git a/app/node/project/footage/footage.cpp b/app/node/project/footage/footage.cpp index d826476e3..addfa110c 100644 --- a/app/node/project/footage/footage.cpp +++ b/app/node/project/footage/footage.cpp @@ -42,7 +42,7 @@ const QString Footage::kLoopModeInput = QStringLiteral("loop_in"); #define super ViewerOutput Footage::Footage(const QString &filename) : - ViewerOutput(false), + ViewerOutput(false, false), cancelled_(nullptr) { SetCacheTextures(true);