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

fix bugs, make it more responsive

This commit is contained in:
Arisotura 2019-06-11 23:48:49 +02:00
parent bfc12a038e
commit 82f4f4fdcb
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libui_sdl/DlgInputConfig.cpp
View File

@ -54,7 +54,7 @@ typedef struct
uiButton* pollbtn; uiButton* pollbtn;
SDL_TimerID timer; SDL_TimerID timer;
Sint16 axes_rest[16]; int axes_rest[16];
} InputDlgData; } InputDlgData;
@ -266,8 +266,6 @@ Uint32 JoyPoll(Uint32 interval, void* param)
return 0; return 0;
} }
SDL_JoystickUpdate();
SDL_Joystick* joy = Joystick; SDL_Joystick* joy = Joystick;
if (!joy) if (!joy)
{ {
@ -320,8 +318,8 @@ Uint32 JoyPoll(Uint32 interval, void* param)
for (int i = 0; i < naxes; i++) for (int i = 0; i < naxes; i++)
{ {
Sint16 axisval = SDL_JoystickGetAxis(joy, i); Sint16 axisval = SDL_JoystickGetAxis(joy, i);
Sint16 diff = abs(axisval - dlg->axes_rest[i]); int diff = abs(axisval - dlg->axes_rest[i]);
printf("axis%d: val=%d, diff=%d\n", i, axisval, diff);
if (dlg->axes_rest[i] < -16384 && axisval >= 0) if (dlg->axes_rest[i] < -16384 && axisval >= 0)
{ {
dlg->joymap[id] = (oldmap & 0xFFFF) | 0x10000 | (2 << 20) | (i << 24); dlg->joymap[id] = (oldmap & 0xFFFF) | 0x10000 | (2 << 20) | (i << 24);
@ -380,7 +378,6 @@ void OnJoyStartConfig(uiButton* btn, void* data)
return; return;
} }
SDL_JoystickUpdate();
int naxes = SDL_JoystickNumAxes(Joystick); int naxes = SDL_JoystickNumAxes(Joystick);
if (naxes > 16) naxes = 16; if (naxes > 16) naxes = 16;
for (int a = 0; a < naxes; a++) for (int a = 0; a < naxes; a++)

4
src/libui_sdl/main.cpp
View File

@ -788,12 +788,12 @@ int EmuThreadFunc(void* burp)
while (EmuRunning != 0) while (EmuRunning != 0)
{ {
SDL_JoystickUpdate();
if (EmuRunning == 1) if (EmuRunning == 1)
{ {
EmuStatus = 1; EmuStatus = 1;
SDL_JoystickUpdate();
if (Joystick) if (Joystick)
{ {
if (!SDL_JoystickGetAttached(Joystick)) if (!SDL_JoystickGetAttached(Joystick))