From d96395ea273d9c60f5c7cff3f21b9c91cdfbdbaa Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 29 Oct 2019 01:41:08 +1100 Subject: [PATCH] don't use track as the time chooser This design, while not completely illogical, seems to betray the DAG design and borders on impossible to actually recompile. The plan is to build this functionality into the renderer instead. --- app/node/output/track/track.cpp | 10 ---------- app/node/output/track/track.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index ce35f3ecb..0cfe15496 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -196,16 +196,6 @@ QVariant TrackOutput::Value(NodeOutput *output, const rational &in, const ration if (output == track_output_) { // Set track output correctly return PtrToValue(this); - } else if (output == buffer_output()) { - ValidateCurrentBlock(in); - - if (current_block_ != this) { - // At this point, we must have found the correct block so we use its texture output to produce the image - return current_block_->buffer_output()->get_value(in, out); - } - - // No texture is valid - return 0; } // Run default node processing diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h index bed2746ca..f72913eb5 100644 --- a/app/node/output/track/track.h +++ b/app/node/output/track/track.h @@ -174,8 +174,6 @@ private: NodeOutput* track_output_; - NodeOutput* block_list_output_; - TrackType track_type_; int block_invalidate_cache_stack_;