projects / packages / hal.git / blame
| Commit | Line | Data |
|---|---|---|
| 19642e0e JB |
1 | --- hal-0.5.14/hald/linux/probing/probe-video4linux.c.orig 2009-08-24 14:42:30.000000000 +0200 |
| 2 | +++ hal-0.5.14/hald/linux/probing/probe-video4linux.c 2011-04-20 18:57:54.383104888 +0200 | |
| 3 | @@ -30,7 +30,6 @@ | |
| 4 | #include <sys/types.h> | |
| 5 | #include <sys/time.h> | |
| 6 | #include <sys/ioctl.h> | |
| 7 | -#include <linux/videodev.h> | |
| 8 | #include <linux/videodev2.h> | |
| 9 | #include <errno.h> | |
| 10 | #include <fcntl.h> | |
| 11 | @@ -50,7 +49,6 @@ | |
| 12 | int ret = -1; | |
| 13 | char *udi; | |
| 14 | char *device_file; | |
| 15 | - struct video_capability v1cap; | |
| 16 | struct v4l2_capability v2cap; | |
| 17 | LibHalContext *ctx = NULL; | |
| 18 | LibHalChangeSet *cset; | |
| 19 | @@ -108,30 +106,6 @@ | |
| 20 | } | |
| 21 | } else { | |
| 22 | HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed")); | |
| 23 | - | |
| 24 | - if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { | |
| 25 | - libhal_changeset_set_property_string (cset, | |
| 26 | - "video4linux.version", "1"); | |
| 27 | - | |
| 28 | - libhal_changeset_set_property_string (cset, | |
| 29 | - "info.product", v1cap.name); | |
| 30 | - | |
| 31 | - if ((v1cap.type & VID_TYPE_CAPTURE) > 0) { | |
| 32 | - LIBHAL_FREE_DBUS_ERROR (&error); | |
| 33 | - libhal_device_add_capability (ctx, udi, "video4linux.video_capture", &error); | |
| 34 | - } if ((v1cap.type & VID_TYPE_OVERLAY) > 0) { | |
| 35 | - LIBHAL_FREE_DBUS_ERROR (&error); | |
| 36 | - libhal_device_add_capability (ctx, udi, "video4linux.video_overlay", &error); | |
| 37 | - } if (v1cap.audios > 0) { | |
| 38 | - LIBHAL_FREE_DBUS_ERROR (&error); | |
| 39 | - libhal_device_add_capability (ctx, udi, "video4linux.audio", &error); | |
| 40 | - } if ((v1cap.type & VID_TYPE_TUNER) > 0) { | |
| 41 | - LIBHAL_FREE_DBUS_ERROR (&error); | |
| 42 | - libhal_device_add_capability (ctx, udi, "video4linux.tuner", &error); | |
| 43 | - } | |
| 44 | - } else { | |
| 45 | - HAL_DEBUG (("ioctl VIDIOCGCAP failed")); | |
| 46 | - } | |
| 47 | } | |
| 48 | ||
| 49 | LIBHAL_FREE_DBUS_ERROR (&error); |