diff --git a/deps/nostalgia/src/olympic/studio/applib/src/main.cpp b/deps/nostalgia/src/olympic/studio/applib/src/main.cpp index f3dbe16..324cebc 100644 --- a/deps/nostalgia/src/olympic/studio/applib/src/main.cpp +++ b/deps/nostalgia/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(ctx); - sctx->ui.update(); - return 10 * 1000; -} - static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept { auto sctx = turbine::applicationData(ctx); sctx->ui.handleKeyEvent(key, down); @@ -45,7 +39,6 @@ static ox::Error runApp( ox::UPtr &&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/deps/nostalgia/src/olympic/studio/applib/src/studioapp.cpp b/deps/nostalgia/src/olympic/studio/applib/src/studioapp.cpp index f6a6b29..607627a 100644 --- a/deps/nostalgia/src/olympic/studio/applib/src/studioapp.cpp +++ b/deps/nostalgia/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/deps/nostalgia/src/olympic/studio/applib/src/studioapp.hpp b/deps/nostalgia/src/olympic/studio/applib/src/studioapp.hpp index 5a32c7b..30ae799 100644 --- a/deps/nostalgia/src/olympic/studio/applib/src/studioapp.hpp +++ b/deps/nostalgia/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]]