From 3337be07e53841372b7a0b53426455ecf79ebe30 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 9 Jan 2021 10:41:13 +1100 Subject: [PATCH] use QVector instead of QList for block cache --- app/node/output/track/track.cpp | 4 ++-- app/node/output/track/track.h | 6 +++--- app/render/renderprocessor.cpp | 2 +- app/widget/projectexplorer/projectexplorer.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index 4687d6c80..027b18ac4 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -225,9 +225,9 @@ Block *TrackOutput::BlockAtTime(const rational &time) const return nullptr; } -QList TrackOutput::BlocksAtTimeRange(const TimeRange &range) const +QVector TrackOutput::BlocksAtTimeRange(const TimeRange &range) const { - QList list; + QVector list; if (IsMuted()) { return list; diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h index 123d5cf3e..743a66d7f 100644 --- a/app/node/output/track/track.h +++ b/app/node/output/track/track.h @@ -148,9 +148,9 @@ public: * `block.in < range.out && block.out > range.in`. Returns an empty list if IsMuted() or if * `range.in >= track.length`. Blocks that are not enabled will be omitted from the returned list. */ - QList BlocksAtTimeRange(const TimeRange& range) const; + QVector BlocksAtTimeRange(const TimeRange& range) const; - const QList &Blocks() const + const QVector &Blocks() const { return block_cache_; } @@ -276,7 +276,7 @@ private: void SetLengthInternal(const rational& r, bool invalidate = true); - QList block_cache_; + QVector block_cache_; NodeInput* block_input_; diff --git a/app/render/renderprocessor.cpp b/app/render/renderprocessor.cpp index 75a467bea..1609464d3 100644 --- a/app/render/renderprocessor.cpp +++ b/app/render/renderprocessor.cpp @@ -192,7 +192,7 @@ NodeValueTable RenderProcessor::GenerateBlockTable(const TrackOutput *track, con const AudioParams& audio_params = ticket_->property("aparam").value(); - QList active_blocks = track->BlocksAtTimeRange(range); + QVector active_blocks = track->BlocksAtTimeRange(range); // All these blocks will need to output to a buffer so we create one here SampleBufferPtr block_range_buffer = SampleBuffer::CreateAllocated(audio_params, diff --git a/app/widget/projectexplorer/projectexplorer.cpp b/app/widget/projectexplorer/projectexplorer.cpp index 2ece5f0fa..b38abd6d5 100644 --- a/app/widget/projectexplorer/projectexplorer.cpp +++ b/app/widget/projectexplorer/projectexplorer.cpp @@ -550,7 +550,7 @@ QVector ProjectExplorer::GetMediaNodesUsingFootage(Footage *item) // Footage can contain multiple streams, all of which need to be dealt with foreach (Item* s, sequences) { - const QList& nodes = static_cast(s)->nodes(); + const QVector& nodes = static_cast(s)->nodes(); foreach (Node* n, nodes) { MediaInput* media_node = dynamic_cast(n);