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

Merge branch 'master' into multicam

Browse Source
This commit is contained in:
itsmattkc
2022-10-01 10:00:23 -07:00
parent df0a52b3c6 087325e4b2
commit 69679d4494
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/viewer/viewer.cpp
+1 -1
View File
@@ -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) {
app/widget/viewer/audiowaveformview.cpp
+2 -2
View File
@@ -53,7 +53,7 @@ void AudioWaveformView::SetViewer(ViewerOutput *playback)
pool_.clear();
pool_.waitForDone();
disconnect(playback_, &ViewerOutput::ConnectedWaveformChanged, this, static_cast<void(AudioWaveformView::*)()>(&AudioWaveformView::update));
disconnect(playback_, &ViewerOutput::ConnectedWaveformChanged, viewport(), static_cast<void(QWidget::*)()>(&QWidget::update));
SetTimebase(0);
}
@@ -61,7 +61,7 @@ void AudioWaveformView::SetViewer(ViewerOutput *playback)
playback_ = playback;
if (playback_) {
connect(playback_, &ViewerOutput::ConnectedWaveformChanged, this, static_cast<void(AudioWaveformView::*)()>(&AudioWaveformView::update));
connect(playback_, &ViewerOutput::ConnectedWaveformChanged, viewport(), static_cast<void(QWidget::*)()>(&QWidget::update));
SetTimebase(playback_->GetAudioParams().sample_rate_as_time_base());
}