mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-01-01 12:46:01 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

sdl: Fix use of functions that now return SDL_bool (#1160)

Browse source
This commit is contained in:
squidbus 2024-09-29 20:47:55 -07:00 committed by GitHub
parent d9f287eaa2
commit 398019867b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/audio_core/sdl_audio.cpp
View file

@ -101,14 +101,14 @@ s32 SDLAudio::AudioOutOutput(s32 handle, const void* ptr) {
return 0; return 0;
} }
// TODO mixing channels // TODO mixing channels
int result = SDL_PutAudioStreamData(port.stream, ptr, SDL_bool result = SDL_PutAudioStreamData(
port.samples_num * port.sample_size * port.channels_num); port.stream, ptr, port.samples_num * port.sample_size * port.channels_num);
// TODO find a correct value 8192 is estimated // TODO find a correct value 8192 is estimated
while (SDL_GetAudioStreamAvailable(port.stream) > 65536) { while (SDL_GetAudioStreamAvailable(port.stream) > 65536) {
SDL_Delay(0); SDL_Delay(0);
} }
return result; return result ? ORBIS_OK : -1;
} }
bool SDLAudio::AudioOutSetVolume(s32 handle, s32 bitflag, s32* volume) { bool SDLAudio::AudioOutSetVolume(s32 handle, s32 bitflag, s32* volume) {

2
src/input/controller.cpp
View file

@ -127,7 +127,7 @@ void GameController::SetLightBarRGB(u8 r, u8 g, u8 b) {
bool GameController::SetVibration(u8 smallMotor, u8 largeMotor) { bool GameController::SetVibration(u8 smallMotor, u8 largeMotor) {
if (m_sdl_gamepad != nullptr) { if (m_sdl_gamepad != nullptr) {
return SDL_RumbleGamepad(m_sdl_gamepad, (smallMotor / 255.0f) * 0xFFFF, return SDL_RumbleGamepad(m_sdl_gamepad, (smallMotor / 255.0f) * 0xFFFF,
(largeMotor / 255.0f) * 0xFFFF, -1) == 0; (largeMotor / 255.0f) * 0xFFFF, -1);
} }
return true; return true;
} }

2
src/sdl_window.cpp
View file

@ -23,7 +23,7 @@ namespace Frontend {
WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_, WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_,
std::string_view window_title) std::string_view window_title)
: width{width_}, height{height_}, controller{controller_} { : width{width_}, height{height_}, controller{controller_} {
if (SDL_Init(SDL_INIT_VIDEO) < 0) { if (!SDL_Init(SDL_INIT_VIDEO)) {
UNREACHABLE_MSG("Failed to initialize SDL video subsystem: {}", SDL_GetError()); UNREACHABLE_MSG("Failed to initialize SDL video subsystem: {}", SDL_GetError());
} }
SDL_InitSubSystem(SDL_INIT_AUDIO); SDL_InitSubSystem(SDL_INIT_AUDIO);