From cb1accaf0c59310e9ee05ebb2eede050fddd311f Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 18 Jan 2021 16:33:49 +1100 Subject: [PATCH] minor code enhancements --- app/node/node.h | 2 +- app/node/output/track/track.cpp | 4 ++-- app/node/output/track/tracklist.h | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/node/node.h b/app/node/node.h index de3fe922d..2140ecc3e 100644 --- a/app/node/node.h +++ b/app/node/node.h @@ -473,7 +473,7 @@ signals: */ void LabelChanged(const QString& s); -protected slots: +public slots: void InputChanged(const olive::TimeRange &range, int element); void InputConnectionChanged(Node* source, int element); diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index f61263144..735d08e1f 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -596,6 +596,8 @@ void Track::BlockDisconnected(Node* node, int element) return; } + emit BlockRemoved(b); + TimeRange invalidate_range(b->in(), track_length()); // Get cache index @@ -605,8 +607,6 @@ void Track::BlockDisconnected(Node* node, int element) blocks_.removeAt(cache_index); block_array_indexes_.removeAt(cache_index); - emit BlockRemoved(b); - // Update previous/nexts Block* previous = b->previous(); Block* next = b->next(); diff --git a/app/node/output/track/tracklist.h b/app/node/output/track/tracklist.h index bf7d1e387..16cd647a9 100644 --- a/app/node/output/track/tracklist.h +++ b/app/node/output/track/tracklist.h @@ -66,6 +66,8 @@ public: return track_input_; } + ViewerOutput* parent() const; + signals: void TrackListChanged(); @@ -82,6 +84,17 @@ private: * @brief A cache of connected Tracks */ QVector track_cache_; + QVector track_array_indexes_; + + int GetArrayIndexFromCacheIndex(int index) const + { + return track_array_indexes_.at(index); + } + + int GetCacheIndexFromArrayIndex(int index) const + { + return track_array_indexes_.indexOf(index); + } NodeInput* track_input_;