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

Misc: Handle SDL2-SDL3 int->bool return type changes

This commit is contained in:
TheLastRar 2025-02-14 10:23:12 +00:00
parent 23af1c776c
commit 9e188aa0a0
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Host/SDLAudioStream.cpp
View File

@ -41,7 +41,7 @@ static bool InitializeSDLAudio(Error* error)
SDL_SetHint("SDL_AUDIO_DEVICE_APP_NAME", "PCSX2");
// May as well keep it alive until the process exits.
if (SDL_InitSubSystem(SDL_INIT_AUDIO) != 0)
if (!SDL_InitSubSystem(SDL_INIT_AUDIO))
{
Error::SetStringFmt(error, "SDL_InitSubSystem(SDL_INIT_AUDIO) failed: {}", SDL_GetError());
return false;

6
pcsx2/Input/SDLInputSource.cpp
View File

@ -296,7 +296,7 @@ void SDLInputSource::SetHints()
bool SDLInputSource::InitializeSubsystem()
{
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD | SDL_INIT_HAPTIC) < 0)
if (!SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD | SDL_INIT_HAPTIC))
{
Console.Error("SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMEPAD | SDL_INIT_HAPTIC) failed");
return false;
@ -738,7 +738,7 @@ bool SDLInputSource::OpenDevice(int index, bool is_gamecontroller)
SDL_GetNumJoystickAxes(joystick), SDL_GetNumJoystickButtons(joystick), num_hats);
}
cd.use_game_controller_rumble = (gcontroller && SDL_RumbleGamepad(gcontroller, 0, 0, 0) == 0);
cd.use_game_controller_rumble = (gcontroller && SDL_RumbleGamepad(gcontroller, 0, 0, 0));
if (cd.use_game_controller_rumble)
{
INFO_LOG("SDLInputSource: Rumble is supported on '{}' via gamecontroller", name);
@ -761,7 +761,7 @@ bool SDLInputSource::OpenDevice(int index, bool is_gamecontroller)
else
{
ERROR_LOG("SDLInputSource: Failed to create haptic left/right effect: {}", SDL_GetError());
if (SDL_HapticRumbleSupported(haptic) && SDL_InitHapticRumble(haptic) != 0)
if (SDL_HapticRumbleSupported(haptic) && SDL_InitHapticRumble(haptic))
{
cd.haptic = haptic;
}

18
pcsx2/USB/usb-pad/usb-pad-sdl-ff.cpp
View File

@ -199,7 +199,7 @@ namespace usb_pad
if (m_constant_effect.constant.level != new_level)
{
m_constant_effect.constant.level = new_level;
if (SDL_UpdateHapticEffect(m_haptic, m_constant_effect_id, &m_constant_effect) != 0)
if (!SDL_UpdateHapticEffect(m_haptic, m_constant_effect_id, &m_constant_effect))
Console.Warning("SDL_UpdateHapticEffect() for constant failed: %s", SDL_GetError());
}
@ -217,7 +217,7 @@ namespace usb_pad
// This is the reason for use_ffb_dropout_workaround.
if (!m_constant_effect_running || use_ffb_dropout_workaround)
{
if (SDL_RunHapticEffect(m_haptic, m_constant_effect_id, SDL_HAPTIC_INFINITY) == 0)
if (SDL_RunHapticEffect(m_haptic, m_constant_effect_id, SDL_HAPTIC_INFINITY))
m_constant_effect_running = true;
else
Console.Error("SDL_RunHapticEffect() for constant failed: %s", SDL_GetError());
@ -248,12 +248,12 @@ namespace usb_pad
m_spring_effect.condition.deadband[0] = ClampU16(ff.u.condition.deadband);
m_spring_effect.condition.center[0] = ClampS16(ff.u.condition.center);
if (SDL_UpdateHapticEffect(m_haptic, m_spring_effect_id, &m_spring_effect) != 0)
if (!SDL_UpdateHapticEffect(m_haptic, m_spring_effect_id, &m_spring_effect))
Console.Warning("SDL_UpdateHapticEffect() for spring failed: %s", SDL_GetError());
if (!m_spring_effect_running)
{
if (SDL_RunHapticEffect(m_haptic, m_spring_effect_id, SDL_HAPTIC_INFINITY) == 0)
if (SDL_RunHapticEffect(m_haptic, m_spring_effect_id, SDL_HAPTIC_INFINITY))
m_spring_effect_running = true;
else
Console.Error("SDL_RunHapticEffect() for spring failed: %s", SDL_GetError());
@ -272,12 +272,12 @@ namespace usb_pad
m_damper_effect.condition.deadband[0] = ClampU16(ff.u.condition.deadband);
m_damper_effect.condition.center[0] = ClampS16(ff.u.condition.center);
if (SDL_UpdateHapticEffect(m_haptic, m_damper_effect_id, &m_damper_effect) != 0)
if (!SDL_UpdateHapticEffect(m_haptic, m_damper_effect_id, &m_damper_effect))
Console.Warning("SDL_UpdateHapticEffect() for damper failed: %s", SDL_GetError());
if (!m_damper_effect_running)
{
if (SDL_RunHapticEffect(m_haptic, m_damper_effect_id, SDL_HAPTIC_INFINITY) == 0)
if (SDL_RunHapticEffect(m_haptic, m_damper_effect_id, SDL_HAPTIC_INFINITY))
m_damper_effect_running = true;
else
Console.Error("SDL_RunHapticEffect() for damper failed: %s", SDL_GetError());
@ -296,9 +296,9 @@ namespace usb_pad
m_friction_effect.condition.deadband[0] = ClampU16(ff.u.condition.deadband);
m_friction_effect.condition.center[0] = ClampS16(ff.u.condition.center);
if (SDL_UpdateHapticEffect(m_haptic, m_friction_effect_id, &m_friction_effect) != 0)
if (!SDL_UpdateHapticEffect(m_haptic, m_friction_effect_id, &m_friction_effect))
{
if (!m_friction_effect_running && SDL_RunHapticEffect(m_haptic, m_friction_effect_id, SDL_HAPTIC_INFINITY) == 0)
if (!m_friction_effect_running && SDL_RunHapticEffect(m_haptic, m_friction_effect_id, SDL_HAPTIC_INFINITY))
m_friction_effect_running = true;
else
Console.Error("SDL_UpdateHapticEffect() for friction failed: %s", SDL_GetError());
@ -309,7 +309,7 @@ namespace usb_pad
{
if (m_autocenter_supported)
{
if (SDL_SetHapticAutocenter(m_haptic, value) != 0)
if (!SDL_SetHapticAutocenter(m_haptic, value))
Console.Warning("SDL_SetHapticAutocenter() failed: %s", SDL_GetError());
}
}