From d3b5ee55fb73c0b3d9b2dd6a8e61885aea06685e Mon Sep 17 00:00:00 2001 From: Cheeseness Date: Sun, 25 Nov 2018 19:34:56 +1000 Subject: [PATCH] linux-v4l2: Make V4L device names unique Addresses mantis issue 0000702. Closes obsproject/obs-studio#1553 --- plugins/linux-v4l2/v4l2-input.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/linux-v4l2/v4l2-input.c b/plugins/linux-v4l2/v4l2-input.c index 46726ee02..08d81f317 100644 --- a/plugins/linux-v4l2/v4l2-input.c +++ b/plugins/linux-v4l2/v4l2-input.c @@ -329,7 +329,11 @@ static void v4l2_device_list(obs_property_t *prop, obs_data_t *settings) continue; } - obs_property_list_add_string(prop, (char *) video_cap.card, + /* make sure device names are unique */ + char unique_device_name[68]; + sprintf(unique_device_name, "%s (%s)", video_cap.card, + video_cap.bus_info); + obs_property_list_add_string(prop, unique_device_name, device.array); blog(LOG_INFO, "Found device '%s' at %s", video_cap.card, device.array);