gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

camera: Renamed everything from "video capture" to "camera", wired to CMake.

Browse Source
This commit is contained in:
Ryan C. Gordon
2023-11-27 23:05:54 -05:00
parent f49ce4a15d
commit 7ae955ce68
26 changed files with 587 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/SDL_video.c
View File

@@ -458,7 +458,7 @@ int SDL_VideoInit(const char *driver_name)
SDL_bool init_keyboard = SDL_FALSE;
SDL_bool init_mouse = SDL_FALSE;
SDL_bool init_touch = SDL_FALSE;
SDL_bool init_video_capture = SDL_FALSE;
SDL_bool init_camera = SDL_FALSE;
int i = 0;
/* Check to make sure we don't overwrite '_this' */
@@ -485,10 +485,10 @@ int SDL_VideoInit(const char *driver_name)
goto pre_driver_error;
}
init_touch = SDL_TRUE;
if (SDL_VideoCaptureInit() < 0) {
if (SDL_CameraInit() < 0) {
goto pre_driver_error;
}
init_video_capture = SDL_TRUE;
init_camera = SDL_TRUE;
/* Select the proper video driver */
video = NULL;
@@ -590,8 +590,8 @@ int SDL_VideoInit(const char *driver_name)
pre_driver_error:
SDL_assert(_this == NULL);
if (init_video_capture) {
SDL_QuitVideoCapture();
if (init_camera) {
SDL_QuitCamera();
}
if (init_touch) {
SDL_QuitTouch();
@@ -3784,7 +3784,7 @@ void SDL_VideoQuit(void)
SDL_ClearClipboardData();
/* Halt event processing before doing anything else */
SDL_QuitVideoCapture();
SDL_QuitCamera();
SDL_QuitTouch();
SDL_QuitMouse();
SDL_QuitKeyboard();