aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/emotion
parentdocs: add Typedecl to doctree (diff)
downloadefl-e65aae994e72c1d3f8ac6b5360d3772f177b77ef.tar.gz
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/emotion_modules.c4
-rw-r--r--src/lib/emotion/emotion_modules.h2
-rw-r--r--src/lib/emotion/emotion_private.h2
-rw-r--r--src/lib/emotion/emotion_smart.c14
4 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index 346523fb07..273bb9acc4 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -576,9 +576,9 @@ emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst)
}
void
-emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h)
+emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h)
{
- EMOTION_ENGINE_INSTANCE_CALL(inst, video_data_size_get, w, h);
+ EMOTION_ENGINE_INSTANCE_CALL(inst, videfl_data_size_get, w, h);
}
Eina_Bool
diff --git a/src/lib/emotion/emotion_modules.h b/src/lib/emotion/emotion_modules.h
index 0ff2065fe3..eb9af156ea 100644
--- a/src/lib/emotion/emotion_modules.h
+++ b/src/lib/emotion/emotion_modules.h
@@ -91,7 +91,7 @@ struct _Emotion_Engine
int (*seekable) (void *ef);
void (*frame_done) (void *ef);
Emotion_Format (*format_get) (void *ef);
- void (*video_data_size_get) (void *ef, int *w, int *h);
+ void (*videfl_data_size_get) (void *ef, int *w, int *h);
int (*yuv_rows_get) (void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows);
int (*bgra_data_get) (void *ef, unsigned char **bgra_data);
void (*event_feed) (void *ef, int event);
diff --git a/src/lib/emotion/emotion_private.h b/src/lib/emotion/emotion_private.h
index e50a2a8753..cb66c6a628 100644
--- a/src/lib/emotion/emotion_private.h
+++ b/src/lib/emotion/emotion_private.h
@@ -51,7 +51,7 @@ Eina_Bool emotion_engine_instance_audio_handled(Emotion_Engine_Instance *in
Eina_Bool emotion_engine_instance_seekable(Emotion_Engine_Instance *inst);
void emotion_engine_instance_frame_done(Emotion_Engine_Instance *inst);
Emotion_Format emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst);
-void emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h);
+void emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h);
Eina_Bool emotion_engine_instance_yuv_rows_get(const Emotion_Engine_Instance *inst, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows);
Eina_Bool emotion_engine_instance_bgra_data_get(const Emotion_Engine_Instance *inst, unsigned char **bgra_data);
void emotion_engine_instance_event_feed(Emotion_Engine_Instance *inst, int event);
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index c01e9d1286..f9302e5016 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -24,22 +24,22 @@
#define E_SMART_OBJ_GET(smart, o, type) \
{ \
if (!o) return; \
- if (!eo_isa(o, MY_CLASS)) { \
+ if (!efl_isa(o, MY_CLASS)) { \
ERR("Tried calling on a non-emotion object."); \
return; \
} \
- smart = eo_data_scope_get(o, MY_CLASS); \
+ smart = efl_data_scope_get(o, MY_CLASS); \
if (!smart) return; \
}
#define E_SMART_OBJ_GET_RETURN(smart, o, type, ret) \
{ \
if (!o) return ret; \
- if (!eo_isa(o, MY_CLASS)) { \
+ if (!efl_isa(o, MY_CLASS)) { \
ERR("Tried calling on a non-emotion object."); \
return ret; \
} \
- smart = eo_data_scope_get(o, MY_CLASS); \
+ smart = efl_data_scope_get(o, MY_CLASS); \
if (!smart) return ret; \
}
@@ -238,14 +238,14 @@ EAPI Evas_Object *
emotion_object_add(Evas *evas)
{
Evas_Object *e;
- e = eo_add(MY_CLASS, evas);
+ e = efl_add(MY_CLASS, evas);
return e;
}
EOLIAN static Eo *
_emotion_object_efl_object_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
{
- obj = efl_constructor(eo_super(obj, MY_CLASS));
+ obj = efl_constructor(efl_super(obj, MY_CLASS));
efl_canvas_object_type_set(obj, E_OBJ_NAME);
return obj;
@@ -1777,7 +1777,7 @@ _pixels_get(void *data, Evas_Object *obj)
sd = data;
if (!sd->engine_instance) return;
- emotion_engine_instance_video_data_size_get(sd->engine_instance, &w, &h);
+ emotion_engine_instance_videfl_data_size_get(sd->engine_instance, &w, &h);
w = (w >> 1) << 1;
h = (h >> 1) << 1;