efl/emotion: remove handle from wrong place.
that handle should live elsewhere, it was a hack. SVN revision: 82598
This commit is contained in:
parent
6e963a6118
commit
619d6033f3
|
@ -105,8 +105,6 @@ struct _Emotion_Video_Module
|
||||||
const char * (*meta_get) (void *ef, int meta);
|
const char * (*meta_get) (void *ef, int meta);
|
||||||
void (*priority_set) (void *ef, Eina_Bool priority);
|
void (*priority_set) (void *ef, Eina_Bool priority);
|
||||||
Eina_Bool (*priority_get) (void *ef);
|
Eina_Bool (*priority_get) (void *ef);
|
||||||
|
|
||||||
Eina_Emotion_Plugins *plugin;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
EAPI void *_emotion_video_get(const Evas_Object *obj);
|
EAPI void *_emotion_video_get(const Evas_Object *obj);
|
||||||
|
|
|
@ -152,6 +152,7 @@ _emotion_module_unregister(const char *name)
|
||||||
|
|
||||||
struct _Emotion_Engine_Instance
|
struct _Emotion_Engine_Instance
|
||||||
{
|
{
|
||||||
|
Eina_Emotion_Plugins *plugin;
|
||||||
Emotion_Video_Module *api;
|
Emotion_Video_Module *api;
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
char *name;
|
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));
|
Emotion_Engine_Instance *inst = calloc(1, sizeof(Emotion_Engine_Instance));
|
||||||
INF("opened %s, mod=%p, video=%p", name, mod, data);
|
INF("opened %s, mod=%p, video=%p", name, mod, data);
|
||||||
mod->plugin = plugin;
|
inst->plugin = plugin;
|
||||||
inst->api = mod;
|
inst->api = mod;
|
||||||
inst->obj = obj;
|
inst->obj = obj;
|
||||||
inst->data = data;
|
inst->data = data;
|
||||||
|
@ -258,7 +259,7 @@ void
|
||||||
emotion_engine_instance_del(Emotion_Engine_Instance *inst)
|
emotion_engine_instance_del(Emotion_Engine_Instance *inst)
|
||||||
{
|
{
|
||||||
EINA_SAFETY_ON_NULL_RETURN(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
|
Eina_Bool
|
||||||
|
|
|
@ -1762,8 +1762,7 @@ static Emotion_Video_Module em_module =
|
||||||
em_eject, /* eject */
|
em_eject, /* eject */
|
||||||
em_meta_get, /* meta_get */
|
em_meta_get, /* meta_get */
|
||||||
NULL, /* priority_set */
|
NULL, /* priority_set */
|
||||||
NULL, /* priority_get */
|
NULL /* priority_get */
|
||||||
NULL /* handle */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
|
|
@ -270,8 +270,7 @@ static Emotion_Video_Module em_module =
|
||||||
em_eject, /* eject */
|
em_eject, /* eject */
|
||||||
em_meta_get, /* meta_get */
|
em_meta_get, /* meta_get */
|
||||||
em_priority_set, /* priority_set */
|
em_priority_set, /* priority_set */
|
||||||
em_priority_get, /* priority_get */
|
em_priority_get /* priority_get */
|
||||||
NULL /* handle */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int priority_overide = 0;
|
static int priority_overide = 0;
|
||||||
|
|
|
@ -1595,8 +1595,7 @@ static Emotion_Video_Module em_module =
|
||||||
em_eject, /* eject */
|
em_eject, /* eject */
|
||||||
em_meta_get, /* meta_get */
|
em_meta_get, /* meta_get */
|
||||||
NULL, /* priority_set */
|
NULL, /* priority_set */
|
||||||
NULL, /* priority_get */
|
NULL /* priority_get */
|
||||||
NULL /* handle */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
|
Loading…
Reference in New Issue