From 82454c09c9edf0ae91fc7a5c28f429fcdacccb40 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Mon, 27 Feb 2023 18:12:13 -0800
Subject: [PATCH] viewer: force valid sample type

Fixes #2183
---
 app/render/previewautocacher.cpp | 5 ++++-
 app/widget/viewer/viewer.cpp     | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/render/previewautocacher.cpp b/app/render/previewautocacher.cpp
index db4466329..2abe537bd 100644
--- a/app/render/previewautocacher.cpp
+++ b/app/render/previewautocacher.cpp
@@ -625,9 +625,12 @@ RenderTicketPtr PreviewAutoCacher::RenderAudio(Node *node, ViewerOutput *context
   connect(watcher, &RenderTicketWatcher::Finished, this, &PreviewAutoCacher::AudioRendered);
   running_audio_tasks_.append(watcher);
 
+  AudioParams p = context->GetAudioParams();
+  p.set_format(ViewerOutput::kDefaultSampleFormat);
+
   RenderManager::RenderAudioParams rap(node,
                                        r,
-                                       context->GetAudioParams(),
+                                       p,
                                        RenderMode::kOffline);
 
   rap.generate_waveforms = dynamic_cast<AudioWaveformCache*>(cache);
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 70e973ddd..0e4f25aa9 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -510,6 +510,8 @@ void ViewerWidget::UpdateAudioProcessor()
     CloseAudioProcessor();
 
     AudioParams ap = GetConnectedNode()->GetAudioParams();
+    ap.set_format(ViewerOutput::kDefaultSampleFormat);
+
     AudioParams packed(OLIVE_CONFIG("AudioOutputSampleRate").toInt(),
                        OLIVE_CONFIG("AudioOutputChannelLayout").toULongLong(),
                        SampleFormat::from_string(OLIVE_CONFIG("AudioOutputSampleFormat").toString().toStdString()));