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

use NodeInputArray for tracks as well

Browse Source 
These were introduced for the new Block system and make just as much sense for
the Track system. They've now been implemented for both.
This commit is contained in:
itsmattkc
2019-12-06 20:34:19 +11:00
parent 9140479940
commit 351d4a246e
11 changed files with 133 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/track/track.cpp
+7 -31
View File
@@ -27,8 +27,6 @@
TrackOutput::TrackOutput() :
track_type_(kTrackTypeNone),
previous_track_(nullptr),
next_track_(nullptr),
block_invalidate_cache_stack_(0),
index_(-1)
{
@@ -95,26 +93,6 @@ void TrackOutput::SetIndex(const int &index)
index_ = index;
}
void TrackOutput::set_previous_track(TrackOutput *previous)
{
previous_track_ = previous;
}
void TrackOutput::set_next_track(TrackOutput *next)
{
next_track_ = next;
}
TrackOutput *TrackOutput::previous_track() const
{
return previous_track_;
}
TrackOutput *TrackOutput::next_track() const
{
return next_track_;
}
Block *TrackOutput::BlockContainingTime(const rational &time) const
{
foreach (Block* block, block_cache_) {
@@ -224,7 +202,7 @@ void TrackOutput::InsertBlockAtIndex(Block *block, int index)
block_input_->InsertAt(index);
NodeParam::ConnectEdge(block->output(),
block_input_->ParamAt(index));
block_input_->At(index));
}
void TrackOutput::AppendBlock(Block *block)
@@ -236,7 +214,7 @@ void TrackOutput::AppendBlock(Block *block)
int last_index = block_input_->GetSize();
block_input_->Append();
NodeParam::ConnectEdge(block->output(),
block_input_->ParamAt(last_index));
block_input_->At(last_index));
UnblockInvalidateCache();
@@ -297,10 +275,10 @@ void TrackOutput::ReplaceBlock(Block *old, Block *replace)
int index_of_old_block = block_cache_.indexOf(old);
NodeParam::DisconnectEdge(old->output(),
block_input_->ParamAt(index_of_old_block));
block_input_->At(index_of_old_block));
NodeParam::ConnectEdge(replace->output(),
block_input_->ParamAt(index_of_old_block));
block_input_->At(index_of_old_block));
UnblockInvalidateCache();
@@ -462,11 +440,9 @@ void TrackOutput::BlockListSizeChanged(int size)
block_cache_.resize(size);
if (size > old_size) {
// Fill new slots with nullptr
for (int i=old_size;i<size;i++) {
block_cache_.replace(i, nullptr);
}
// Fill new slots with nullptr
for (int i=old_size;i<size;i++) {
block_cache_.replace(i, nullptr);
}
}
app/node/output/track/track.h
-9
View File
@@ -50,11 +50,6 @@ public:
const int& Index();
void SetIndex(const int& index);
void set_previous_track(TrackOutput* previous);
void set_next_track(TrackOutput* next);
TrackOutput* previous_track() const;
TrackOutput* next_track() const;
Block* BlockContainingTime(const rational& time) const;
Block* NearestBlockBefore(const rational& time) const;
@@ -163,10 +158,6 @@ private:
rational track_length_;
TrackOutput* previous_track_;
TrackOutput* next_track_;
int block_invalidate_cache_stack_;
int index_;