From: cedric Date: Thu, 4 Aug 2011 10:24:32 +0000 (+0000) Subject: emotion: add a way to retrieve pixels. X-Git-Tag: submit/2.0alpha-wayland/20121127.222018~202 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1ee3aecdb118995307d5703e3b4ed1d2ffa0b96;p=profile%2Fivi%2Femotion.git emotion: add a way to retrieve pixels. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@62092 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/Emotion.h b/src/lib/Emotion.h index cfe27b7..b35125f 100644 --- a/src/lib/Emotion.h +++ b/src/lib/Emotion.h @@ -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; diff --git a/src/lib/emotion_private.h b/src/lib/emotion_private.h index 3fae968..65ea4c7 100644 --- a/src/lib/emotion_private.h +++ b/src/lib/emotion_private.h @@ -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); diff --git a/src/lib/emotion_smart.c b/src/lib/emotion_smart.c index 7217103..50a8dc7 100644 --- a/src/lib/emotion_smart.c +++ b/src/lib/emotion_smart.c @@ -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; -} - diff --git a/src/modules/gstreamer/emotion_sink.c b/src/modules/gstreamer/emotion_sink.c index b207844..4c336e1 100644 --- a/src/modules/gstreamer/emotion_sink.c +++ b/src/modules/gstreamer/emotion_sink.c @@ -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");