On Thu, Jan 23, 2014 at 07:48:38AM -0500, Benjamin Deering wrote:
> On 01/23/2014 07:37 AM, Martin Jansa wrote:
> > On Wed, Jan 22, 2014 at 10:33:54PM -0500, Benjamin Deering wrote:
> >> On 01/22/2014 07:53 PM, benjamin deering wrote:
> >>> From: Ben Deering<ben_deer...@swissmail.org>
> >>>
> >>> emotion opens several devices on startup to check for webcams
> >>> if the device is not a webcam emotion never closes the device.
> >>> This prevents rmmod of the device's driver as well as other problems.
> >>> Signed-off-by: Ben Deering<ben_deer...@swissmail.org>
> >>> ---
> >>> src/lib/emotion_main.c | 8 ++++++--
> >>> 1 file changed, 6 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/src/lib/emotion_main.c b/src/lib/emotion_main.c
> >>> index 52b1baa..d7b04a0 100644
> >>> --- a/src/lib/emotion_main.c
> >>> +++ b/src/lib/emotion_main.c
> >>> @@ -234,8 +234,12 @@ _emotion_check_device(Emotion_Webcam *ew)
> >>> fd = open(ew->filename, O_RDONLY);
> >>> if (fd< 0) goto on_error;
> >>>
> >>> - if (ioctl(fd, VIDIOC_QUERYCAP,&caps) == -1) goto on_error;
> >>> -
> >>> + if (ioctl(fd, VIDIOC_QUERYCAP,&caps) == -1)
> >>> + {
> >>> + close(fd);
> >>> + goto on_error;
> >>> + }
> >>> + close(fd);
> >>> /* Likely not a webcam */
> >>> if (!caps.capabilities& V4L2_CAP_VIDEO_CAPTURE) goto on_error;
> >>> if (caps.capabilities& V4L2_CAP_TUNER
> >> I sent this here because I don't have a phab account to get it directly
> >> to the e-developers. Hopefully an shr-dev can pass it along?
> > I wanted to ask you to send it directly, but after this reply, yes I'll
> > pass it to phab :)
> >
> It looks like it is fixed in a newer version
> (*http://git.enlightenment.org/core/efl.git/tree/src/lib/emotion/emotion_webcam.c
>
> line 147)* I don't know if SHR is going to that newer version any time
> soon though.Not in "dora" branches we're currently using for staging-feed builds, but I have all changes for "master" ready and plan to merge it soon. I'll add your patch to meta-efl for current master as well as dora. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
_______________________________________________ Shr-devel mailing list Shr-devel@lists.shr-project.org http://lists.shr-project.org/mailman/listinfo/shr-devel
