From 420abd26d0339cad7b3e29602eb708455c1ea53d Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 27 Jul 2023 13:49:13 +0300 Subject: [PATCH] Format --- include/httpserver.hpp | 2 +- src/httpserver.cpp | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/httpserver.hpp b/include/httpserver.hpp index 13caf3e4..08e98bbf 100644 --- a/include/httpserver.hpp +++ b/include/httpserver.hpp @@ -42,7 +42,7 @@ class HttpAction { HttpActionType getType() const { return type; } static std::unique_ptr createScreenshotAction(DeferredResponseWrapper& response); - static std::unique_ptr createKeyAction(uint32_t key, bool state); + static std::unique_ptr createKeyAction(u32 key, bool state); static std::unique_ptr createLoadRomAction(DeferredResponseWrapper& response, const std::filesystem::path& path, bool paused); static std::unique_ptr createTogglePauseAction(); static std::unique_ptr createResetAction(); diff --git a/src/httpserver.cpp b/src/httpserver.cpp index ca04d3d6..cccd69d9 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -171,9 +171,9 @@ void HttpServer::startHttpServer() { DeferredResponseWrapper wrapper(response); std::unique_lock lock(wrapper.mutex); pushAction(HttpAction::createLoadRomAction(wrapper, romPath, paused)); - response.set_content("ok", "text/plain"); + response.set_content("ok", "text/plain"); wrapper.cv.wait(lock, [&wrapper] { return wrapper.ready; }); - }); + }); server->Get("/togglepause", [this](const httplib::Request&, httplib::Response& response) { pushAction(HttpAction::createTogglePauseAction()); @@ -245,11 +245,7 @@ void HttpServer::processActions() { DeferredResponseWrapper& response = loadRomAction->getResponse(); bool loaded = emulator->loadROM(loadRomAction->getPath()); - if (!loaded) { - response.inner_response.set_content("error", "text/plain"); - } else { - response.inner_response.set_content("ok", "text/plain"); - } + response.inner_response.set_content(loaded ? "ok" : "error", "text/plain"); std::unique_lock lock(response.mutex); response.ready = true; @@ -266,7 +262,10 @@ void HttpServer::processActions() { break; } - case HttpActionType::TogglePause: emulator->togglePause(); paused ^= true; break; + case HttpActionType::TogglePause: + emulator->togglePause(); + paused = !paused; + break; case HttpActionType::Reset: emulator->reset(Emulator::ReloadOption::Reload); break; default: break;