From 5e90f8d45434fa36b6e113357cf05a6cf53bfae5 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 2 Jun 2024 11:33:23 -0500
Subject: [PATCH] [studio] Move task runner to draw call

---
 src/olympic/studio/applib/src/main.cpp      | 7 -------
 src/olympic/studio/applib/src/studioapp.cpp | 5 +----
 src/olympic/studio/applib/src/studioapp.hpp | 2 --
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/olympic/studio/applib/src/main.cpp b/src/olympic/studio/applib/src/main.cpp
index e01454927..324cebcbf 100644
--- a/src/olympic/studio/applib/src/main.cpp
+++ b/src/olympic/studio/applib/src/main.cpp
@@ -28,12 +28,6 @@ class StudioUIDrawer: public turbine::gl::Drawer {
 		}
 };
 
-static int updateHandler(turbine::Context &ctx) noexcept {
-	auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
-	sctx->ui.update();
-	return 1000;
-}
-
 static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept {
 	auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
 	sctx->ui.handleKeyEvent(key, down);
@@ -45,7 +39,6 @@ static ox::Error runApp(
 		ox::UPtr<ox::FileSystem> &&fs) noexcept {
 	oxRequireM(ctx, turbine::init(std::move(fs), appName));
 	turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName);
-	turbine::setUpdateHandler(*ctx, updateHandler);
 	turbine::setKeyEventHandler(*ctx, keyEventHandler);
 	turbine::setRefreshWithin(*ctx, 0);
 	StudioUI ui(*ctx, projectDataDir);
diff --git a/src/olympic/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioapp.cpp
index 1c43eed25..dc74dd43a 100644
--- a/src/olympic/studio/applib/src/studioapp.cpp
+++ b/src/olympic/studio/applib/src/studioapp.cpp
@@ -78,10 +78,6 @@ StudioUI::StudioUI(turbine::Context &ctx, ox::StringView projectDataDir) noexcep
 	}
 }
 
-void StudioUI::update() noexcept {
-	m_taskRunner.update(m_ctx);
-}
-
 void StudioUI::handleKeyEvent(turbine::Key key, bool down) noexcept {
 	for (auto p : m_popups) {
 		if (p->isOpen()) {
@@ -124,6 +120,7 @@ void StudioUI::draw() noexcept {
 	}
 	ImGui::End();
 	handleKeyInput();
+	m_taskRunner.update(m_ctx);
 }
 
 void StudioUI::drawMenu() noexcept {
diff --git a/src/olympic/studio/applib/src/studioapp.hpp b/src/olympic/studio/applib/src/studioapp.hpp
index 5a32c7b98..30ae79915 100644
--- a/src/olympic/studio/applib/src/studioapp.hpp
+++ b/src/olympic/studio/applib/src/studioapp.hpp
@@ -50,8 +50,6 @@ class StudioUI: public ox::SignalHandler {
 	public:
 		explicit StudioUI(turbine::Context &ctx, ox::StringView projectDataDir) noexcept;
 
-		void update() noexcept;
-
 		void handleKeyEvent(turbine::Key, bool down) noexcept;
 
 		[[nodiscard]]