From b24cf3e6589f691e22b6d6a2e2303628bee4f44a Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Thu, 18 Aug 2022 08:21:16 -0700
Subject: [PATCH] rendermanager: make declaring render mode mandatory

---
 app/render/previewautocacher.cpp | 8 ++++----
 app/render/rendermanager.cpp     | 1 +
 app/render/rendermanager.h       | 8 ++++----
 app/task/render/render.cpp       | 8 +++-----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/render/previewautocacher.cpp b/app/render/previewautocacher.cpp
index 16f1c6bab..587cd9553 100644
--- a/app/render/previewautocacher.cpp
+++ b/app/render/previewautocacher.cpp
@@ -671,7 +671,8 @@ RenderTicketWatcher* PreviewAutoCacher::RenderFrame(Node *node, const rational&
                                        copied_viewer_node_->GetVideoParams(),
                                        copied_viewer_node_->GetAudioParams(),
                                        time,
-                                       copied_color_manager_);
+                                       copied_color_manager_,
+                                       RenderMode::kOffline);
 
   if (FrameHashCache *frame_cache = dynamic_cast<FrameHashCache *>(cache)) {
     if (ThumbnailCache *wave_cache = dynamic_cast<ThumbnailCache *>(cache)) {
@@ -687,7 +688,6 @@ RenderTicketWatcher* PreviewAutoCacher::RenderFrame(Node *node, const rational&
     rvp.AddCache(frame_cache);
   }
 
-  rvp.mode = RenderMode::kOffline;
   rvp.return_type = dry ? RenderManager::kNull : RenderManager::kTexture;
 
   // Allow using cached images for this render job
@@ -710,11 +710,11 @@ RenderTicketPtr PreviewAutoCacher::RenderAudio(Node *node, const TimeRange &r, P
 
   RenderManager::RenderAudioParams rap(node,
                                        r,
-                                       copied_viewer_node_->GetAudioParams());
+                                       copied_viewer_node_->GetAudioParams(),
+                                       RenderMode::kOffline);
 
   rap.generate_waveforms = dynamic_cast<AudioWaveformCache*>(cache);
   rap.clamp = false;
-  rap.mode = RenderMode::kOffline;
 
   RenderTicketPtr ticket = RenderManager::instance()->RenderAudio(rap);
   watcher->SetTicket(ticket);
diff --git a/app/render/rendermanager.cpp b/app/render/rendermanager.cpp
index 7ea8ecfd1..f8f43d1be 100644
--- a/app/render/rendermanager.cpp
+++ b/app/render/rendermanager.cpp
@@ -131,6 +131,7 @@ RenderTicketPtr RenderManager::RenderAudio(const RenderAudioParams &params)
   ticket->setProperty("enablewaveforms", params.generate_waveforms);
   ticket->setProperty("clamp", params.clamp);
   ticket->setProperty("aparam", QVariant::fromValue(params.audio_params));
+  ticket->setProperty("mode", params.mode);
 
   audio_thread_->AddTicket(ticket);
 
diff --git a/app/render/rendermanager.h b/app/render/rendermanager.h
index 877ca26b5..e16cb5bd9 100644
--- a/app/render/rendermanager.h
+++ b/app/render/rendermanager.h
@@ -103,7 +103,7 @@ public:
 
   struct RenderVideoParams {
     RenderVideoParams(Node *n, const VideoParams &vparam, const AudioParams &aparam, const rational &t,
-                ColorManager *colorman)
+                ColorManager *colorman, RenderMode::Mode m)
     {
       node = n;
       video_params = vparam;
@@ -116,7 +116,7 @@ public:
       force_color_output = nullptr;
       force_size = QSize(0, 0);
       force_channel_count = 0;
-      mode = RenderMode::kOffline;
+      mode = m;
     }
 
     void AddCache(FrameHashCache *cache)
@@ -159,14 +159,14 @@ public:
   RenderTicketPtr RenderFrame(const RenderVideoParams &params);
 
   struct RenderAudioParams {
-    RenderAudioParams(Node *n, const TimeRange &time, const AudioParams &aparam)
+    RenderAudioParams(Node *n, const TimeRange &time, const AudioParams &aparam, RenderMode::Mode m)
     {
       node = n;
       range = time;
       audio_params = aparam;
       generate_waveforms = false;
       clamp = true;
-      mode = RenderMode::kOffline;
+      mode = m;
     }
 
     Node *node;
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index f1caab712..b3bfca484 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -62,9 +62,8 @@ bool RenderTask::Render(ColorManager* manager,
 
     RenderManager::RenderAudioParams rap(viewer_->GetConnectedSampleOutput(),
                                          range,
-                                         audio_params_);
-
-    rap.mode = RenderMode::kOnline;
+                                         audio_params_,
+                                         RenderMode::kOnline);
 
     RenderTicketWatcher* watcher = new RenderTicketWatcher();
     watcher->setProperty("range", QVariant::fromValue(range));
@@ -284,14 +283,13 @@ void RenderTask::StartTicket(QThread* watcher_thread, ColorManager* manager,
                              ColorProcessorPtr force_color_output)
 {
   RenderManager::RenderVideoParams rvp(viewer_->GetConnectedTextureOutput(), video_params_, audio_params_,
-                                       time, manager);
+                                       time, manager, mode);
 
   rvp.force_size = force_size;
   rvp.force_matrix = force_matrix;
   rvp.force_format = force_format;
   rvp.force_color_output = force_color_output;
   rvp.force_channel_count = force_channel_count;
-  rvp.mode = mode;
 
   if (cache) {
     rvp.AddCache(cache);