From 895250ab48c103e4722f8104c7e5abf0a388fa3d Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 1 Oct 2022 09:57:00 -0700 Subject: [PATCH 1/2] viewer: fix issue with waveform on footage --- app/node/output/viewer/viewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp index 8c9456626..4dfce5b64 100644 --- a/app/node/output/viewer/viewer.cpp +++ b/app/node/output/viewer/viewer.cpp @@ -389,7 +389,7 @@ Node::ValueHint ViewerOutput::GetConnectedSampleValueHint() void ViewerOutput::ConnectedToPreviewEvent() { - if (Node *connected = GetConnectedOutput(kSamplesInput)) { + if (Node *connected = this->GetConnectedSampleOutput()) { TimeRange max_range = InputTimeAdjustment(kSamplesInput, -1, TimeRange(0, GetAudioLength())); TimeRangeList invalid = connected->waveform_cache()->GetInvalidatedRanges(max_range); for (const TimeRange &r : invalid) { From 087325e4b20d477dca2b1b0b868f687e276e9a96 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 1 Oct 2022 09:57:28 -0700 Subject: [PATCH 2/2] audiowaveformview: fixed bug with waveform update signal --- app/widget/viewer/audiowaveformview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/widget/viewer/audiowaveformview.cpp b/app/widget/viewer/audiowaveformview.cpp index 9b5403942..10a4c85eb 100644 --- a/app/widget/viewer/audiowaveformview.cpp +++ b/app/widget/viewer/audiowaveformview.cpp @@ -53,7 +53,7 @@ void AudioWaveformView::SetViewer(ViewerOutput *playback) pool_.clear(); pool_.waitForDone(); - disconnect(playback_, &ViewerOutput::ConnectedWaveformChanged, this, static_cast(&AudioWaveformView::update)); + disconnect(playback_, &ViewerOutput::ConnectedWaveformChanged, viewport(), static_cast(&QWidget::update)); SetTimebase(0); } @@ -61,7 +61,7 @@ void AudioWaveformView::SetViewer(ViewerOutput *playback) playback_ = playback; if (playback_) { - connect(playback_, &ViewerOutput::ConnectedWaveformChanged, this, static_cast(&AudioWaveformView::update)); + connect(playback_, &ViewerOutput::ConnectedWaveformChanged, viewport(), static_cast(&QWidget::update)); SetTimebase(playback_->GetAudioParams().sample_rate_as_time_base()); }