mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-09-29 14:38:29 +00:00
Use SDL_bool instead an int return code in the SDL API
Most SDL functions used to indicate success or failure using an int return code. These functions have been changed to return SDL_bool. Here is a coccinelle patch to change code that previously compared the return value to 0 and changes it to a boolean test: @ bool_return_type @ identifier func =~ "^(SDL_AddEventWatch|SDL_AddHintCallback|SDL_AddSurfaceAlternateImage|SDL_AddVulkanRenderSemaphores|SDL_BindAudioStream|SDL_BindAudioStreams|SDL_BlitSurface|SDL_BlitSurface9Grid|SDL_BlitSurfaceScaled|SDL_BlitSurfaceTiled|SDL_BlitSurfaceTiledWithScale|SDL_BlitSurfaceUnchecked|SDL_BlitSurfaceUncheckedScaled|SDL_CaptureMouse|SDL_ClearAudioStream|SDL_ClearClipboardData|SDL_ClearComposition|SDL_ClearError|SDL_ClearProperty|SDL_ClearSurface|SDL_CloseIO|SDL_CloseStorage|SDL_ConvertAudioSamples|SDL_ConvertEventToRenderCoordinates|SDL_ConvertPixels|SDL_ConvertPixelsAndColorspace|SDL_CopyFile|SDL_CopyProperties|SDL_CopyStorageFile|SDL_CreateDirectory|SDL_CreateStorageDirectory|SDL_CreateWindowAndRenderer|SDL_DateTimeToTime|SDL_DestroyWindowSurface|SDL_DetachVirtualJoystick|SDL_DisableScreenSaver|SDL_EnableScreenSaver|SDL_EnumerateDirectory|SDL_EnumerateProperties|SDL_EnumerateStorageDirectory|SDL_FillSurfaceRect|SDL_FillSurfaceRects|SDL_FlashWindow|SDL_FlipSurface|SDL_FlushAudioStream|SDL_FlushRenderer|SDL_GL_DestroyContext|SDL_GL_GetAttribute|SDL_GL_GetSwapInterval|SDL_GL_LoadLibrary|SDL_GL_MakeCurrent|SDL_GL_SetAttribute|SDL_GL_SetSwapInterval|SDL_GL_SwapWindow|SDL_GetAudioDeviceFormat|SDL_GetAudioStreamFormat|SDL_GetCameraFormat|SDL_GetClosestFullscreenDisplayMode|SDL_GetCurrentRenderOutputSize|SDL_GetCurrentTime|SDL_GetDXGIOutputInfo|SDL_GetDateTimeLocalePreferences|SDL_GetDisplayBounds|SDL_GetDisplayUsableBounds|SDL_GetGDKDefaultUser|SDL_GetGDKTaskQueue|SDL_GetGamepadSensorData|SDL_GetGamepadTouchpadFinger|SDL_GetHapticEffectStatus|SDL_GetJoystickBall|SDL_GetMasksForPixelFormat|SDL_GetPathInfo|SDL_GetRectUnion|SDL_GetRectUnionFloat|SDL_GetRenderClipRect|SDL_GetRenderColorScale|SDL_GetRenderDrawBlendMode|SDL_GetRenderDrawColor|SDL_GetRenderDrawColorFloat|SDL_GetRenderLogicalPresentation|SDL_GetRenderLogicalPresentationRect|SDL_GetRenderOutputSize|SDL_GetRenderSafeArea|SDL_GetRenderScale|SDL_GetRenderVSync|SDL_GetRenderViewport|SDL_GetSensorData|SDL_GetStorageFileSize|SDL_GetStoragePathInfo|SDL_GetSurfaceAlphaMod|SDL_GetSurfaceBlendMode|SDL_GetSurfaceClipRect|SDL_GetSurfaceColorKey|SDL_GetSurfaceColorMod|SDL_GetTextInputArea|SDL_GetTextureAlphaMod|SDL_GetTextureAlphaModFloat|SDL_GetTextureBlendMode|SDL_GetTextureColorMod|SDL_GetTextureColorModFloat|SDL_GetTextureScaleMode|SDL_GetTextureSize|SDL_GetWindowAspectRatio|SDL_GetWindowBordersSize|SDL_GetWindowMaximumSize|SDL_GetWindowMinimumSize|SDL_GetWindowPosition|SDL_GetWindowRelativeMouseMode|SDL_GetWindowSafeArea|SDL_GetWindowSize|SDL_GetWindowSizeInPixels|SDL_GetWindowSurfaceVSync|SDL_HideCursor|SDL_HideWindow|SDL_Init|SDL_InitHapticRumble|SDL_InitSubSystem|SDL_LoadWAV|SDL_LoadWAV_IO|SDL_LockAudioStream|SDL_LockProperties|SDL_LockSurface|SDL_LockTexture|SDL_LockTextureToSurface|SDL_MaximizeWindow|SDL_MinimizeWindow|SDL_MixAudio|SDL_OpenURL|SDL_OutOfMemory|SDL_PauseAudioDevice|SDL_PauseAudioStreamDevice|SDL_PauseHaptic|SDL_PlayHapticRumble|SDL_PremultiplyAlpha|SDL_PremultiplySurfaceAlpha|SDL_PushEvent|SDL_PutAudioStreamData|SDL_RaiseWindow|SDL_ReadStorageFile|SDL_ReadSurfacePixel|SDL_ReadSurfacePixelFloat|SDL_RegisterApp|SDL_ReloadGamepadMappings|SDL_RemovePath|SDL_RemoveStoragePath|SDL_RemoveTimer|SDL_RenamePath|SDL_RenameStoragePath|SDL_RenderClear|SDL_RenderCoordinatesFromWindow|SDL_RenderCoordinatesToWindow|SDL_RenderFillRect|SDL_RenderFillRects|SDL_RenderGeometry|SDL_RenderGeometryRaw|SDL_RenderLine|SDL_RenderLines|SDL_RenderPoint|SDL_RenderPoints|SDL_RenderPresent|SDL_RenderRect|SDL_RenderRects|SDL_RenderTexture|SDL_RenderTexture9Grid|SDL_RenderTextureRotated|SDL_RenderTextureTiled|SDL_RequestAndroidPermission|SDL_RestoreWindow|SDL_ResumeAudioDevice|SDL_ResumeAudioStreamDevice|SDL_ResumeHaptic|SDL_RumbleGamepad|SDL_RumbleGamepadTriggers|SDL_RumbleJoystick|SDL_RumbleJoystickTriggers|SDL_RunHapticEffect|SDL_SaveBMP|SDL_SaveBMP_IO|SDL_SendAndroidMessage|SDL_SendGamepadEffect|SDL_SendJoystickEffect|SDL_SendJoystickVirtualSensorData|SDL_SetAppMetadata|SDL_SetAppMetadataProperty|SDL_SetAudioDeviceGain|SDL_SetAudioPostmixCallback|SDL_SetAudioStreamFormat|SDL_SetAudioStreamFrequencyRatio|SDL_SetAudioStreamGain|SDL_SetAudioStreamGetCallback|SDL_SetAudioStreamInputChannelMap|SDL_SetAudioStreamOutputChannelMap|SDL_SetAudioStreamPutCallback|SDL_SetBooleanProperty|SDL_SetClipboardData|SDL_SetClipboardText|SDL_SetCursor|SDL_SetFloatProperty|SDL_SetGamepadLED|SDL_SetGamepadMapping|SDL_SetGamepadPlayerIndex|SDL_SetGamepadSensorEnabled|SDL_SetHapticAutocenter|SDL_SetHapticGain|SDL_SetJoystickLED|SDL_SetJoystickPlayerIndex|SDL_SetJoystickVirtualAxis|SDL_SetJoystickVirtualBall|SDL_SetJoystickVirtualButton|SDL_SetJoystickVirtualHat|SDL_SetJoystickVirtualTouchpad|SDL_SetLinuxThreadPriority|SDL_SetLinuxThreadPriorityAndPolicy|SDL_SetLogPriorityPrefix|SDL_SetMemoryFunctions|SDL_SetNumberProperty|SDL_SetPaletteColors|SDL_SetPointerProperty|SDL_SetPointerPropertyWithCleanup|SDL_SetPrimarySelectionText|SDL_SetRenderClipRect|SDL_SetRenderColorScale|SDL_SetRenderDrawBlendMode|SDL_SetRenderDrawColor|SDL_SetRenderDrawColorFloat|SDL_SetRenderLogicalPresentation|SDL_SetRenderScale|SDL_SetRenderTarget|SDL_SetRenderVSync|SDL_SetRenderViewport|SDL_SetScancodeName|SDL_SetStringProperty|SDL_SetSurfaceAlphaMod|SDL_SetSurfaceBlendMode|SDL_SetSurfaceColorKey|SDL_SetSurfaceColorMod|SDL_SetSurfaceColorspace|SDL_SetSurfacePalette|SDL_SetSurfaceRLE|SDL_SetTLS|SDL_SetTextInputArea|SDL_SetTextureAlphaMod|SDL_SetTextureAlphaModFloat|SDL_SetTextureBlendMode|SDL_SetTextureColorMod|SDL_SetTextureColorModFloat|SDL_SetTextureScaleMode|SDL_SetThreadPriority|SDL_SetWindowAlwaysOnTop|SDL_SetWindowAspectRatio|SDL_SetWindowBordered|SDL_SetWindowFocusable|SDL_SetWindowFullscreen|SDL_SetWindowFullscreenMode|SDL_SetWindowHitTest|SDL_SetWindowIcon|SDL_SetWindowKeyboardGrab|SDL_SetWindowMaximumSize|SDL_SetWindowMinimumSize|SDL_SetWindowModalFor|SDL_SetWindowMouseGrab|SDL_SetWindowMouseRect|SDL_SetWindowOpacity|SDL_SetWindowPosition|SDL_SetWindowRelativeMouseMode|SDL_SetWindowResizable|SDL_SetWindowShape|SDL_SetWindowSize|SDL_SetWindowSurfaceVSync|SDL_SetWindowTitle|SDL_SetiOSAnimationCallback|SDL_ShowAndroidToast|SDL_ShowCursor|SDL_ShowMessageBox|SDL_ShowSimpleMessageBox|SDL_ShowWindow|SDL_ShowWindowSystemMenu|SDL_StartTextInput|SDL_StartTextInputWithProperties|SDL_StopHapticEffect|SDL_StopHapticEffects|SDL_StopHapticRumble|SDL_StopTextInput|SDL_SyncWindow|SDL_TimeToDateTime|SDL_TryLockMutex|SDL_TryLockRWLockForReading|SDL_TryLockRWLockForWriting|SDL_TryWaitSemaphore|SDL_UnlockAudioStream|SDL_UpdateHapticEffect|SDL_UpdateNVTexture|SDL_UpdateTexture|SDL_UpdateWindowSurface|SDL_UpdateWindowSurfaceRects|SDL_UpdateYUVTexture|SDL_Vulkan_CreateSurface|SDL_Vulkan_LoadLibrary|SDL_WaitConditionTimeout|SDL_WaitSemaphoreTimeout|SDL_WarpMouseGlobal|SDL_WriteStorageFile|SDL_WriteSurfacePixel|SDL_WriteSurfacePixelFloat)$"; @@ ( func( ... ) - == 0 | - func( + !func( ... ) - < 0 | - func( + !func( ... ) - != 0 | - func( + !func( ... ) - == -1 )
This commit is contained in:
Sam Lantinga
@@ -57,11 +57,11 @@ static int SDL_sensors_locked;
|
||||
static bool SDL_sensors_initialized;
|
||||
static SDL_Sensor *SDL_sensors SDL_GUARDED_BY(SDL_sensor_lock) = NULL;
|
||||
|
||||
#define CHECK_SENSOR_MAGIC(sensor, retval) \
|
||||
#define CHECK_SENSOR_MAGIC(sensor, result) \
|
||||
if (!SDL_ObjectValid(sensor, SDL_OBJECT_TYPE_SENSOR)) { \
|
||||
SDL_InvalidParamError("sensor"); \
|
||||
SDL_UnlockSensors(); \
|
||||
return retval; \
|
||||
return result; \
|
||||
}
|
||||
|
||||
bool SDL_SensorsInitialized(void)
|
||||
@@ -120,33 +120,34 @@ void SDL_AssertSensorsLocked(void)
|
||||
SDL_assert(SDL_SensorsLocked());
|
||||
}
|
||||
|
||||
int SDL_InitSensors(void)
|
||||
bool SDL_InitSensors(void)
|
||||
{
|
||||
int i, status;
|
||||
int i;
|
||||
bool status;
|
||||
|
||||
// Create the sensor list lock
|
||||
if (SDL_sensor_lock == NULL) {
|
||||
SDL_sensor_lock = SDL_CreateMutex();
|
||||
}
|
||||
|
||||
if (SDL_InitSubSystem(SDL_INIT_EVENTS) < 0) {
|
||||
return -1;
|
||||
if (!SDL_InitSubSystem(SDL_INIT_EVENTS)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
SDL_LockSensors();
|
||||
|
||||
SDL_sensors_initialized = true;
|
||||
|
||||
status = -1;
|
||||
status = false;
|
||||
for (i = 0; i < SDL_arraysize(SDL_sensor_drivers); ++i) {
|
||||
if (SDL_sensor_drivers[i]->Init() >= 0) {
|
||||
status = 0;
|
||||
if (SDL_sensor_drivers[i]->Init()) {
|
||||
status = true;
|
||||
}
|
||||
}
|
||||
|
||||
SDL_UnlockSensors();
|
||||
|
||||
if (status < 0) {
|
||||
if (!status) {
|
||||
SDL_QuitSensors();
|
||||
}
|
||||
|
||||
@@ -331,7 +332,7 @@ SDL_Sensor *SDL_OpenSensor(SDL_SensorID instance_id)
|
||||
sensor->type = driver->GetDeviceType(device_index);
|
||||
sensor->non_portable_type = driver->GetDeviceNonPortableType(device_index);
|
||||
|
||||
if (driver->Open(sensor, device_index) < 0) {
|
||||
if (!driver->Open(sensor, device_index)) {
|
||||
SDL_SetObjectValid(sensor, SDL_OBJECT_TYPE_SENSOR, false);
|
||||
SDL_free(sensor);
|
||||
SDL_UnlockSensors();
|
||||
@@ -380,7 +381,7 @@ SDL_Sensor *SDL_GetSensorFromID(SDL_SensorID instance_id)
|
||||
*/
|
||||
SDL_PropertiesID SDL_GetSensorProperties(SDL_Sensor *sensor)
|
||||
{
|
||||
SDL_PropertiesID retval;
|
||||
SDL_PropertiesID result;
|
||||
|
||||
SDL_LockSensors();
|
||||
{
|
||||
@@ -389,11 +390,11 @@ SDL_PropertiesID SDL_GetSensorProperties(SDL_Sensor *sensor)
|
||||
if (sensor->props == 0) {
|
||||
sensor->props = SDL_CreateProperties();
|
||||
}
|
||||
retval = sensor->props;
|
||||
result = sensor->props;
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return retval;
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -401,17 +402,17 @@ SDL_PropertiesID SDL_GetSensorProperties(SDL_Sensor *sensor)
|
||||
*/
|
||||
const char *SDL_GetSensorName(SDL_Sensor *sensor)
|
||||
{
|
||||
const char *retval;
|
||||
const char *result;
|
||||
|
||||
SDL_LockSensors();
|
||||
{
|
||||
CHECK_SENSOR_MAGIC(sensor, NULL);
|
||||
|
||||
retval = SDL_GetPersistentString(sensor->name);
|
||||
result = SDL_GetPersistentString(sensor->name);
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return retval;
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -419,17 +420,17 @@ const char *SDL_GetSensorName(SDL_Sensor *sensor)
|
||||
*/
|
||||
SDL_SensorType SDL_GetSensorType(SDL_Sensor *sensor)
|
||||
{
|
||||
SDL_SensorType retval;
|
||||
SDL_SensorType result;
|
||||
|
||||
SDL_LockSensors();
|
||||
{
|
||||
CHECK_SENSOR_MAGIC(sensor, SDL_SENSOR_INVALID);
|
||||
|
||||
retval = sensor->type;
|
||||
result = sensor->type;
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return retval;
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -437,17 +438,17 @@ SDL_SensorType SDL_GetSensorType(SDL_Sensor *sensor)
|
||||
*/
|
||||
int SDL_GetSensorNonPortableType(SDL_Sensor *sensor)
|
||||
{
|
||||
int retval;
|
||||
int result;
|
||||
|
||||
SDL_LockSensors();
|
||||
{
|
||||
CHECK_SENSOR_MAGIC(sensor, -1);
|
||||
|
||||
retval = sensor->non_portable_type;
|
||||
result = sensor->non_portable_type;
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return retval;
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -455,34 +456,34 @@ int SDL_GetSensorNonPortableType(SDL_Sensor *sensor)
|
||||
*/
|
||||
SDL_SensorID SDL_GetSensorID(SDL_Sensor *sensor)
|
||||
{
|
||||
SDL_SensorID retval;
|
||||
SDL_SensorID result;
|
||||
|
||||
SDL_LockSensors();
|
||||
{
|
||||
CHECK_SENSOR_MAGIC(sensor, 0);
|
||||
|
||||
retval = sensor->instance_id;
|
||||
result = sensor->instance_id;
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return retval;
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the current state of this sensor
|
||||
*/
|
||||
int SDL_GetSensorData(SDL_Sensor *sensor, float *data, int num_values)
|
||||
SDL_bool SDL_GetSensorData(SDL_Sensor *sensor, float *data, int num_values)
|
||||
{
|
||||
SDL_LockSensors();
|
||||
{
|
||||
CHECK_SENSOR_MAGIC(sensor, -1);
|
||||
CHECK_SENSOR_MAGIC(sensor, false);
|
||||
|
||||
num_values = SDL_min(num_values, SDL_arraysize(sensor->data));
|
||||
SDL_memcpy(data, sensor->data, num_values * sizeof(*data));
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -558,10 +559,8 @@ void SDL_QuitSensors(void)
|
||||
|
||||
// These are global for SDL_syssensor.c and SDL_events.c
|
||||
|
||||
int SDL_SendSensorUpdate(Uint64 timestamp, SDL_Sensor *sensor, Uint64 sensor_timestamp, float *data, int num_values)
|
||||
void SDL_SendSensorUpdate(Uint64 timestamp, SDL_Sensor *sensor, Uint64 sensor_timestamp, float *data, int num_values)
|
||||
{
|
||||
int posted;
|
||||
|
||||
SDL_AssertSensorsLocked();
|
||||
|
||||
// Allow duplicate events, for things like steps and heartbeats
|
||||
@@ -571,7 +570,6 @@ int SDL_SendSensorUpdate(Uint64 timestamp, SDL_Sensor *sensor, Uint64 sensor_tim
|
||||
SDL_memcpy(sensor->data, data, num_values * sizeof(*data));
|
||||
|
||||
// Post the event, if desired
|
||||
posted = 0;
|
||||
if (SDL_EventEnabled(SDL_EVENT_SENSOR_UPDATE)) {
|
||||
SDL_Event event;
|
||||
event.type = SDL_EVENT_SENSOR_UPDATE;
|
||||
@@ -581,12 +579,10 @@ int SDL_SendSensorUpdate(Uint64 timestamp, SDL_Sensor *sensor, Uint64 sensor_tim
|
||||
SDL_memset(event.sensor.data, 0, sizeof(event.sensor.data));
|
||||
SDL_memcpy(event.sensor.data, data, num_values * sizeof(*data));
|
||||
event.sensor.sensor_timestamp = sensor_timestamp;
|
||||
posted = SDL_PushEvent(&event) == 1;
|
||||
SDL_PushEvent(&event);
|
||||
}
|
||||
|
||||
SDL_GamepadSensorWatcher(timestamp, sensor->instance_id, sensor_timestamp, data, num_values);
|
||||
|
||||
return posted;
|
||||
}
|
||||
|
||||
void SDL_UpdateSensor(SDL_Sensor *sensor)
|
||||
|
||||
@@ -32,7 +32,7 @@ struct SDL_SensorDriver;
|
||||
// Useful functions and variables from SDL_sensor.c
|
||||
|
||||
// Initialization and shutdown functions
|
||||
extern int SDL_InitSensors(void);
|
||||
extern bool SDL_InitSensors(void);
|
||||
extern void SDL_QuitSensors(void);
|
||||
|
||||
// Return whether the sensor system is currently initialized
|
||||
@@ -54,6 +54,6 @@ extern bool SDL_SensorsOpened(void);
|
||||
extern void SDL_UpdateSensor(SDL_Sensor *sensor);
|
||||
|
||||
// Internal event queueing functions
|
||||
extern int SDL_SendSensorUpdate(Uint64 timestamp, SDL_Sensor *sensor, Uint64 sensor_timestamp, float *data, int num_values);
|
||||
extern void SDL_SendSensorUpdate(Uint64 timestamp, SDL_Sensor *sensor, Uint64 sensor_timestamp, float *data, int num_values);
|
||||
|
||||
#endif // SDL_sensor_c_h_
|
||||
|
||||
@@ -58,7 +58,7 @@ typedef struct SDL_SensorDriver
|
||||
* sensor 0 should be the system default sensor.
|
||||
* This function should return 0, or -1 on an unrecoverable fatal error.
|
||||
*/
|
||||
int (*Init)(void);
|
||||
bool (*Init)(void);
|
||||
|
||||
// Function to return the number of sensors available right now
|
||||
int (*GetCount)(void);
|
||||
@@ -82,7 +82,7 @@ typedef struct SDL_SensorDriver
|
||||
The sensor to open is specified by the device index.
|
||||
It returns 0, or -1 if there is an error.
|
||||
*/
|
||||
int (*Open)(SDL_Sensor *sensor, int device_index);
|
||||
bool (*Open)(SDL_Sensor *sensor, int device_index);
|
||||
|
||||
/* Function to update the state of a sensor - called as a device poll.
|
||||
* This function shouldn't update the sensor structure directly,
|
||||
|
||||
@@ -111,28 +111,28 @@ static void SDL_ANDROID_StopSensorThread(SDL_AndroidSensorThreadContext *ctx)
|
||||
}
|
||||
}
|
||||
|
||||
static int SDL_ANDROID_StartSensorThread(SDL_AndroidSensorThreadContext *ctx)
|
||||
static bool SDL_ANDROID_StartSensorThread(SDL_AndroidSensorThreadContext *ctx)
|
||||
{
|
||||
ctx->sem = SDL_CreateSemaphore(0);
|
||||
if (!ctx->sem) {
|
||||
SDL_ANDROID_StopSensorThread(ctx);
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
SDL_AtomicSet(&ctx->running, true);
|
||||
ctx->thread = SDL_CreateThread(SDL_ANDROID_SensorThread, "Sensors", ctx);
|
||||
if (!ctx->thread) {
|
||||
SDL_ANDROID_StopSensorThread(ctx);
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Wait for the sensor thread to start
|
||||
SDL_WaitSemaphore(ctx->sem);
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int SDL_ANDROID_SensorInit(void)
|
||||
static bool SDL_ANDROID_SensorInit(void)
|
||||
{
|
||||
int i, sensors_count;
|
||||
ASensorList sensors;
|
||||
@@ -147,7 +147,7 @@ static int SDL_ANDROID_SensorInit(void)
|
||||
if (sensors_count > 0) {
|
||||
SDL_sensors = (SDL_AndroidSensor *)SDL_calloc(sensors_count, sizeof(*SDL_sensors));
|
||||
if (!SDL_sensors) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
for (i = 0; i < sensors_count; ++i) {
|
||||
@@ -157,10 +157,10 @@ static int SDL_ANDROID_SensorInit(void)
|
||||
SDL_sensors_count = sensors_count;
|
||||
}
|
||||
|
||||
if (SDL_ANDROID_StartSensorThread(&SDL_sensor_thread_context) < 0) {
|
||||
return -1;
|
||||
if (!SDL_ANDROID_StartSensorThread(&SDL_sensor_thread_context)) {
|
||||
return false;
|
||||
}
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int SDL_ANDROID_SensorGetCount(void)
|
||||
@@ -199,7 +199,7 @@ static SDL_SensorID SDL_ANDROID_SensorGetDeviceInstanceID(int device_index)
|
||||
return SDL_sensors[device_index].instance_id;
|
||||
}
|
||||
|
||||
static int SDL_ANDROID_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static bool SDL_ANDROID_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
int delay_us, min_delay_us;
|
||||
|
||||
@@ -230,7 +230,7 @@ static int SDL_ANDROID_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void SDL_ANDROID_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
@@ -39,7 +39,7 @@ static CMMotionManager *SDL_motion_manager;
|
||||
static SDL_CoreMotionSensor *SDL_sensors;
|
||||
static int SDL_sensors_count;
|
||||
|
||||
static int SDL_COREMOTION_SensorInit(void)
|
||||
static bool SDL_COREMOTION_SensorInit(void)
|
||||
{
|
||||
int i, sensors_count = 0;
|
||||
|
||||
@@ -57,7 +57,7 @@ static int SDL_COREMOTION_SensorInit(void)
|
||||
if (sensors_count > 0) {
|
||||
SDL_sensors = (SDL_CoreMotionSensor *)SDL_calloc(sensors_count, sizeof(*SDL_sensors));
|
||||
if (!SDL_sensors) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
@@ -73,7 +73,7 @@ static int SDL_COREMOTION_SensorInit(void)
|
||||
}
|
||||
SDL_sensors_count = sensors_count;
|
||||
}
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int SDL_COREMOTION_SensorGetCount(void)
|
||||
@@ -112,13 +112,13 @@ static SDL_SensorID SDL_COREMOTION_SensorGetDeviceInstanceID(int device_index)
|
||||
return SDL_sensors[device_index].instance_id;
|
||||
}
|
||||
|
||||
static int SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static bool SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
struct sensor_hwdata *hwdata;
|
||||
|
||||
hwdata = (struct sensor_hwdata *)SDL_calloc(1, sizeof(*hwdata));
|
||||
if (hwdata == NULL) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
sensor->hwdata = hwdata;
|
||||
|
||||
@@ -132,7 +132,7 @@ static int SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void SDL_COREMOTION_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
@@ -25,9 +25,9 @@
|
||||
#include "SDL_dummysensor.h"
|
||||
#include "../SDL_syssensor.h"
|
||||
|
||||
static int SDL_DUMMY_SensorInit(void)
|
||||
static bool SDL_DUMMY_SensorInit(void)
|
||||
{
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int SDL_DUMMY_SensorGetCount(void)
|
||||
@@ -59,7 +59,7 @@ static SDL_SensorID SDL_DUMMY_SensorGetDeviceInstanceID(int device_index)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int SDL_DUMMY_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static bool SDL_DUMMY_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
return SDL_Unsupported();
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ typedef struct
|
||||
|
||||
static SDL_N3DSSensor N3DS_sensors[N3DS_SENSOR_COUNT];
|
||||
|
||||
static int InitN3DSServices(void);
|
||||
static bool InitN3DSServices(void);
|
||||
static void UpdateN3DSAccelerometer(SDL_Sensor *sensor);
|
||||
static void UpdateN3DSGyroscope(SDL_Sensor *sensor);
|
||||
|
||||
@@ -47,9 +47,9 @@ static bool IsDeviceIndexValid(int device_index)
|
||||
return device_index >= 0 && device_index < N3DS_SENSOR_COUNT;
|
||||
}
|
||||
|
||||
static int N3DS_SensorInit(void)
|
||||
static bool N3DS_SensorInit(void)
|
||||
{
|
||||
if (InitN3DSServices() < 0) {
|
||||
if (!InitN3DSServices()) {
|
||||
return SDL_SetError("Failed to initialise N3DS services");
|
||||
}
|
||||
|
||||
@@ -57,23 +57,23 @@ static int N3DS_SensorInit(void)
|
||||
N3DS_sensors[0].instance_id = SDL_GetNextObjectID();
|
||||
N3DS_sensors[1].type = SDL_SENSOR_GYRO;
|
||||
N3DS_sensors[1].instance_id = SDL_GetNextObjectID();
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int InitN3DSServices(void)
|
||||
static bool InitN3DSServices(void)
|
||||
{
|
||||
if (R_FAILED(hidInit())) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (R_FAILED(HIDUSER_EnableAccelerometer())) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (R_FAILED(HIDUSER_EnableGyroscope())) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int N3DS_SensorGetCount(void)
|
||||
@@ -122,9 +122,9 @@ static SDL_SensorID N3DS_SensorGetDeviceInstanceID(int device_index)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int N3DS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static bool N3DS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void N3DS_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
@@ -39,7 +39,7 @@ typedef struct
|
||||
static SDL_VitaSensor *SDL_sensors;
|
||||
static int SDL_sensors_count;
|
||||
|
||||
static int SDL_VITA_SensorInit(void)
|
||||
static bool SDL_VITA_SensorInit(void)
|
||||
{
|
||||
sceMotionReset();
|
||||
sceMotionStartSampling();
|
||||
@@ -52,7 +52,7 @@ static int SDL_VITA_SensorInit(void)
|
||||
|
||||
SDL_sensors = (SDL_VitaSensor *)SDL_calloc(SDL_sensors_count, sizeof(*SDL_sensors));
|
||||
if (!SDL_sensors) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
SDL_sensors[0].type = SDL_SENSOR_ACCEL;
|
||||
@@ -60,7 +60,7 @@ static int SDL_VITA_SensorInit(void)
|
||||
SDL_sensors[1].type = SDL_SENSOR_GYRO;
|
||||
SDL_sensors[1].instance_id = SDL_GetNextObjectID();
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int SDL_VITA_SensorGetCount(void)
|
||||
@@ -113,17 +113,17 @@ static SDL_SensorID SDL_VITA_SensorGetDeviceInstanceID(int device_index)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int SDL_VITA_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static bool SDL_VITA_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
struct sensor_hwdata *hwdata;
|
||||
|
||||
hwdata = (struct sensor_hwdata *)SDL_calloc(1, sizeof(*hwdata));
|
||||
if (!hwdata) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
sensor->hwdata = hwdata;
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void SDL_VITA_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
@@ -57,8 +57,8 @@ static ISensorManager *SDL_sensor_manager;
|
||||
static int SDL_num_sensors;
|
||||
static SDL_Windows_Sensor *SDL_sensors;
|
||||
|
||||
static int ConnectSensor(ISensor *sensor);
|
||||
static int DisconnectSensor(ISensor *sensor);
|
||||
static bool ConnectSensor(ISensor *sensor);
|
||||
static bool DisconnectSensor(ISensor *sensor);
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensorManagerEvents *This, REFIID riid, void **ppvObject)
|
||||
{
|
||||
@@ -258,7 +258,7 @@ static ISensorEvents sensor_events = {
|
||||
&sensor_events_vtbl
|
||||
};
|
||||
|
||||
static int ConnectSensor(ISensor *sensor)
|
||||
static bool ConnectSensor(ISensor *sensor)
|
||||
{
|
||||
SDL_Windows_Sensor *new_sensor, *new_sensors;
|
||||
HRESULT hr;
|
||||
@@ -296,7 +296,7 @@ static int ConnectSensor(ISensor *sensor)
|
||||
SysFreeString(bstr_name);
|
||||
}
|
||||
if (!name) {
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
SDL_LockSensors();
|
||||
@@ -304,7 +304,7 @@ static int ConnectSensor(ISensor *sensor)
|
||||
if (!new_sensors) {
|
||||
SDL_UnlockSensors();
|
||||
SDL_free(name);
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
ISensor_AddRef(sensor);
|
||||
@@ -322,10 +322,10 @@ static int ConnectSensor(ISensor *sensor)
|
||||
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int DisconnectSensor(ISensor *sensor)
|
||||
static bool DisconnectSensor(ISensor *sensor)
|
||||
{
|
||||
SDL_Windows_Sensor *old_sensor;
|
||||
int i;
|
||||
@@ -349,10 +349,10 @@ static int DisconnectSensor(ISensor *sensor)
|
||||
}
|
||||
SDL_UnlockSensors();
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int SDL_WINDOWS_SensorInit(void)
|
||||
static bool SDL_WINDOWS_SensorInit(void)
|
||||
{
|
||||
HRESULT hr;
|
||||
ISensorCollection *sensor_collection = NULL;
|
||||
@@ -364,7 +364,7 @@ static int SDL_WINDOWS_SensorInit(void)
|
||||
hr = CoCreateInstance(&SDL_CLSID_SensorManager, NULL, CLSCTX_INPROC_SERVER, &SDL_IID_SensorManager, (LPVOID *)&SDL_sensor_manager);
|
||||
if (FAILED(hr)) {
|
||||
// If we can't create a sensor manager (i.e. on Wine), we won't have any sensors, but don't fail the init
|
||||
return 0; // WIN_SetErrorFromHRESULT("Couldn't create the sensor manager", hr);
|
||||
return true; // WIN_SetErrorFromHRESULT("Couldn't create the sensor manager", hr);
|
||||
}
|
||||
|
||||
hr = ISensorManager_SetEventSink(SDL_sensor_manager, &sensor_manager_events);
|
||||
@@ -397,7 +397,7 @@ static int SDL_WINDOWS_SensorInit(void)
|
||||
}
|
||||
ISensorCollection_Release(sensor_collection);
|
||||
}
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static int SDL_WINDOWS_SensorGetCount(void)
|
||||
@@ -429,10 +429,10 @@ static SDL_SensorID SDL_WINDOWS_SensorGetDeviceInstanceID(int device_index)
|
||||
return SDL_sensors[device_index].id;
|
||||
}
|
||||
|
||||
static int SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static bool SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
SDL_sensors[device_index].sensor_opened = sensor;
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void SDL_WINDOWS_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
Reference in New Issue
Block a user