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

clip: fixed speed/reverse order

Browse Source
This commit is contained in:
itsmattkc
2022-04-11 18:30:17 -07:00
parent 60e5241f05
commit 245a0a112a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/clip/clip.cpp
+8 -8
View File
@@ -142,6 +142,10 @@ rational ClipBlock::SequenceToMediaTime(const rational &sequence_time, bool igno
rational media_time = sequence_time;
if (reverse() && !ignore_reverse) {
media_time = length() - media_time;
}
if (!ignore_speed) {
double speed_value = speed();
if (qIsNull(speed_value)) {
@@ -153,10 +157,6 @@ rational ClipBlock::SequenceToMediaTime(const rational &sequence_time, bool igno
}
}
if (reverse() && !ignore_reverse) {
media_time = length() - media_time;
}
media_time += media_in();
return media_time;
@@ -171,10 +171,6 @@ rational ClipBlock::MediaToSequenceTime(const rational &media_time) const
rational sequence_time = media_time - media_in();
if (reverse()) {
sequence_time = length() - sequence_time;
}
double speed_value = speed();
if (qIsNull(speed_value)) {
// I don't know what to return here yet...
@@ -184,6 +180,10 @@ rational ClipBlock::MediaToSequenceTime(const rational &media_time) const
sequence_time = rational::fromDouble(sequence_time.toDouble() / speed_value);
}
if (reverse()) {
sequence_time = length() - sequence_time;
}
return sequence_time;
}