vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emotion: fix webcam detection. 

SVN revision: 62054
This commit is contained in:
Cedric BAIL 2011-08-03 14:23:51 +00:00
parent bcf2d84237
commit c33aaf812f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/emotion/src/lib/Emotion.h
View File

@ -843,9 +843,11 @@ EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file);
typedef struct _Emotion_Webcam Emotion_Webcam;
extern int EMOTION_WEBCAM_UPDATE;
EAPI const Eina_List *emotion_webcams_get(void);
EAPI const char *emotion_webcam_name_get(Emotion_Webcam *ew);
EAPI const char *emotion_webcam_device_get(Emotion_Webcam *ew);
EAPI const char *emotion_webcam_name_get(const Emotion_Webcam *ew);
EAPI const char *emotion_webcam_device_get(const Emotion_Webcam *ew);
/**
* @}

13
legacy/emotion/src/lib/emotion_main.c
View File

@ -124,6 +124,8 @@ struct _Emotion_Webcam
const char *syspath;
const char *device;
const char *name;
const char *filename;
};
static int _emotion_webcams_count = 0;
@ -150,8 +152,8 @@ _emotion_check_device(Emotion_Webcam *ew)
if (!ew) return ;
if (!ew->device) goto on_error;
fd = open(ew->device, O_RDONLY);
if (!fd) goto on_error;
fd = open(ew->filename, O_RDONLY);
if (fd < 0) goto on_error;
if (ioctl(fd, VIDIOC_QUERYCAP, &caps) == -1) goto on_error;
@ -173,7 +175,7 @@ _emotion_check_device(Emotion_Webcam *ew)
return ;
on_error:
fprintf(stderr, "'%s' is not a webcam\n", ew->name);
fprintf(stderr, "'%s' is not a webcam ['%s']\n", ew->name, strerror(errno));
eina_stringshare_del(ew->syspath);
eina_stringshare_del(ew->device);
eina_stringshare_del(ew->name);
@ -198,6 +200,7 @@ _emotion_webcam_new(const char *syspath)
snprintf(local, eina_stringshare_strlen(device) + 8, "v4l2://%s", device);
test->device = eina_stringshare_add(local);
eina_stringshare_del(device);
test->filename = test->device + 7;
return test;
}
@ -303,7 +306,7 @@ emotion_webcams_get(void)
}
EAPI const char *
emotion_webcam_name_get(Emotion_Webcam *ew)
emotion_webcam_name_get(const Emotion_Webcam *ew)
{
if (!ew) return NULL;
@ -315,7 +318,7 @@ emotion_webcam_name_get(Emotion_Webcam *ew)
}
EAPI const char *
emotion_webcam_device_get(Emotion_Webcam *ew)
emotion_webcam_device_get(const Emotion_Webcam *ew)
{
if (!ew) return NULL;