eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-28 23:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Removed public joystick locking API"

Browse source 
This reverts commit a515f51ac0.

We still need joystick locking to protect the gamepad mappings
This commit is contained in:
Sam Lantinga 2023-01-04 13:51:40 -08:00
parent 566a559beb
commit c823f26f18
6 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/SDL3/SDL_joystick.h
View file

@ -64,6 +64,9 @@ extern "C" {
/**
* The joystick structure used to identify an SDL joystick
*/
#ifdef SDL_THREAD_SAFETY_ANALYSIS
extern SDL_mutex *SDL_joystick_lock;
#endif
struct SDL_Joystick;
typedef struct SDL_Joystick SDL_Joystick;
@ -115,6 +118,24 @@ typedef enum
/* Function prototypes */
/**
* Locking for atomic access to the joystick API
*
* The SDL joystick functions are thread-safe, however you can lock the joysticks
* while processing to guarantee that the joystick list won't change and joystick
* and gamepad events will not be delivered.
*
* \since This function is available since SDL 3.0.0.
*/
extern DECLSPEC void SDLCALL SDL_LockJoysticks(void) SDL_ACQUIRE(SDL_joystick_lock);
/**
* Unlocking for atomic access to the joystick API
*
* \since This function is available since SDL 3.0.0.
*/
extern DECLSPEC void SDLCALL SDL_UnlockJoysticks(void) SDL_RELEASE(SDL_joystick_lock);
/**
* Get a list of currently connected joysticks.
*