From 619d6033f36fad2be7b165757880bdd4e72e45c2 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Fri, 11 Jan 2013 00:31:56 +0000 Subject: [PATCH] efl/emotion: remove handle from wrong place. that handle should live elsewhere, it was a hack. SVN revision: 82598 --- src/lib/emotion/Emotion_Module.h | 2 -- src/lib/emotion/emotion_modules.c | 5 +++-- src/modules/emotion/generic/emotion_generic.c | 3 +-- src/modules/emotion/gstreamer/emotion_gstreamer.c | 3 +-- src/modules/emotion/xine/emotion_xine.c | 3 +-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/lib/emotion/Emotion_Module.h b/src/lib/emotion/Emotion_Module.h index 8c53c21688..0dc9f9926b 100644 --- a/src/lib/emotion/Emotion_Module.h +++ b/src/lib/emotion/Emotion_Module.h @@ -105,8 +105,6 @@ struct _Emotion_Video_Module const char * (*meta_get) (void *ef, int meta); void (*priority_set) (void *ef, Eina_Bool priority); Eina_Bool (*priority_get) (void *ef); - - Eina_Emotion_Plugins *plugin; }; EAPI void *_emotion_video_get(const Evas_Object *obj); diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c index 41168565a7..3e8a18a320 100644 --- a/src/lib/emotion/emotion_modules.c +++ b/src/lib/emotion/emotion_modules.c @@ -152,6 +152,7 @@ _emotion_module_unregister(const char *name) struct _Emotion_Engine_Instance { + Eina_Emotion_Plugins *plugin; Emotion_Video_Module *api; Evas_Object *obj; char *name; @@ -238,7 +239,7 @@ emotion_engine_instance_new(const char *name, Evas_Object *obj, Emotion_Module_O { Emotion_Engine_Instance *inst = calloc(1, sizeof(Emotion_Engine_Instance)); INF("opened %s, mod=%p, video=%p", name, mod, data); - mod->plugin = plugin; + inst->plugin = plugin; inst->api = mod; inst->obj = obj; inst->data = data; @@ -258,7 +259,7 @@ void emotion_engine_instance_del(Emotion_Engine_Instance *inst) { EINA_SAFETY_ON_NULL_RETURN(inst); - inst->api->plugin->close(inst->api, inst->data); // TODO: weird api + inst->plugin->close(inst->api, inst->data); // TODO: weird api } Eina_Bool diff --git a/src/modules/emotion/generic/emotion_generic.c b/src/modules/emotion/generic/emotion_generic.c index d19ce6e24c..b30a65ea21 100644 --- a/src/modules/emotion/generic/emotion_generic.c +++ b/src/modules/emotion/generic/emotion_generic.c @@ -1762,8 +1762,7 @@ static Emotion_Video_Module em_module = em_eject, /* eject */ em_meta_get, /* meta_get */ NULL, /* priority_set */ - NULL, /* priority_get */ - NULL /* handle */ + NULL /* priority_get */ }; static Eina_Bool diff --git a/src/modules/emotion/gstreamer/emotion_gstreamer.c b/src/modules/emotion/gstreamer/emotion_gstreamer.c index 014d26d5c3..066314f14c 100644 --- a/src/modules/emotion/gstreamer/emotion_gstreamer.c +++ b/src/modules/emotion/gstreamer/emotion_gstreamer.c @@ -270,8 +270,7 @@ static Emotion_Video_Module em_module = em_eject, /* eject */ em_meta_get, /* meta_get */ em_priority_set, /* priority_set */ - em_priority_get, /* priority_get */ - NULL /* handle */ + em_priority_get /* priority_get */ }; static int priority_overide = 0; diff --git a/src/modules/emotion/xine/emotion_xine.c b/src/modules/emotion/xine/emotion_xine.c index 69f962a812..c4a71d983b 100644 --- a/src/modules/emotion/xine/emotion_xine.c +++ b/src/modules/emotion/xine/emotion_xine.c @@ -1595,8 +1595,7 @@ static Emotion_Video_Module em_module = em_eject, /* eject */ em_meta_get, /* meta_get */ NULL, /* priority_set */ - NULL, /* priority_get */ - NULL /* handle */ + NULL /* priority_get */ }; static Eina_Bool