forked from enlightenment/efl
emotion: add a way to retrieve pixels.
SVN revision: 62092
This commit is contained in:
parent
28f32ca0c5
commit
1812ce8a2f
|
@ -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_fast_get(const char *file);
|
||||||
EAPI Eina_Bool emotion_object_extension_may_play_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;
|
typedef struct _Emotion_Webcam Emotion_Webcam;
|
||||||
|
|
||||||
extern int EMOTION_WEBCAM_UPDATE;
|
extern int EMOTION_WEBCAM_UPDATE;
|
||||||
|
|
|
@ -113,7 +113,6 @@ struct _Emotion_Video_Module
|
||||||
Eina_Emotion_Plugins *plugin;
|
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_video_get(const Evas_Object *obj);
|
||||||
EAPI void _emotion_frame_new(Evas_Object *obj);
|
EAPI void _emotion_frame_new(Evas_Object *obj);
|
||||||
EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len);
|
EAPI void _emotion_video_pos_update(Evas_Object *obj, double pos, double len);
|
||||||
|
|
|
@ -295,6 +295,16 @@ emotion_object_add(Evas *evas)
|
||||||
return evas_object_smart_add(evas, smart);
|
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
|
EAPI void
|
||||||
emotion_object_module_option_set(Evas_Object *obj, const char *opt, const char *val)
|
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);
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -654,7 +654,7 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
GstStateChangeReturn res;
|
GstStateChangeReturn res;
|
||||||
|
|
||||||
obj = _emotion_image_get(o);
|
obj = emotion_object_image_get(o);
|
||||||
if (!obj)
|
if (!obj)
|
||||||
{
|
{
|
||||||
ERR("Not Evas_Object specified");
|
ERR("Not Evas_Object specified");
|
||||||
|
|
Loading…
Reference in New Issue