jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some minor code refactoring in v4l2 plugin

Browse Source 
Small code changes to decrease indentation a little.
This commit is contained in:
fryshorts 2014-07-15 20:29:14 +02:00
parent bd2b4c91b6
commit d03c94a000
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
plugins/linux-v4l2/v4l2-input.c
View File

@ -291,35 +291,37 @@ static void v4l2_device_list(obs_property_t prop, obs_data_t settings)
struct dstr device;
bool first = true;
dirp = opendir("/sys/class/video4linux");
if (!dirp)
return;
obs_property_list_clear(prop);
dstr_init_copy(&device, "/dev/");
dirp = opendir("/sys/class/video4linux");
if (dirp) {
while ((dp = readdir(dirp)) != NULL) {
dstr_resize(&device, 5);
dstr_cat(&device, dp->d_name);
if ((fd = open(device.array,
O_RDWR | O_NONBLOCK)) == -1) {
continue;
while ((dp = readdir(dirp)) != NULL) {
dstr_resize(&device, 5);
dstr_cat(&device, dp->d_name);
if ((fd = open(device.array, O_RDWR | O_NONBLOCK)) == -1)
continue;
if (ioctl(fd, VIDIOC_QUERYCAP, &video_cap) == -1)
continue;
if (video_cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) {
obs_property_list_add_string(prop,
(char *) video_cap.card,
device.array);
if (first) {
obs_data_setstring(settings,
"device_id", device.array);
first = false;
}
if (ioctl(fd, VIDIOC_QUERYCAP, &video_cap) == -1) {
continue;
} else if (video_cap.capabilities &
V4L2_CAP_VIDEO_CAPTURE) {
obs_property_list_add_string(prop,
(char *) video_cap.card,
device.array);
if (first) {
obs_data_setstring(settings,
"device_id", device.array);
first = false;
}
}
close(fd);
}
closedir(dirp);
close(fd);
}
closedir(dirp);
dstr_free(&device);
}