oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewer: add option to remove tex/samp inputs

Browse Source
This commit is contained in:
itsmattkc
2021-07-23 12:58:26 -07:00
parent 72b11add9c
commit b7a559ab58
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/viewer/viewer.cpp
+12 -5
View File
@@ -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()
app/node/output/viewer/viewer.h
+1 -1
View File
@@ -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)
app/node/project/footage/footage.cpp
+1 -1
View File
@@ -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);