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

camera: SDL_GetCameraDeviceName() now follows the SDL_GetStringRule.

Browse source
This commit is contained in:
Ryan C. Gordon 2024-06-13 18:13:51 -04:00
parent 2ad7c70ac6
commit 5bc654aad3
No known key found for this signature in database
GPG key ID: FA148B892AB48044
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/SDL3/SDL_camera.h
View file

@ -230,8 +230,7 @@ extern SDL_DECLSPEC SDL_CameraSpec *SDLCALL SDL_GetCameraDeviceSupportedFormats(
/** /**
* Get the human-readable device name for a camera. * Get the human-readable device name for a camera.
* *
* The returned string is owned by the caller; please release it with * The returned string follows the SDL_GetStringRule.
* SDL_free() when done with it.
* *
* \param instance_id the camera device instance ID * \param instance_id the camera device instance ID
* \returns a human-readable device name, or NULL on error; call * \returns a human-readable device name, or NULL on error; call
@ -243,7 +242,7 @@ extern SDL_DECLSPEC SDL_CameraSpec *SDLCALL SDL_GetCameraDeviceSupportedFormats(
* *
* \sa SDL_GetCameraDevices * \sa SDL_GetCameraDevices
*/ */
extern SDL_DECLSPEC char * SDLCALL SDL_GetCameraDeviceName(SDL_CameraDeviceID instance_id); extern SDL_DECLSPEC const char * SDLCALL SDL_GetCameraDeviceName(SDL_CameraDeviceID instance_id);
/** /**
* Get the position of the camera in relation to the system. * Get the position of the camera in relation to the system.

6
src/camera/SDL_camera.c
View file

@ -285,7 +285,7 @@ static void DestroyPhysicalCameraDevice(SDL_CameraDevice *device)
camera_driver.impl.FreeDeviceHandle(device); camera_driver.impl.FreeDeviceHandle(device);
SDL_DestroyMutex(device->lock); SDL_DestroyMutex(device->lock);
SDL_free(device->all_specs); SDL_free(device->all_specs);
SDL_free(device->name); SDL_FreeLater(device->name); // this is returned in SDL_GetCameraDeviceName.
SDL_free(device); SDL_free(device);
} }
} }
@ -662,12 +662,12 @@ int SDL_GetCameraFormat(SDL_Camera *camera, SDL_CameraSpec *spec)
return 0; return 0;
} }
char *SDL_GetCameraDeviceName(SDL_CameraDeviceID instance_id) const char *SDL_GetCameraDeviceName(SDL_CameraDeviceID instance_id)
{ {
char *retval = NULL; char *retval = NULL;
SDL_CameraDevice *device = ObtainPhysicalCameraDevice(instance_id); SDL_CameraDevice *device = ObtainPhysicalCameraDevice(instance_id);
if (device) { if (device) {
retval = SDL_strdup(device->name); retval = device->name;
ReleaseCameraDevice(device); ReleaseCameraDevice(device);
} }
return retval; return retval;

2
src/dynapi/SDL_dynapi_procs.h
View file

@ -227,7 +227,7 @@ SDL_DYNAPI_PROC(char*,SDL_GetBasePath,(void),(),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_GetBooleanProperty,(SDL_PropertiesID a, const char *b, SDL_bool c),(a,b,c),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GetBooleanProperty,(SDL_PropertiesID a, const char *b, SDL_bool c),(a,b,c),return)
SDL_DYNAPI_PROC(int,SDL_GetCPUCacheLineSize,(void),(),return) SDL_DYNAPI_PROC(int,SDL_GetCPUCacheLineSize,(void),(),return)
SDL_DYNAPI_PROC(int,SDL_GetCPUCount,(void),(),return) SDL_DYNAPI_PROC(int,SDL_GetCPUCount,(void),(),return)
SDL_DYNAPI_PROC(char*,SDL_GetCameraDeviceName,(SDL_CameraDeviceID a),(a),return) SDL_DYNAPI_PROC(const char*,SDL_GetCameraDeviceName,(SDL_CameraDeviceID a),(a),return)
SDL_DYNAPI_PROC(SDL_CameraPosition,SDL_GetCameraDevicePosition,(SDL_CameraDeviceID a),(a),return) SDL_DYNAPI_PROC(SDL_CameraPosition,SDL_GetCameraDevicePosition,(SDL_CameraDeviceID a),(a),return)
SDL_DYNAPI_PROC(SDL_CameraSpec*,SDL_GetCameraDeviceSupportedFormats,(SDL_CameraDeviceID a, int *b),(a,b),return) SDL_DYNAPI_PROC(SDL_CameraSpec*,SDL_GetCameraDeviceSupportedFormats,(SDL_CameraDeviceID a, int *b),(a,b),return)
SDL_DYNAPI_PROC(SDL_CameraDeviceID*,SDL_GetCameraDevices,(int *a),(a),return) SDL_DYNAPI_PROC(SDL_CameraDeviceID*,SDL_GetCameraDevices,(int *a),(a),return)

3
test/testcamera.c
View file

@ -98,7 +98,7 @@ int SDL_AppInit(void **appstate, int argc, char *argv[])
SDL_Log("Saw %d camera devices.", devcount); SDL_Log("Saw %d camera devices.", devcount);
for (i = 0; i < devcount; i++) { for (i = 0; i < devcount; i++) {
const SDL_CameraDeviceID device = devices[i]; const SDL_CameraDeviceID device = devices[i];
char *name = SDL_GetCameraDeviceName(device); const char *name = SDL_GetCameraDeviceName(device);
const SDL_CameraPosition position = SDL_GetCameraDevicePosition(device); const SDL_CameraPosition position = SDL_GetCameraDevicePosition(device);
const char *posstr = ""; const char *posstr = "";
if (position == SDL_CAMERA_POSITION_FRONT_FACING) { if (position == SDL_CAMERA_POSITION_FRONT_FACING) {
@ -112,7 +112,6 @@ int SDL_AppInit(void **appstate, int argc, char *argv[])
camera_id = device; camera_id = device;
} }
SDL_Log(" - Camera #%d: %s %s", i, posstr, name); SDL_Log(" - Camera #%d: %s %s", i, posstr, name);
SDL_free(name);
} }
if (!camera_id) { if (!camera_id) {