camera: Reworked to operate with a driver interface, like other subsystems.
This commit is contained in:
@@ -458,7 +458,6 @@ 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_camera = SDL_FALSE;
|
||||
int i = 0;
|
||||
|
||||
/* Check to make sure we don't overwrite '_this' */
|
||||
@@ -485,10 +484,6 @@ int SDL_VideoInit(const char *driver_name)
|
||||
goto pre_driver_error;
|
||||
}
|
||||
init_touch = SDL_TRUE;
|
||||
if (SDL_CameraInit() < 0) {
|
||||
goto pre_driver_error;
|
||||
}
|
||||
init_camera = SDL_TRUE;
|
||||
|
||||
/* Select the proper video driver */
|
||||
video = NULL;
|
||||
@@ -590,9 +585,6 @@ int SDL_VideoInit(const char *driver_name)
|
||||
|
||||
pre_driver_error:
|
||||
SDL_assert(_this == NULL);
|
||||
if (init_camera) {
|
||||
SDL_QuitCamera();
|
||||
}
|
||||
if (init_touch) {
|
||||
SDL_QuitTouch();
|
||||
}
|
||||
@@ -3784,7 +3776,6 @@ void SDL_VideoQuit(void)
|
||||
SDL_ClearClipboardData();
|
||||
|
||||
/* Halt event processing before doing anything else */
|
||||
SDL_QuitCamera();
|
||||
SDL_QuitTouch();
|
||||
SDL_QuitMouse();
|
||||
SDL_QuitKeyboard();
|
||||
|
||||
Reference in New Issue
Block a user