Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-07-20 14:01:44 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into load_rom

Browse source
This commit is contained in:
wheremyfoodat 2023-07-27 12:31:41 +03:00
commit b39e32fce0
4 changed files with 64 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/emulator.hpp
View file

@ -56,7 +56,8 @@ class Emulator {
static constexpr u32 width = 400;
static constexpr u32 height = 240 * 2; // * 2 because 2 screens
ROMType romType = ROMType::None;
bool running = true;
bool running = false; // Is the emulator running a game?
bool programRunning = false; // Is the emulator program itself running?
#ifdef PANDA3DS_ENABLE_HTTP_SERVER
HttpServer httpServer;
@ -86,6 +87,10 @@ class Emulator {
void run();
void runFrame();
void resume(); // Resume the emulator
void pause(); // Pause the emulator
void togglePause();
bool loadROM(const std::filesystem::path& path);
bool loadNCSD(const std::filesystem::path& path, ROMType type);
bool loadELF(const std::filesystem::path& path);

4
include/httpserver.hpp
View file

@ -13,7 +13,7 @@
#include "helpers.hpp"
enum class HttpActionType { None, Screenshot, Key, LoadRom };
enum class HttpActionType { None, Screenshot, Key, TogglePause, Reset, LoadRom };
class Emulator;
namespace httplib {
@ -44,6 +44,8 @@ class HttpAction {
static std::unique_ptr<HttpAction> createScreenshotAction(DeferredResponseWrapper& response);
static std::unique_ptr<HttpAction> createKeyAction(uint32_t key, bool state);
static std::unique_ptr<HttpAction> createLoadRomAction(std::filesystem::path path, bool paused);
static std::unique_ptr<HttpAction> createTogglePauseAction();
static std::unique_ptr<HttpAction> createResetAction();
};
struct HttpServer {