e_comp_object: make e_comp_object_init/shutdown functions

and generate the new event types for the e_comp_object at e_comp_object_init functions
instead of doing that at e_comp.c file.

Change-Id: I51ed258bfaa4bf5e2bd90b74448777e8332d49ab

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 5b4715e..d040545 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -388,15 +388,10 @@ e_comp_init(void)
    ecore_frametime = ecore_animator_frametime_get();
 
    E_EVENT_COMPOSITOR_RESIZE = ecore_event_type_new();
-   E_EVENT_COMP_OBJECT_ADD = ecore_event_type_new();
    E_EVENT_COMPOSITOR_DISABLE = ecore_event_type_new();
    E_EVENT_COMPOSITOR_ENABLE = ecore_event_type_new();
    E_EVENT_COMPOSITOR_FPS_UPDATE = ecore_event_type_new();
 
-   E_EVENT_COMP_OBJECT_IMG_RENDER = ecore_event_type_new();
-   E_EVENT_COMP_OBJECT_EFFECT_START = ecore_event_type_new();
-   E_EVENT_COMP_OBJECT_EFFECT_END = ecore_event_type_new();
-
    ignores = eina_hash_pointer_new(NULL);
 
    e_main_ts_begin("\tE_Comp_Data Init");
@@ -431,6 +426,7 @@ e_comp_init(void)
         conf->version = E_COMP_VERSION;
      }
 
+   e_comp_object_init();
    e_comp_new();
 
    /* conf->hwc configuration has to be check before e_comp_screen_init() */
@@ -522,6 +518,7 @@ e_comp_shutdown(void)
    e_comp_screen_shutdown();
 
    e_object_del(E_OBJECT(e_comp));
+   e_comp_object_shutdown();
    E_FREE_LIST(handlers, ecore_event_handler_del);
    E_FREE_LIST(actions, e_object_del);
    E_FREE_LIST(hooks, e_client_hook_del);

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 4925533..6cb7222 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3557,6 +3557,21 @@ _e_comp_smart_init(void)
    }
 }
 
+EINTERN void
+e_comp_object_init(void)
+{
+   E_EVENT_COMP_OBJECT_ADD = ecore_event_type_new();
+   E_EVENT_COMP_OBJECT_IMG_RENDER = ecore_event_type_new();
+   E_EVENT_COMP_OBJECT_EFFECT_START = ecore_event_type_new();
+   E_EVENT_COMP_OBJECT_EFFECT_END = ecore_event_type_new();
+}
+
+EINTERN void
+e_comp_object_shutdown(void)
+{
+
+}
+
 E_API void
 e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled)
 {

diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h
index 3b06b59..8e91b6f 100644 (file)
--- a/src/bin/e_comp_object.h
+++ b/src/bin/e_comp_object.h
@@ -94,6 +94,9 @@ extern E_API int E_EVENT_COMP_OBJECT_IMG_RENDER;
 extern E_API int E_EVENT_COMP_OBJECT_EFFECT_START;
 extern E_API int E_EVENT_COMP_OBJECT_EFFECT_END;
 
+EINTERN void e_comp_object_init(void);
+EINTERN void e_comp_object_shutdown(void);
+
 E_API void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled);
 E_API Eina_Bool e_comp_object_mirror_visibility_check(Evas_Object *obj);
 E_API Evas_Object *e_comp_object_client_add(E_Client *ec);