summaryrefslogtreecommitdiff
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
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
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)
576} 576}
577 577
578void 578void
579emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h) 579emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h)
580{ 580{
581 EMOTION_ENGINE_INSTANCE_CALL(inst, video_data_size_get, w, h); 581 EMOTION_ENGINE_INSTANCE_CALL(inst, videfl_data_size_get, w, h);
582} 582}
583 583
584Eina_Bool 584Eina_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
91 int (*seekable) (void *ef); 91 int (*seekable) (void *ef);
92 void (*frame_done) (void *ef); 92 void (*frame_done) (void *ef);
93 Emotion_Format (*format_get) (void *ef); 93 Emotion_Format (*format_get) (void *ef);
94 void (*video_data_size_get) (void *ef, int *w, int *h); 94 void (*videfl_data_size_get) (void *ef, int *w, int *h);
95 int (*yuv_rows_get) (void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows); 95 int (*yuv_rows_get) (void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows);
96 int (*bgra_data_get) (void *ef, unsigned char **bgra_data); 96 int (*bgra_data_get) (void *ef, unsigned char **bgra_data);
97 void (*event_feed) (void *ef, int event); 97 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
51Eina_Bool emotion_engine_instance_seekable(Emotion_Engine_Instance *inst); 51Eina_Bool emotion_engine_instance_seekable(Emotion_Engine_Instance *inst);
52void emotion_engine_instance_frame_done(Emotion_Engine_Instance *inst); 52void emotion_engine_instance_frame_done(Emotion_Engine_Instance *inst);
53Emotion_Format emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst); 53Emotion_Format emotion_engine_instance_format_get(const Emotion_Engine_Instance *inst);
54void emotion_engine_instance_video_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h); 54void emotion_engine_instance_videfl_data_size_get(const Emotion_Engine_Instance *inst, int *w, int *h);
55Eina_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); 55Eina_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);
56Eina_Bool emotion_engine_instance_bgra_data_get(const Emotion_Engine_Instance *inst, unsigned char **bgra_data); 56Eina_Bool emotion_engine_instance_bgra_data_get(const Emotion_Engine_Instance *inst, unsigned char **bgra_data);
57void emotion_engine_instance_event_feed(Emotion_Engine_Instance *inst, int event); 57void 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 @@
24#define E_SMART_OBJ_GET(smart, o, type) \ 24#define E_SMART_OBJ_GET(smart, o, type) \
25 { \ 25 { \
26 if (!o) return; \ 26 if (!o) return; \
27 if (!eo_isa(o, MY_CLASS)) { \ 27 if (!efl_isa(o, MY_CLASS)) { \
28 ERR("Tried calling on a non-emotion object."); \ 28 ERR("Tried calling on a non-emotion object."); \
29 return; \ 29 return; \
30 } \ 30 } \
31 smart = eo_data_scope_get(o, MY_CLASS); \ 31 smart = efl_data_scope_get(o, MY_CLASS); \
32 if (!smart) return; \ 32 if (!smart) return; \
33 } 33 }
34 34
35#define E_SMART_OBJ_GET_RETURN(smart, o, type, ret) \ 35#define E_SMART_OBJ_GET_RETURN(smart, o, type, ret) \
36 { \ 36 { \
37 if (!o) return ret; \ 37 if (!o) return ret; \
38 if (!eo_isa(o, MY_CLASS)) { \ 38 if (!efl_isa(o, MY_CLASS)) { \
39 ERR("Tried calling on a non-emotion object."); \ 39 ERR("Tried calling on a non-emotion object."); \
40 return ret; \ 40 return ret; \
41 } \ 41 } \
42 smart = eo_data_scope_get(o, MY_CLASS); \ 42 smart = efl_data_scope_get(o, MY_CLASS); \
43 if (!smart) return ret; \ 43 if (!smart) return ret; \
44 } 44 }
45 45
@@ -238,14 +238,14 @@ EAPI Evas_Object *
238emotion_object_add(Evas *evas) 238emotion_object_add(Evas *evas)
239{ 239{
240 Evas_Object *e; 240 Evas_Object *e;
241 e = eo_add(MY_CLASS, evas); 241 e = efl_add(MY_CLASS, evas);
242 return e; 242 return e;
243} 243}
244 244
245EOLIAN static Eo * 245EOLIAN static Eo *
246_emotion_object_efl_object_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED) 246_emotion_object_efl_object_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
247{ 247{
248 obj = efl_constructor(eo_super(obj, MY_CLASS)); 248 obj = efl_constructor(efl_super(obj, MY_CLASS));
249 efl_canvas_object_type_set(obj, E_OBJ_NAME); 249 efl_canvas_object_type_set(obj, E_OBJ_NAME);
250 250
251 return obj; 251 return obj;
@@ -1777,7 +1777,7 @@ _pixels_get(void *data, Evas_Object *obj)
1777 1777
1778 sd = data; 1778 sd = data;
1779 if (!sd->engine_instance) return; 1779 if (!sd->engine_instance) return;
1780 emotion_engine_instance_video_data_size_get(sd->engine_instance, &w, &h); 1780 emotion_engine_instance_videfl_data_size_get(sd->engine_instance, &w, &h);
1781 w = (w >> 1) << 1; 1781 w = (w >> 1) << 1;
1782 h = (h >> 1) << 1; 1782 h = (h >> 1) << 1;
1783 1783