Merge branch 'master' into multicam

2022-09-29 21:18:30 -07:00
parent 2d0af6f335 b28495c7a6
commit 76e0e2bd13
17 changed files with 191 additions and 171 deletions
@@ -232,7 +232,9 @@ private:
  RenderThread *video_thread_;
  RenderThread *dry_run_thread_;
  RenderThread *audio_thread_;
-  RenderThread *waveform_thread_;
+
+  std::vector<RenderThread *> waveform_threads_;
+  size_t last_waveform_thread_;

  std::list<RenderThread *> render_threads_;