ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change LidCommand to HotkeyMask so we can use it for other hotkeys without needing a billion variables

This commit is contained in:
Arisotura 2019-01-24 21:28:58 +01:00
parent 4bd96207fe
commit 86b894ca71
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libui_sdl/main.cpp
View File

@ -112,7 +112,8 @@ uiDrawMatrix BottomScreenTrans;
bool Touching = false; bool Touching = false;
u32 KeyInputMask; u32 KeyInputMask;
bool LidCommand, LidStatus; u32 HotkeyMask;
bool LidStatus;
SDL_Joystick* Joystick; SDL_Joystick* Joystick;
SDL_AudioDeviceID AudioDevice, MicDevice; SDL_AudioDeviceID AudioDevice, MicDevice;
@ -417,7 +418,7 @@ int EmuThreadFunc(void* burp)
ScreenDrawInited = false; ScreenDrawInited = false;
Touching = false; Touching = false;
KeyInputMask = 0xFFF; KeyInputMask = 0xFFF;
LidCommand = false; HotkeyMask = 0;
LidStatus = false; LidStatus = false;
MicCommand = 0; MicCommand = 0;
@ -509,7 +510,7 @@ int EmuThreadFunc(void* burp)
if (JoyButtonPressed(Config::HKJoyMapping[HK_Lid], njoybuttons, joybuttons, joyhat)) if (JoyButtonPressed(Config::HKJoyMapping[HK_Lid], njoybuttons, joybuttons, joyhat))
{ {
LidStatus = !LidStatus; LidStatus = !LidStatus;
LidCommand = true; HotkeyMask |= 0x1;
} }
if (JoyButtonHeld(Config::HKJoyMapping[HK_Mic], njoybuttons, joybuttons, joyhat)) if (JoyButtonHeld(Config::HKJoyMapping[HK_Mic], njoybuttons, joybuttons, joyhat))
@ -519,10 +520,10 @@ int EmuThreadFunc(void* burp)
} }
NDS::SetKeyMask(keymask & joymask); NDS::SetKeyMask(keymask & joymask);
if (LidCommand) if (HotkeyMask & 0x1)
{ {
NDS::SetLidClosed(LidStatus); NDS::SetLidClosed(LidStatus);
LidCommand = false; HotkeyMask &= ~0x1;
} }
// microphone input // microphone input
@ -783,7 +784,7 @@ int OnAreaKeyEvent(uiAreaHandler* handler, uiArea* area, uiAreaKeyEvent* evt)
if (evt->Scancode == Config::HKKeyMapping[HK_Lid]) if (evt->Scancode == Config::HKKeyMapping[HK_Lid])
{ {
LidStatus = !LidStatus; LidStatus = !LidStatus;
LidCommand = true; HotkeyMask |= 0x1;
} }
if (evt->Scancode == Config::HKKeyMapping[HK_Mic]) if (evt->Scancode == Config::HKKeyMapping[HK_Mic])
MicCommand |= 1; MicCommand |= 1;