starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

SDLInputSource: Log the joystick GUID as well (#3653)

Browse Source
This commit is contained in:
Davide Pesavento
2025-12-03 00:07:48 -05:00
committed by GitHub
parent 60dbc5ad3d
commit b42f26fbac
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/sdl_input_source.cpp
View File

@@ -903,7 +903,7 @@ SDL_Joystick* SDLInputSource::GetJoystickForDevice(std::string_view device)
return it->joystick;
}
SDLInputSource::ControllerDataVector::iterator SDLInputSource::GetControllerDataForJoystickId(int id)
SDLInputSource::ControllerDataVector::iterator SDLInputSource::GetControllerDataForJoystickId(SDL_JoystickID id)
{
return std::find_if(m_controllers.begin(), m_controllers.end(),
[id](const ControllerData& cd) { return cd.joystick_id == id; });
@@ -951,13 +951,10 @@ bool SDLInputSource::OpenDevice(int index, bool is_gamecontroller)
if (!gamepad && !joystick)
{
ERROR_LOG("Failed to open controller {}", index);
if (gamepad)
SDL_CloseGamepad(gamepad);
return false;
}
const int joystick_id = SDL_GetJoystickID(joystick);
const SDL_JoystickID joystick_id = SDL_GetJoystickID(joystick);
int player_id = gamepad ? SDL_GetGamepadPlayerIndex(gamepad) : SDL_GetJoystickPlayerIndex(joystick);
if (player_id < 0 || GetControllerDataForPlayerId(player_id) != m_controllers.end())
{
@@ -967,14 +964,17 @@ bool SDLInputSource::OpenDevice(int index, bool is_gamecontroller)
player_id = free_player_id;
}
char guid[33];
SDL_GUIDToString(SDL_GetJoystickGUID(joystick), guid, sizeof(guid));
const char* name = gamepad ? SDL_GetGamepadName(gamepad) : SDL_GetJoystickName(joystick);
if (!name)
name = "Unknown Device";
const SDL_PropertiesID properties = gamepad ? SDL_GetGamepadProperties(gamepad) : SDL_GetJoystickProperties(joystick);
VERBOSE_LOG("Opened {} {} (instance id {}, player id {}, guid {}): {}",
is_gamecontroller ? "game controller" : "joystick", index, joystick_id, player_id, guid, name);
VERBOSE_LOG("Opened {} {} (instance id {}, player id {}): {}", is_gamecontroller ? "game controller" : "joystick",
index, joystick_id, player_id, name);
const SDL_PropertiesID properties = gamepad ? SDL_GetGamepadProperties(gamepad) : SDL_GetJoystickProperties(joystick);
ControllerData cd = {};
cd.player_id = player_id;
@@ -1112,7 +1112,7 @@ bool SDLInputSource::OpenDevice(int index, bool is_gamecontroller)
return true;
}
bool SDLInputSource::CloseDevice(int joystick_index)
bool SDLInputSource::CloseDevice(SDL_JoystickID joystick_index)
{
auto it = GetControllerDataForJoystickId(joystick_index);
if (it == m_controllers.end())

6
src/util/sdl_input_source.h
View File

@@ -68,7 +68,7 @@ private:
SDL_Joystick* joystick;
u16 rumble_intensity[2];
int haptic_left_right_effect;
int joystick_id;
SDL_JoystickID joystick_id;
int player_id;
float last_touch_x;
float last_touch_y;
@@ -95,12 +95,12 @@ private:
void LoadSettings(const SettingsInterface& si);
void SetHints();
ControllerDataVector::iterator GetControllerDataForJoystickId(int id);
ControllerDataVector::iterator GetControllerDataForJoystickId(SDL_JoystickID id);
ControllerDataVector::iterator GetControllerDataForPlayerId(int id);
int GetFreePlayerId() const;
bool OpenDevice(int index, bool is_gamecontroller);
bool CloseDevice(int joystick_index);
bool CloseDevice(SDL_JoystickID joystick_index);
bool HandleGamepadAxisMotionEvent(const SDL_GamepadAxisEvent* ev);
bool HandleGamepadButtonEvent(const SDL_GamepadButtonEvent* ev);
bool HandleGamepadTouchpadEvent(const SDL_GamepadTouchpadEvent* ev);