rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Cedric BAIL 2016-03-10 13:03:02 -08:00
parent 9646f8e9ec
commit 685681c864
11 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Efl.am
View File

@ -19,7 +19,7 @@ efl_eolian_files = \
lib/efl/interfaces/efl_gfx_gradient_radial.eo \
lib/efl/interfaces/efl_gfx_filter.eo \
lib/efl/interfaces/efl_model_base.eo \
lib/efl/interfaces/efl_core_animator.eo \
lib/efl/interfaces/efl_animator.eo \
$(efl_eolian_legacy_files) \
$(NULL)

8
src/lib/ecore_evas/ecore_evas.c
View File

@ -3076,7 +3076,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
{
Ecore_Evas *subee;
Eina_List *l;
Efl_Core_Event_Animator_Tick a = { { 0, 0, 0, 0 } };
Efl_Event_Animator_Tick a = { { 0, 0, 0, 0 } };
if (!viewport)
{
@ -3087,7 +3087,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
a.update_area = *viewport;
}
eo_event_callback_call(ee->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, &a);
eo_event_callback_call(ee->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, &a);
// FIXME: We do not support partial animator in the subcanvas
EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@ -3147,7 +3147,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++)
{
if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK)
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
{
if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE;
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)
for (i = 0; array[i].desc != NULL; i++)
{
if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK)
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
{
if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE;

2
src/lib/edje/edje_load.c
View File

@ -1710,7 +1710,7 @@ _edje_file_del(Edje *ed)
free(runp);
}
_edje_animators = eina_list_remove(_edje_animators, ed);
eo_event_callback_del(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
ecore_animator_del(ed->animator);
ed->animator = NULL;

4
src/lib/edje/edje_program.c
View File

@ -433,7 +433,7 @@ _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp)
ed->actions = eina_list_remove(ed->actions, runp);
if (!ed->actions)
{
eo_event_callback_del(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
ecore_animator_del(ed->animator);
ed->animator = NULL;
}
@ -737,7 +737,7 @@ low_mem_current:
if (!ed->actions)
{
if (ed->canvas_animator)
eo_event_callback_add(ed->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
eo_event_callback_add(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
else
ed->animator = ecore_animator_add(_edje_animator_cb, ed);
}

2
src/lib/efl/Efl.h
View File

@ -63,7 +63,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_text_properties.eo.h"
/* Core interface */
#include "interfaces/efl_core_animator.eo.h"
#include "interfaces/efl_animator.eo.h"
EAPI extern const Eo_Event_Description _EFL_GFX_CHANGED;
EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED;

13
src/lib/efl/interfaces/efl_animator.eo Normal file
View File

@ -0,0 +1,13 @@
import eina_types;
struct Efl.Event.Animator_Tick {
update_area: Eina.Rectangle; [[Area of the canvas that will be pushed to screen.]]
}
interface Efl.Animator {
legacy_prefix: null;
eo_prefix: efl_animator;
events {
animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
}
}

13
src/lib/efl/interfaces/efl_core_animator.eo
View File

@ -1,13 +0,0 @@
import eina_types;
struct Efl.Core.Event.Animator_Tick {
update_area: Eina.Rectangle; [[Area of the canvas that will be pushed to screen.]]
}
interface Efl.Core.Animator {
legacy_prefix: null;
eo_prefix: efl_animator;
events {
animator,tick: Efl.Core.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
}
}

2
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -29,4 +29,4 @@ EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
EO_EVENT_DESCRIPTION("Graphics path changed");
#include "interfaces/efl_model_base.eo.c"
#include "interfaces/efl_core_animator.eo.c"
#include "interfaces/efl_animator.eo.c"

2
src/lib/evas/canvas/evas_canvas.eo
View File

@ -1,6 +1,6 @@
import evas_types;
class Evas.Canvas (Eo.Base, Evas.Common_Interface, Efl.Core.Animator)
class Evas.Canvas (Eo.Base, Evas.Common_Interface, Efl.Animator)
{
legacy_prefix: evas;
data: Evas_Public_Data;

2
src/lib/evas/canvas/evas_object.eo
View File

@ -1,6 +1,6 @@
import evas_types;
abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack, Efl.Core.Animator)
abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx.Base, Efl.Gfx.Stack, Efl.Animator)
{
eo_prefix: evas_obj;
data: Evas_Object_Protected_Data;

10
src/lib/evas/canvas/evas_object_main.c
View File

@ -87,7 +87,7 @@ _animator_repeater(void *data, const Eo_Event *event)
{
Evas_Object_Protected_Data *obj = data;
eo_event_callback_call(obj->object, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info);
eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, event->event_info);
DBG("Emitting animator tick on %p.", obj->object);
return EO_CALLBACK_CONTINUE;
@ -102,11 +102,11 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++)
{
if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK)
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
{
if (obj->animator_ref++ > 0) break;
eo_event_callback_add(obj->layer->evas->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
eo_event_callback_add(obj->layer->evas->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
INF("Registering an animator tick on canvas %p for object %p.",
obj->layer->evas->evas, obj->object);
}
@ -128,11 +128,11 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++)
{
if (array[i].desc == EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK)
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK)
{
if ((--obj->animator_ref) > 0) break;
eo_event_callback_del(obj->layer->evas->evas, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
eo_event_callback_del(obj->layer->evas->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
INF("Unregistering an animator tick on canvas %p for object %p.",
obj->layer->evas->evas, obj->object);
}