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

emotion: add a way to retrieve pixels. 

SVN revision: 62092
This commit is contained in:
Cedric BAIL 2011-08-04 10:24:32 +00:00
parent 28f32ca0c5
commit 1812ce8a2f
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,6 +901,8 @@ EAPI Emotion_Suspend emotion_object_suspend_get (Evas_Object *obj);
EAPI Eina_Bool emotion_object_extension_may_play_fast_get(const char *file);
EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file);
EAPI Evas_Object *emotion_object_image_get(const Evas_Object *obj);
typedef struct _Emotion_Webcam Emotion_Webcam;
extern int EMOTION_WEBCAM_UPDATE;

1
legacy/emotion/src/lib/emotion_private.h
View File

@ -113,7 +113,6 @@ struct _Emotion_Video_Module
Eina_Emotion_Plugins *plugin;
};
EAPI Evas_Object *_emotion_image_get(const Evas_Object *obj);
EAPI void *_emotion_video_get(const Evas_Object *obj);
EAPI void _emotion_frame_new(Evas_Object *obj);
EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len);

20
legacy/emotion/src/lib/emotion_smart.c
View File

@ -295,6 +295,16 @@ emotion_object_add(Evas *evas)
return evas_object_smart_add(evas, smart);
}
EAPI Evas_Object *
emotion_object_image_get(const Evas_Object *obj)
{
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return sd->obj;
}
EAPI void
emotion_object_module_option_set(Evas_Object *obj, const char *opt, const char *val)
{
@ -1767,13 +1777,3 @@ _smart_clip_unset(Evas_Object * obj)
evas_object_clip_unset(sd->obj);
}
EAPI Evas_Object *
_emotion_image_get(const Evas_Object *obj)
{
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
return sd->obj;
}

2
legacy/emotion/src/modules/gstreamer/emotion_sink.c
View File

@ -654,7 +654,7 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
Evas_Object *obj;
GstStateChangeReturn res;
obj = _emotion_image_get(o);
obj = emotion_object_image_get(o);
if (!obj)
{
ERR("Not Evas_Object specified");