From 5d317920f1a763f65f13d83a7f6198603b9b7c7e Mon Sep 17 00:00:00 2001 From: fryshorts Date: Tue, 24 Feb 2015 21:37:29 +0100 Subject: [PATCH] linux-v4l2: Add dv timing property Add the dv timing property and hide it by default. --- plugins/linux-v4l2/data/locale/en-US.ini | 1 + plugins/linux-v4l2/v4l2-input.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/plugins/linux-v4l2/data/locale/en-US.ini b/plugins/linux-v4l2/data/locale/en-US.ini index a1baf84ba..30416e113 100644 --- a/plugins/linux-v4l2/data/locale/en-US.ini +++ b/plugins/linux-v4l2/data/locale/en-US.ini @@ -3,6 +3,7 @@ Device="Device" Input="Input" ImageFormat="Video Format" VideoStandard="Video Standard" +DVTiming="DV Timing" Resolution="Resolution" FrameRate="Frame Rate" LeaveUnchanged="Leave Unchanged" diff --git a/plugins/linux-v4l2/v4l2-input.c b/plugins/linux-v4l2/v4l2-input.c index 8e7ddf900..6ef7e8e27 100644 --- a/plugins/linux-v4l2/v4l2-input.c +++ b/plugins/linux-v4l2/v4l2-input.c @@ -216,6 +216,7 @@ static void v4l2_defaults(obs_data_t *settings) obs_data_set_default_int(settings, "input", -1); obs_data_set_default_int(settings, "pixelformat", -1); obs_data_set_default_int(settings, "standard", -1); + obs_data_set_default_int(settings, "dv_timing", -1); obs_data_set_default_int(settings, "resolution", -1); obs_data_set_default_int(settings, "framerate", -1); obs_data_set_default_bool(settings, "system_timing", false); @@ -710,6 +711,11 @@ static obs_properties_t *v4l2_properties(void *vptr) OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT); obs_property_set_visible(standard_list, false); + obs_property_t *dv_timing_list = obs_properties_add_list(props, + "dv_timing", obs_module_text("DVTiming"), + OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT); + obs_property_set_visible(dv_timing_list, false); + obs_property_t *resolution_list = obs_properties_add_list(props, "resolution", obs_module_text("Resolution"), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);