From bd2b3f7a7cb5489f089839c9f9c69cd78d502f5e Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 25 Nov 2020 09:42:30 +1100 Subject: [PATCH] gizmos: detect generated images like titles Fixes #1413 --- app/widget/viewer/gizmotraverser.cpp | 9 ++++++++- app/widget/viewer/gizmotraverser.h | 8 +++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/widget/viewer/gizmotraverser.cpp b/app/widget/viewer/gizmotraverser.cpp index 6277b2226..8105a7338 100644 --- a/app/widget/viewer/gizmotraverser.cpp +++ b/app/widget/viewer/gizmotraverser.cpp @@ -38,7 +38,14 @@ QVariant GizmoTraverser::ProcessShader(const Node *node, const TimeRange &range, Q_UNUSED(range) Q_UNUSED(job) - return size_; + return GenerateResolution(); } +QVariant GizmoTraverser::ProcessFrameGeneration(const Node *node, const GenerateJob &job) +{ + Q_UNUSED(node) + Q_UNUSED(job) + + return GenerateResolution(); +} } diff --git a/app/widget/viewer/gizmotraverser.h b/app/widget/viewer/gizmotraverser.h index f7334b9f9..3f3e5b715 100644 --- a/app/widget/viewer/gizmotraverser.h +++ b/app/widget/viewer/gizmotraverser.h @@ -34,15 +34,17 @@ public: } protected: - virtual QVariant ProcessVideoFootage(StreamPtr stream, const rational &input_time); + virtual QVariant ProcessVideoFootage(StreamPtr stream, const rational &input_time) override; - virtual QVariant ProcessShader(const Node *node, const TimeRange &range, const ShaderJob& job); + virtual QVariant ProcessShader(const Node *node, const TimeRange &range, const ShaderJob& job) override; - virtual QVector2D GenerateResolution() const + virtual QVector2D GenerateResolution() const override { return size_; } + virtual QVariant ProcessFrameGeneration(const Node *node, const GenerateJob& job) override; + // FIXME: Do something about audio? private: