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

SDL_VideoCapture: allow add/remove device at runtime on linux

Browse source
This commit is contained in:
Sylvain 2023-11-27 19:35:45 +01:00 • committed by Ryan C. Gordon
parent f0e47f8ee0
commit 6bb40f1d8d
9 changed files with 411 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/testvideocapture.c
View file

@ -125,7 +125,7 @@ static SDL_VideoCaptureDeviceID get_instance_id(int index) {
}
if (ret == 0) {
SDL_Log("invalid index");
/* SDL_Log("invalid index"); */
}
return ret;
@ -212,7 +212,7 @@ int main(int argc, char **argv)
SDL_Log("%s", usage);
/* Load the SDL library */
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { /* FIXME: SDL_INIT_JOYSTICK needed for add/removing devices at runtime */
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s", SDL_GetError());
return 1;
}
@ -439,7 +439,7 @@ int main(int argc, char **argv)
SAVE_CAPTURE_STATE(current_dev);
current_dev += 1;
if (current_dev == num || current_dev >= (int) SDL_arraysize(data_capture_tab)) {
if (current_dev >= num || current_dev >= (int) SDL_arraysize(data_capture_tab)) {
current_dev = 0;
}

2
test/testvideocaptureminimal.c
View file

@ -53,7 +53,7 @@ int main(int argc, char **argv)
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
/* Load the SDL library */
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { /* FIXME: SDL_INIT_JOYSTICK needed for add/removing devices at runtime */
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize SDL: %s", SDL_GetError());
return 1;
}