Merge branch 'master' into move-serialization

2023-02-28 11:29:52 -08:00
parent 7ec8a4dd7e ec2ff82229
commit cb9008a623
6 changed files with 49 additions and 72 deletions
@@ -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);