summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/lib
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2011-08-04 10:24:32 +0000
committerCedric BAIL <cedric.bail@free.fr>2011-08-04 10:24:32 +0000
commit1812ce8a2f85d2232be0b9ca7700020c2fcf9677 (patch)
treea5084aa6ac7e16f0315c2bb17f27f88d8c73953f /legacy/emotion/src/lib
parent28f32ca0c51ff00bef6ebefcc9cf7198a7644131 (diff)
emotion: add a way to retrieve pixels.
SVN revision: 62092
Diffstat (limited to 'legacy/emotion/src/lib')
-rw-r--r--legacy/emotion/src/lib/Emotion.h2
-rw-r--r--legacy/emotion/src/lib/emotion_private.h1
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c20
3 files changed, 12 insertions, 11 deletions
diff --git a/legacy/emotion/src/lib/Emotion.h b/legacy/emotion/src/lib/Emotion.h
index cfe27b7f6c..b35125f1ff 100644
--- a/legacy/emotion/src/lib/Emotion.h
+++ b/legacy/emotion/src/lib/Emotion.h
@@ -901,6 +901,8 @@ EAPI Emotion_Suspend emotion_object_suspend_get (Evas_Object *obj);
901EAPI Eina_Bool emotion_object_extension_may_play_fast_get(const char *file); 901EAPI Eina_Bool emotion_object_extension_may_play_fast_get(const char *file);
902EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file); 902EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file);
903 903
904EAPI Evas_Object *emotion_object_image_get(const Evas_Object *obj);
905
904typedef struct _Emotion_Webcam Emotion_Webcam; 906typedef struct _Emotion_Webcam Emotion_Webcam;
905 907
906extern int EMOTION_WEBCAM_UPDATE; 908extern int EMOTION_WEBCAM_UPDATE;
diff --git a/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index 3fae9684b2..65ea4c7ed4 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -113,7 +113,6 @@ struct _Emotion_Video_Module
113 Eina_Emotion_Plugins *plugin; 113 Eina_Emotion_Plugins *plugin;
114}; 114};
115 115
116EAPI Evas_Object *_emotion_image_get(const Evas_Object *obj);
117EAPI void *_emotion_video_get(const Evas_Object *obj); 116EAPI void *_emotion_video_get(const Evas_Object *obj);
118EAPI void _emotion_frame_new(Evas_Object *obj); 117EAPI void _emotion_frame_new(Evas_Object *obj);
119EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len); 118EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len);
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index 72171032ae..50a8dc780d 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -295,6 +295,16 @@ emotion_object_add(Evas *evas)
295 return evas_object_smart_add(evas, smart); 295 return evas_object_smart_add(evas, smart);
296} 296}
297 297
298EAPI Evas_Object *
299emotion_object_image_get(const Evas_Object *obj)
300{
301 Smart_Data *sd;
302
303 sd = evas_object_smart_data_get(obj);
304 if (!sd) return NULL;
305 return sd->obj;
306}
307
298EAPI void 308EAPI void
299emotion_object_module_option_set(Evas_Object *obj, const char *opt, const char *val) 309emotion_object_module_option_set(Evas_Object *obj, const char *opt, const char *val)
300{ 310{
@@ -1767,13 +1777,3 @@ _smart_clip_unset(Evas_Object * obj)
1767 evas_object_clip_unset(sd->obj); 1777 evas_object_clip_unset(sd->obj);
1768} 1778}
1769 1779
1770EAPI Evas_Object *
1771_emotion_image_get(const Evas_Object *obj)
1772{
1773 Smart_Data *sd;
1774
1775 sd = evas_object_smart_data_get(obj);
1776 if (!sd) return NULL;
1777 return sd->obj;
1778}
1779