summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-03-10 13:03:02 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-03-10 13:14:13 -0800
commit685681c8643a143a6ec708d56fc03366b66f80a5 (patch)
tree31037e40478d33c6503662a9be2e90ddb76ed1d6 /src
parent9646f8e9ecf9a148f0811a7d01398d97bf50d168 (diff)
efl: rename efl.core.animator to efl.animator.
It has been decided that we would not use any namespace for interface and they will sit in efl main namespace. This patch doesn't correct the naming of the event has we don't have a prefix for event. We do still have EFL_ANIMATOR_EVENT_ANIMATOR_TICK, instead of a nicer EFL_EVENT_ANIMATOR_TICK.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c8
-rw-r--r--src/lib/edje/edje_load.c2
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/lib/efl/Efl.h2
-rw-r--r--src/lib/efl/interfaces/efl_animator.eo13
-rw-r--r--src/lib/efl/interfaces/efl_core_animator.eo13
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo2
-rw-r--r--src/lib/evas/canvas/evas_object.eo2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c10
11 files changed, 30 insertions, 30 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 9d75bd9330..cf97f36e70 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -19,7 +19,7 @@ efl_eolian_files = \
19 lib/efl/interfaces/efl_gfx_gradient_radial.eo \ 19 lib/efl/interfaces/efl_gfx_gradient_radial.eo \
20 lib/efl/interfaces/efl_gfx_filter.eo \ 20 lib/efl/interfaces/efl_gfx_filter.eo \
21 lib/efl/interfaces/efl_model_base.eo \ 21 lib/efl/interfaces/efl_model_base.eo \
22 lib/efl/interfaces/efl_core_animator.eo \ 22 lib/efl/interfaces/efl_animator.eo \
23 $(efl_eolian_legacy_files) \ 23 $(efl_eolian_legacy_files) \
24 $(NULL) 24 $(NULL)
25 25
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 2a135f95b5..eb57467441 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3076,7 +3076,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
3076{ 3076{
3077 Ecore_Evas *subee; 3077 Ecore_Evas *subee;
3078 Eina_List *l; 3078 Eina_List *l;
3079 Efl_Core_Event_Animator_Tick a = { { 0, 0, 0, 0 } }; 3079 Efl_Event_Animator_Tick a = { { 0, 0, 0, 0 } };
3080 3080
3081 if (!viewport) 3081 if (!viewport)
3082 { 3082 {
@@ -3087,7 +3087,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
3087 a.update_area = *viewport; 3087 a.update_area = *viewport;
3088 } 3088 }
3089 3089
3090 eo_event_callback_call(ee->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, &a); 3090 eo_event_callback_call(ee->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, &a);
3091 3091
3092 // FIXME: We do not support partial animator in the subcanvas 3092 // FIXME: We do not support partial animator in the subcanvas
3093 EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee) 3093 EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@@ -3147,7 +3147,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
3147 3147
3148 for (i = 0; array[i].desc != NULL; i++) 3148 for (i = 0; array[i].desc != NULL; i++)
3149 { 3149 {
3150 if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK) 3150 if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
3151 { 3151 {
3152 if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE; 3152 if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE;
3153 INF("Setting up animator for %p from '%s' with title '%s'.", ee->evas, ee->driver, ee->prop.title); 3153 INF("Setting up animator for %p from '%s' with title '%s'.", ee->evas, ee->driver, ee->prop.title);
@@ -3183,7 +3183,7 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
3183 3183
3184 for (i = 0; array[i].desc != NULL; i++) 3184 for (i = 0; array[i].desc != NULL; i++)
3185 { 3185 {
3186 if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK) 3186 if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
3187 { 3187 {
3188 if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE; 3188 if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE;
3189 3189
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 81cba4830f..490ba1759d 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1710,7 +1710,7 @@ _edje_file_del(Edje *ed)
1710 free(runp); 1710 free(runp);
1711 } 1711 }
1712 _edje_animators = eina_list_remove(_edje_animators, ed); 1712 _edje_animators = eina_list_remove(_edje_animators, ed);
1713 eo_event_callback_del(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); 1713 eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
1714 ecore_animator_del(ed->animator); 1714 ecore_animator_del(ed->animator);
1715 ed->animator = NULL; 1715 ed->animator = NULL;
1716 1716
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index aa99063a00..e8c298bf45 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -433,7 +433,7 @@ _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp)
433 ed->actions = eina_list_remove(ed->actions, runp); 433 ed->actions = eina_list_remove(ed->actions, runp);
434 if (!ed->actions) 434 if (!ed->actions)
435 { 435 {
436 eo_event_callback_del(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); 436 eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
437 ecore_animator_del(ed->animator); 437 ecore_animator_del(ed->animator);
438 ed->animator = NULL; 438 ed->animator = NULL;
439 } 439 }
@@ -737,7 +737,7 @@ low_mem_current:
737 if (!ed->actions) 737 if (!ed->actions)
738 { 738 {
739 if (ed->canvas_animator) 739 if (ed->canvas_animator)
740 eo_event_callback_add(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); 740 eo_event_callback_add(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
741 else 741 else
742 ed->animator = ecore_animator_add(_edje_animator_cb, ed); 742 ed->animator = ecore_animator_add(_edje_animator_cb, ed);
743 } 743 }
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 82352fd234..c1b42e179b 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -63,7 +63,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
63#include "interfaces/efl_text_properties.eo.h" 63#include "interfaces/efl_text_properties.eo.h"
64 64
65/* Core interface */ 65/* Core interface */
66#include "interfaces/efl_core_animator.eo.h" 66#include "interfaces/efl_animator.eo.h"
67 67
68EAPI extern const Eo_Event_Description _EFL_GFX_CHANGED; 68EAPI extern const Eo_Event_Description _EFL_GFX_CHANGED;
69EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED; 69EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED;
diff --git a/src/lib/efl/interfaces/efl_animator.eo b/src/lib/efl/interfaces/efl_animator.eo
new file mode 100644
index 0000000000..b9a32e996a
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_animator.eo
@@ -0,0 +1,13 @@
1import eina_types;
2
3struct Efl.Event.Animator_Tick {
4 update_area: Eina.Rectangle; [[Area of the canvas that will be pushed to screen.]]
5}
6
7interface Efl.Animator {
8 legacy_prefix: null;
9 eo_prefix: efl_animator;
10 events {
11 animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
12 }
13}
diff --git a/src/lib/efl/interfaces/efl_core_animator.eo b/src/lib/efl/interfaces/efl_core_animator.eo
deleted file mode 100644
index f652ec8a4f..0000000000
--- a/src/lib/efl/interfaces/efl_core_animator.eo
+++ /dev/null
@@ -1,13 +0,0 @@
1import eina_types;
2
3struct Efl.Core.Event.Animator_Tick {
4 update_area: Eina.Rectangle; [[Area of the canvas that will be pushed to screen.]]
5}
6
7interface Efl.Core.Animator {
8 legacy_prefix: null;
9 eo_prefix: efl_animator;
10 events {
11 animator,tick: Efl.Core.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
12 }
13}
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index ff090cbcfc..cd962dd86f 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -29,4 +29,4 @@ EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
29 EO_EVENT_DESCRIPTION("Graphics path changed"); 29 EO_EVENT_DESCRIPTION("Graphics path changed");
30 30
31#include "interfaces/efl_model_base.eo.c" 31#include "interfaces/efl_model_base.eo.c"
32#include "interfaces/efl_core_animator.eo.c" 32#include "interfaces/efl_animator.eo.c"
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 04fcbb6eeb..9634a9571b 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,6 +1,6 @@
1import evas_types; 1import evas_types;
2 2
3class Evas.Canvas (Eo.Base, Evas.Common_Interface, Efl.Core.Animator) 3class Evas.Canvas (Eo.Base, Evas.Common_Interface, Efl.Animator)
4{ 4{
5 legacy_prefix: evas; 5 legacy_prefix: evas;
6 data: Evas_Public_Data; 6 data: Evas_Public_Data;
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 5f9bb56c32..394031acf3 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -1,6 +1,6 @@
1import evas_types; 1import evas_types;
2 2
3abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack, Efl.Core.Animator) 3abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack, Efl.Animator)
4{ 4{
5 eo_prefix: evas_obj; 5 eo_prefix: evas_obj;
6 data: Evas_Object_Protected_Data; 6 data: Evas_Object_Protected_Data;
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index b72d5fd060..f18df1850d 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -87,7 +87,7 @@ _animator_repeater(void *data, const Eo_Event *event)
87{ 87{
88 Evas_Object_Protected_Data *obj = data; 88 Evas_Object_Protected_Data *obj = data;
89 89
90 eo_event_callback_call(obj->object, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info); 90 eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info);
91 DBG("Emitting animator tick on %p.", obj->object); 91 DBG("Emitting animator tick on %p.", obj->object);
92 92
93 return EO_CALLBACK_CONTINUE; 93 return EO_CALLBACK_CONTINUE;
@@ -102,11 +102,11 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
102 102
103 for (i = 0; array[i].desc != NULL; i++) 103 for (i = 0; array[i].desc != NULL; i++)
104 { 104 {
105 if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK) 105 if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
106 { 106 {
107 if (obj->animator_ref++ > 0) break; 107 if (obj->animator_ref++ > 0) break;
108 108
109 eo_event_callback_add(obj->layer->evas->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj); 109 eo_event_callback_add(obj->layer->evas->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
110 INF("Registering an animator tick on canvas %p for object %p.", 110 INF("Registering an animator tick on canvas %p for object %p.",
111 obj->layer->evas->evas, obj->object); 111 obj->layer->evas->evas, obj->object);
112 } 112 }
@@ -128,11 +128,11 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
128 128
129 for (i = 0; array[i].desc != NULL; i++) 129 for (i = 0; array[i].desc != NULL; i++)
130 { 130 {
131 if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK) 131 if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
132 { 132 {
133 if ((--obj->animator_ref) > 0) break; 133 if ((--obj->animator_ref) > 0) break;
134 134
135 eo_event_callback_del(obj->layer->evas->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj); 135 eo_event_callback_del(obj->layer->evas->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
136 INF("Unregistering an animator tick on canvas %p for object %p.", 136 INF("Unregistering an animator tick on canvas %p for object %p.",
137 obj->layer->evas->evas, obj->object); 137 obj->layer->evas->evas, obj->object);
138 } 138 }