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

various: greatly simplified job times

Browse Source 
Hopefully this doesn't break everything
This commit is contained in:
itsmattkc
2021-07-11 23:33:21 -07:00
parent 43d3fc57f2
commit 310fd3541a
28 changed files with 157 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/track/track.cpp
+2 -2
View File
@@ -431,7 +431,7 @@ QVector<Block *> Track::BlocksAtTimeRange(const TimeRange &range) const
return list;
}
void Track::InvalidateCache(const TimeRange& range, const QString& from, int element, qint64 job_time)
void Track::InvalidateCache(const TimeRange& range, const QString& from, int element)
{
if (GetOperationStack() != 0) {
return;
@@ -455,7 +455,7 @@ void Track::InvalidateCache(const TimeRange& range, const QString& from, int ele
preop_track_length_ = track_length_;
}
Node::InvalidateCache(limited, from, element, job_time);
Node::InvalidateCache(limited, from, element);
}
void Track::InsertBlockBefore(Block* block, Block* after)
app/node/output/track/track.h
+1 -1
View File
@@ -286,7 +286,7 @@ public:
return blocks_;
}
virtual void InvalidateCache(const TimeRange& range, const QString& from, int element, qint64 job_time) override;
virtual void InvalidateCache(const TimeRange& range, const QString& from, int element) override;
/**
* @brief Adds Block `block` at the very beginning of the Sequence before all other clips
app/node/output/viewer/viewer.cpp
+4 -4
View File
@@ -222,7 +222,7 @@ void ViewerOutput::ShiftCache(const rational &from, const rational &to)
ShiftAudioCache(from, to);
}
void ViewerOutput::InvalidateCache(const TimeRange& range, const QString& from, int element, qint64 job_time)
void ViewerOutput::InvalidateCache(const TimeRange& range, const QString& from, int element)
{
Q_UNUSED(element)
@@ -233,16 +233,16 @@ void ViewerOutput::InvalidateCache(const TimeRange& range, const QString& from,
if (invalidated_range.in() != invalidated_range.out()) {
if (from == kTextureInput || from == kVideoParamsInput) {
video_frame_cache_.Invalidate(invalidated_range, job_time);
video_frame_cache_.Invalidate(invalidated_range);
} else {
audio_playback_cache_.Invalidate(invalidated_range, job_time);
audio_playback_cache_.Invalidate(invalidated_range);
}
}
}
VerifyLength();
super::InvalidateCache(range, from, element, job_time);
super::InvalidateCache(range, from, element);
}
QVector<QString> ViewerOutput::inputs_for_output(const QString &output) const
app/node/output/viewer/viewer.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
void ShiftAudioCache(const rational& from, const rational& to);
void ShiftCache(const rational& from, const rational& to);
virtual void InvalidateCache(const TimeRange& range, const QString& from, int element, qint64 job_time) override;
virtual void InvalidateCache(const TimeRange& range, const QString& from, int element) override;
virtual QVector<QString> inputs_for_output(const QString& output) const override;