Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing drivers to configuration #17509

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion configuration.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ enum camera_driver_enum
CAMERA_RWEBCAM,
CAMERA_ANDROID,
CAMERA_AVFOUNDATION,
CAMERA_PIPEWIRE,
CAMERA_NULL
};

Expand Down Expand Up @@ -276,6 +277,7 @@ enum menu_driver_enum
enum record_driver_enum
{
RECORD_FFMPEG = MENU_NULL + 1,
RECORD_WAV,
RECORD_NULL
};

Expand Down Expand Up @@ -590,7 +592,7 @@ static const enum audio_resampler_driver_enum AUDIO_DEFAULT_RESAMPLER_DRIVER = A
#if defined(HAVE_FFMPEG)
static const enum record_driver_enum RECORD_DEFAULT_DRIVER = RECORD_FFMPEG;
#else
static const enum record_driver_enum RECORD_DEFAULT_DRIVER = RECORD_NULL;
static const enum record_driver_enum RECORD_DEFAULT_DRIVER = RECORD_WAV;
#endif

#ifdef HAVE_WINMM
Expand Down Expand Up @@ -717,6 +719,8 @@ static const enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_V4L2;
static const enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_RWEBCAM;
#elif defined(ANDROID)
static const enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_ANDROID;
#elif defined(HAVE_PIPEWIRE)
static const enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_PIPEWIRE;
#else
static const enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_NULL;
#endif
Expand Down Expand Up @@ -1009,6 +1013,8 @@ const char *config_get_default_record(void)
{
case RECORD_FFMPEG:
return "ffmpeg";
case RECORD_WAV:
return "wav";
case RECORD_NULL:
break;
}
Expand Down Expand Up @@ -1299,6 +1305,8 @@ const char *config_get_default_camera(void)
return "android";
case CAMERA_AVFOUNDATION:
return "avfoundation";
case CAMERA_PIPEWIRE:
return "pipewire";
case CAMERA_NULL:
break;
}
Expand Down
Loading