mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

camera: move PipeWire camera first in list 

If it fails, we fall back to the next one, which is v4l2.
This commit is contained in:
Wim Taymans 2024-05-08 18:13:58 +02:00 committed by Sam Lantinga
parent 5d779153b2
commit 55d4b44441
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/camera/SDL_camera.c
View File

@ -31,12 +31,12 @@
// Available camera drivers // Available camera drivers
static const CameraBootStrap *const bootstrap[] = { static const CameraBootStrap *const bootstrap[] = {
#ifdef SDL_CAMERA_DRIVER_V4L2
&V4L2_bootstrap,
#endif
#ifdef SDL_CAMERA_DRIVER_PIPEWIRE #ifdef SDL_CAMERA_DRIVER_PIPEWIRE
&PIPEWIRECAMERA_bootstrap, &PIPEWIRECAMERA_bootstrap,
#endif #endif
#ifdef SDL_CAMERA_DRIVER_V4L2
&V4L2_bootstrap,
#endif
#ifdef SDL_CAMERA_DRIVER_COREMEDIA #ifdef SDL_CAMERA_DRIVER_COREMEDIA
&COREMEDIA_bootstrap, &COREMEDIA_bootstrap,
#endif #endif

2
src/camera/SDL_syscamera.h
View File

@ -204,8 +204,8 @@ typedef struct CameraBootStrap
// Not all of these are available in a given build. Use #ifdefs, etc. // Not all of these are available in a given build. Use #ifdefs, etc.
extern CameraBootStrap DUMMYCAMERA_bootstrap; extern CameraBootStrap DUMMYCAMERA_bootstrap;
extern CameraBootStrap V4L2_bootstrap;
extern CameraBootStrap PIPEWIRECAMERA_bootstrap; extern CameraBootStrap PIPEWIRECAMERA_bootstrap;
extern CameraBootStrap V4L2_bootstrap;
extern CameraBootStrap COREMEDIA_bootstrap; extern CameraBootStrap COREMEDIA_bootstrap;
extern CameraBootStrap ANDROIDCAMERA_bootstrap; extern CameraBootStrap ANDROIDCAMERA_bootstrap;
extern CameraBootStrap EMSCRIPTENCAMERA_bootstrap; extern CameraBootStrap EMSCRIPTENCAMERA_bootstrap;

2
src/camera/pipewire/SDL_camera_pipewire.c
View File

@ -1129,7 +1129,7 @@ static SDL_bool PIPEWIRECAMERA_Init(SDL_CameraDriverImpl *impl)
} }
CameraBootStrap PIPEWIRECAMERA_bootstrap = { CameraBootStrap PIPEWIRECAMERA_bootstrap = {
"pipewire", "SDL PipeWire camera driver", PIPEWIRECAMERA_Init, SDL_TRUE "pipewire", "SDL PipeWire camera driver", PIPEWIRECAMERA_Init, SDL_FALSE
}; };
#endif // SDL_CAMERA_DRIVER_PIPEWIRE #endif // SDL_CAMERA_DRIVER_PIPEWIRE