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

clip: improve waveforms when reversed

Browse Source
This commit is contained in:
itsmattkc
2022-04-11 16:25:32 -07:00
parent e85a5b21b0
commit 80d53c6d0c
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/clip/clip.cpp
+10 -15
View File
@@ -95,7 +95,8 @@ void ClipBlock::set_length_and_media_out(const rational &length)
if (reverse()) {
// Calculate media_in adjustment
set_media_in(SequenceToMediaTime(length - this->length(), true));
rational proposed_media_in = SequenceToMediaTime(this->length() - length, true);
set_media_in(proposed_media_in);
}
super::set_length_and_media_out(length);
@@ -109,7 +110,14 @@ void ClipBlock::set_length_and_media_in(const rational &length)
if (!reverse()) {
// Calculate media_in adjustment
set_media_in(SequenceToMediaTime(this->length() - length));
rational proposed_media_in = SequenceToMediaTime(this->length() - length);
waveform_.TrimIn(proposed_media_in - media_in());
set_media_in(proposed_media_in);
} else {
// Trim waveform out point
waveform_.TrimIn(this->length() - length);
}
super::set_length_and_media_in(length);
@@ -222,19 +230,6 @@ void ClipBlock::LinkChangeEvent()
}
}
void ClipBlock::InputValueChangedEvent(const QString &input, int element)
{
super::InputValueChangedEvent(input, element);
if (input == kMediaInInput) {
// Shift waveform in the inverse that the media in moved
rational diff = media_in() - last_media_in_;
waveform_.TrimIn(diff);
last_media_in_ = media_in();
}
}
TimeRange ClipBlock::InputTimeAdjustment(const QString& input, int element, const TimeRange& input_time) const
{
Q_UNUSED(element)