Skip to content

Commit 710f85f

Browse files
IsaacMarovitzIsaacMarovitz
committed
Correct EmuEvent problems
1 parent 2d77eb8 commit 710f85f

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

‎core/debug/gdb_server.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,20 +863,20 @@ class GdbServer
863863
agentInterrupt();
864864
}
865865

866-
static void emuEventCallback(Event event, void *arg)
866+
static void emuEventCallback(EmuEvent event, void *arg)
867867
{
868868
GdbServer *gdbServer = static_cast<GdbServer*>(arg);
869869
switch (event)
870870
{
871-
case Event::Resume:
871+
case EmuEvent::Resume:
872872
try {
873873
if (!gdbServer->isRunning())
874874
gdbServer->run();
875875
} catch (const GdbServer::Error& e) {
876876
ERROR_LOG(COMMON, "%s", e.what());
877877
}
878878
break;
879-
case Event::Terminate:
879+
case EmuEvent::Terminate:
880880
gdbServer->stop();
881881
break;
882882
default:

‎core/lua/lua.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ using namespace luabridge;
4242
static std::recursive_mutex mutex;
4343
using lock_guard = std::lock_guard<std::recursive_mutex>;
4444

45-
static void emuEventCallback(Event event, void *)
45+
static void emuEventCallback(EmuEvent event, void *)
4646
{
4747
if (L == nullptr || settings.raHardcoreMode)
4848
return;
@@ -54,28 +54,28 @@ static void emuEventCallback(Event event, void *)
5454
const char *key = nullptr;
5555
switch (event)
5656
{
57-
case Event::Start:
57+
case EmuEvent::Start:
5858
key = "start";
5959
break;
60-
case Event::Resume:
60+
case EmuEvent::Resume:
6161
key = "resume";
6262
break;
63-
case Event::Pause:
63+
case EmuEvent::Pause:
6464
key = "pause";
6565
break;
66-
case Event::Terminate:
66+
case EmuEvent::Terminate:
6767
key = "terminate";
6868
break;
69-
case Event::LoadState:
69+
case EmuEvent::LoadState:
7070
key = "loadState";
7171
break;
72-
case Event::VBlank:
72+
case EmuEvent::VBlank:
7373
key = "vblank";
7474
break;
75-
case Event::Network:
75+
case EmuEvent::Network:
7676
key = "network";
7777
break;
78-
case Event::DiskChange:
78+
case EmuEvent::DiskChange:
7979
key = "diskChange";
8080
break;
8181
}
@@ -626,13 +626,13 @@ void init()
626626
L = luaL_newstate();
627627
luaL_openlibs(L);
628628
luaRegister(L);
629-
EventManager::listen(Event::Start, emuEventCallback);
630-
EventManager::listen(Event::Resume, emuEventCallback);
631-
EventManager::listen(Event::Pause, emuEventCallback);
632-
EventManager::listen(Event::Terminate, emuEventCallback);
633-
EventManager::listen(Event::LoadState, emuEventCallback);
634-
EventManager::listen(Event::VBlank, emuEventCallback);
635-
EventManager::listen(Event::Network, emuEventCallback);
629+
EventManager::listen(EmuEvent::Start, emuEventCallback);
630+
EventManager::listen(EmuEvent::Resume, emuEventCallback);
631+
EventManager::listen(EmuEvent::Pause, emuEventCallback);
632+
EventManager::listen(EmuEvent::Terminate, emuEventCallback);
633+
EventManager::listen(EmuEvent::LoadState, emuEventCallback);
634+
EventManager::listen(EmuEvent::VBlank, emuEventCallback);
635+
EventManager::listen(EmuEvent::Network, emuEventCallback);
636636

637637
doExec(initFile);
638638
}
@@ -641,13 +641,13 @@ void term()
641641
{
642642
if (L == nullptr)
643643
return;
644-
EventManager::unlisten(Event::Start, emuEventCallback);
645-
EventManager::unlisten(Event::Resume, emuEventCallback);
646-
EventManager::unlisten(Event::Pause, emuEventCallback);
647-
EventManager::unlisten(Event::Terminate, emuEventCallback);
648-
EventManager::unlisten(Event::LoadState, emuEventCallback);
649-
EventManager::unlisten(Event::VBlank, emuEventCallback);
650-
EventManager::unlisten(Event::Network, emuEventCallback);
644+
EventManager::unlisten(EmuEvent::Start, emuEventCallback);
645+
EventManager::unlisten(EmuEvent::Resume, emuEventCallback);
646+
EventManager::unlisten(EmuEvent::Pause, emuEventCallback);
647+
EventManager::unlisten(EmuEvent::Terminate, emuEventCallback);
648+
EventManager::unlisten(EmuEvent::LoadState, emuEventCallback);
649+
EventManager::unlisten(EmuEvent::VBlank, emuEventCallback);
650+
EventManager::unlisten(EmuEvent::Network, emuEventCallback);
651651
lua_close(L);
652652
L = nullptr;
653653
}

‎core/ui/discord.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ class DiscordPresence
3131
public:
3232
DiscordPresence()
3333
{
34-
EventManager::listen(Event::Start, handleEmuEvent, this);
35-
EventManager::listen(Event::Terminate, handleEmuEvent, this);
36-
EventManager::listen(Event::Resume, handleEmuEvent, this);
37-
EventManager::listen(Event::Network, handleEmuEvent, this);
34+
EventManager::listen(EmuEvent::Start, handleEmuEvent, this);
35+
EventManager::listen(EmuEvent::Terminate, handleEmuEvent, this);
36+
EventManager::listen(EmuEvent::Resume, handleEmuEvent, this);
37+
EventManager::listen(EmuEvent::Network, handleEmuEvent, this);
3838
}
3939

4040
~DiscordPresence()
4141
{
4242
shutdown();
43-
EventManager::unlisten(Event::Start, handleEmuEvent, this);
44-
EventManager::unlisten(Event::Terminate, handleEmuEvent, this);
45-
EventManager::unlisten(Event::Resume, handleEmuEvent, this);
46-
EventManager::unlisten(Event::Network, handleEmuEvent, this);
43+
EventManager::unlisten(EmuEvent::Start, handleEmuEvent, this);
44+
EventManager::unlisten(EmuEvent::Terminate, handleEmuEvent, this);
45+
EventManager::unlisten(EmuEvent::Resume, handleEmuEvent, this);
46+
EventManager::unlisten(EmuEvent::Network, handleEmuEvent, this);
4747
}
4848

4949
private:
@@ -85,21 +85,21 @@ class DiscordPresence
8585
Discord_UpdatePresence(&discordPresence);
8686
}
8787

88-
static void handleEmuEvent(Event event, void *p)
88+
static void handleEmuEvent(EmuEvent event, void *p)
8989
{
9090
if (settings.naomi.slave || settings.naomi.drivingSimSlave != 0)
9191
return;
9292
DiscordPresence *inst = (DiscordPresence *)p;
9393
switch (event)
9494
{
95-
case Event::Start:
95+
case EmuEvent::Start:
9696
inst->startTimestamp = time(nullptr);
9797
[[fallthrough]];
98-
case Event::Network:
98+
case EmuEvent::Network:
9999
if (config::DiscordPresence)
100100
inst->sendPresence();
101101
break;
102-
case Event::Resume:
102+
case EmuEvent::Resume:
103103
if (config::DiscordPresence && !inst->initialized)
104104
// Discord presence enabled
105105
inst->sendPresence();
@@ -110,7 +110,7 @@ class DiscordPresence
110110
inst->shutdown();
111111
}
112112
break;
113-
case Event::Terminate:
113+
case EmuEvent::Terminate:
114114
if (inst->initialized)
115115
Discord_ClearPresence();
116116
inst->startTimestamp = 0;

‎shell/android-studio/flycast/src/main/jni/src/Android.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ extern jmethodID showScreenKeyboardMid;
5555
static jmethodID onGameStateChangeMid;
5656
extern jmethodID setVGamepadEditModeMid;
5757

58-
static void emuEventCallback(Event event, void *)
58+
static void emuEventCallback(EmuEvent event, void *)
5959
{
6060
switch (event)
6161
{
62-
case Event::Pause:
62+
case EmuEvent::Pause:
6363
game_started = false;
6464
if (g_activity != nullptr)
6565
jni::env()->CallVoidMethod(g_activity, onGameStateChangeMid, false);
6666
break;
67-
case Event::Resume:
67+
case EmuEvent::Resume:
6868
game_started = true;
6969
if (g_activity != nullptr)
7070
jni::env()->CallVoidMethod(g_activity, onGameStateChangeMid, true);

0 commit comments

Comments
 (0)