reworked all timeline commands

I'll be honest, this stuff probably caused a lot of crashes. Objects were constantly created and destroyed without the foresight that other commands might be using them. This should fix a lot of that.
This commit is contained in:
itsmattkc
2021-01-15 14:36:21 +11:00
parent 96c0921193
commit 91740dd823
11 changed files with 1990 additions and 1912 deletions
+1
View File
@@ -31,6 +31,7 @@ Block::Block() :
previous_(nullptr),
next_(nullptr),
track_(nullptr),
index_(-1),
in_transition_(nullptr),
out_transition_(nullptr)
{
+11
View File
@@ -165,6 +165,16 @@ public:
out_transition_ = t;
}
int index() const
{
return index_;
}
void set_index(int i)
{
index_ = i;
}
virtual void Hash(QCryptographicHash &hash, const rational &time) const override;
public slots:
@@ -201,6 +211,7 @@ private:
rational in_point_;
rational out_point_;
Track* track_;
int index_;
TransitionBlock* in_transition_;
TransitionBlock* out_transition_;
+34 -20
View File
@@ -286,7 +286,8 @@ void Track::InvalidateCache(const TimeRange& range, const InputConnection& from)
limited = TimeRange(qMax(range.in(), b->in()), qMin(range.out(), b->out()));
} else {
limited = TimeRange(qMax(range.in(), rational(0)), qMin(range.out(), track_length()));
limited = TimeRange(qMax(range.in(), rational(0)), qMin(range.out(), last_invalidated_length_));
last_invalidated_length_ = track_length();
}
Node::InvalidateCache(limited, from);
@@ -294,19 +295,27 @@ void Track::InvalidateCache(const TimeRange& range, const InputConnection& from)
void Track::InsertBlockBefore(Block* block, Block* after)
{
InsertBlockAtIndex(block, blocks_.indexOf(after));
if (!after) {
AppendBlock(block);
} else {
InsertBlockAtIndex(block, blocks_.indexOf(after));
}
}
void Track::InsertBlockAfter(Block *block, Block *before)
{
int before_index = blocks_.indexOf(before);
Q_ASSERT(before_index >= 0);
if (before_index == blocks_.size() - 1) {
AppendBlock(block);
if (!before) {
PrependBlock(block);
} else {
InsertBlockAtIndex(block, before_index + 1);
int before_index = blocks_.indexOf(before);
Q_ASSERT(before_index >= 0);
if (before_index == blocks_.size() - 1) {
AppendBlock(block);
} else {
InsertBlockAtIndex(block, before_index + 1);
}
}
}
@@ -320,7 +329,7 @@ void Track::PrependBlock(Block *block)
EndOperation();
// Everything has shifted at this point
Node::InvalidateCache(TimeRange(0, track_length()), InputConnection());
InvalidateCache(TimeRange(0, track_length()));
}
void Track::InsertBlockAtIndex(Block *block, int index)
@@ -333,7 +342,7 @@ void Track::InsertBlockAtIndex(Block *block, int index)
EndOperation();
Node::InvalidateCache(TimeRange(block->in(), track_length()));
InvalidateCache(TimeRange(block->in(), track_length()));
}
void Track::AppendBlock(Block *block)
@@ -346,7 +355,7 @@ void Track::AppendBlock(Block *block)
EndOperation();
// Invalidate area that block was added to
Node::InvalidateCache(TimeRange(block->in(), track_length()));
InvalidateCache(TimeRange(block->in(), track_length()));
}
void Track::RippleRemoveBlock(Block *block)
@@ -360,7 +369,7 @@ void Track::RippleRemoveBlock(Block *block)
EndOperation();
Node::InvalidateCache(TimeRange(remove_in, qMax(track_length(), remove_out)));
InvalidateCache(TimeRange(remove_in, qMax(track_length(), remove_out)));
}
void Track::ReplaceBlock(Block *old, Block *replace)
@@ -376,9 +385,9 @@ void Track::ReplaceBlock(Block *old, Block *replace)
EndOperation();
if (old->length() == replace->length()) {
Node::InvalidateCache(TimeRange(replace->in(), replace->out()));
InvalidateCache(TimeRange(replace->in(), replace->out()));
} else {
Node::InvalidateCache(TimeRange(replace->in(), RATIONAL_MAX));
InvalidateCache(TimeRange(replace->in(), RATIONAL_MAX));
}
}
@@ -432,7 +441,7 @@ void Track::Hash(QCryptographicHash &hash, const rational &time) const
void Track::SetMuted(bool e)
{
muted_input_->SetStandardValue(e);
Node::InvalidateCache(TimeRange(0, track_length()));
InvalidateCache(TimeRange(0, track_length()));
}
void Track::SetLocked(bool e)
@@ -454,6 +463,8 @@ void Track::UpdateInOutFrom(int index)
last_out += b->length();
b->set_out(last_out);
b->set_index(i);
}
emit BlocksRefreshed();
@@ -480,13 +491,16 @@ int Track::GetCacheIndexFromArrayIndex(int index) const
void Track::SetLengthInternal(const rational &r, bool invalidate)
{
if (r != track_length_) {
// TimeRange will automatically normalize so that the shorter number is the in and the longer
// is the out
TimeRange invalidate_range(track_length_, r);
track_length_ = r;
last_invalidated_length_ = qMax(last_invalidated_length_, track_length_);
emit TrackLengthChanged();
if (invalidate) {
Node::InvalidateCache(invalidate_range);
InvalidateCache(invalidate_range);
}
}
}
@@ -557,7 +571,7 @@ void Track::BlockConnected(Node *node, int element)
connect(block, &Block::LengthChanged, this, &Track::BlockLengthChanged);
// Invalidate cache now that block should have an in point
Node::InvalidateCache(TimeRange(block->in(), track_length()));
InvalidateCache(TimeRange(block->in(), track_length()));
// Emit block added signal
emit BlockAdded(block);
@@ -615,7 +629,7 @@ void Track::BlockDisconnected(Node* node, int element)
disconnect(b, &Block::LengthChanged, this, &Track::BlockLengthChanged);
Node::InvalidateCache(invalidate_range);
InvalidateCache(invalidate_range);
}
void Track::BlockLengthChanged()
@@ -631,7 +645,7 @@ void Track::BlockLengthChanged()
TimeRange invalidate_region(qMin(old_out, new_out), track_length());
Node::InvalidateCache(invalidate_region);
InvalidateCache(invalidate_region);
}
void Track::MutedInputValueChanged()
+3 -1
View File
@@ -220,7 +220,7 @@ public:
return blocks_;
}
virtual void InvalidateCache(const TimeRange& range, const InputConnection& from) override;
virtual void InvalidateCache(const TimeRange& range, const InputConnection& from = InputConnection()) override;
/**
* @brief Adds Block `block` at the very beginning of the Sequence before all other clips
@@ -358,6 +358,8 @@ private:
rational track_length_;
rational last_invalidated_length_;
double track_height_;
int index_;