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

with Block::set_length_and_* functions, keep the speeds correct

Browse Source 
With differently set speeds, these functions would mess with the timing in ways
that would be confusing to the user. Now they act in a much more intuitive way
and also prevent negative media times.
This commit is contained in:
itsmattkc
2019-12-19 02:26:30 +11:00
parent 0d51f606df
commit b308f753b3
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/block.cpp
+16 -2
View File
@@ -97,7 +97,14 @@ void Block::set_length_and_media_out(const rational &length)
return;
}
set_media_out(media_out() + (length - this->length()));
rational media_out_diff = length - this->length();
// Try to maintain the same speed (which is determined by the media in to out points)
if (media_length() != this->length()) {
media_out_diff = media_out_diff / this->length() * media_length();
}
set_media_out(media_out() + media_out_diff);
set_length(length);
}
@@ -110,8 +117,15 @@ void Block::set_length_and_media_in(const rational &length)
return;
}
rational media_in_diff = this->length() - length;
// Try to maintain the same speed (which is determined by the media in to out points)
if (media_length() != this->length()) {
media_in_diff = media_in_diff / this->length() * media_length();
}
// Calculate media_in adjustment
set_media_in(media_in() + (this->length() - length));
set_media_in(media_in() + media_in_diff);
// Set the length without setting media out
set_length(length);