emotion: add a way to retrieve pixels.

SVN revision: 62092

diff --git a/legacy/emotion/src/lib/Emotion.h b/legacy/emotion/src/lib/Emotion.h
index cfe27b7f6cdf8a8cc09d161f3b0ddc0f52fdb8b9..b35125f1ff94d1b0052fda111d9d2efd16d84307 100644 (file)
--- 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);
 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/legacy/emotion/src/lib/emotion_private.h b/legacy/emotion/src/lib/emotion_private.h
index 3fae9684b2e3f8fa0f3b793df6c9f95e3218f39e..65ea4c7ed475e7be12deee085196d4f902b25445 100644 (file)
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/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/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index 72171032ae746cbf153941fe8bde68e00567a975..50a8dc780d8b5b7aeec8c7b96dfb7e9aba916eca 100644 (file)
--- 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)
    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/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index b207844d9a9b2b1ed42aefeed2a0a39f4b823ee1..4c336e1ec9e4ed95b88f02ad270f8a68c17a03ea 100644 (file)
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/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");