forked from enlightenment/efl
parent
22eee9acc5
commit
cc8c268dcd
|
@ -131,7 +131,7 @@ _emotion_module_close(Emotion_Video_Module *mod, void *video)
|
||||||
|
|
||||||
handle = mod->handle;
|
handle = mod->handle;
|
||||||
module_close = dlsym(handle, "module_close");
|
module_close = dlsym(handle, "module_close");
|
||||||
if (module_close) module_close(mod, video);
|
if ((module_close) && (video)) module_close(mod, video);
|
||||||
dlclose(handle);
|
dlclose(handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,6 +190,7 @@ emotion_object_file_set(Evas_Object *obj, const char *file)
|
||||||
if ((file) && (file[0] != 0))
|
if ((file) && (file[0] != 0))
|
||||||
{
|
{
|
||||||
int w, h;
|
int w, h;
|
||||||
|
|
||||||
sd->file = strdup(file);
|
sd->file = strdup(file);
|
||||||
if (sd->module)
|
if (sd->module)
|
||||||
{
|
{
|
||||||
|
@ -210,6 +211,7 @@ emotion_object_file_set(Evas_Object *obj, const char *file)
|
||||||
{
|
{
|
||||||
sd->module->file_close(sd->video);
|
sd->module->file_close(sd->video);
|
||||||
sd->video = NULL;
|
sd->video = NULL;
|
||||||
|
printf("VIDEO -> NULL\n");
|
||||||
evas_object_image_size_set(sd->obj, 0, 0);
|
evas_object_image_size_set(sd->obj, 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1088,8 +1090,9 @@ _smart_del(Evas_Object * obj)
|
||||||
Smart_Data *sd;
|
Smart_Data *sd;
|
||||||
sd = evas_object_smart_data_get(obj);
|
sd = evas_object_smart_data_get(obj);
|
||||||
if (!sd) return;
|
if (!sd) return;
|
||||||
|
printf("DEL: sd->video = %p\n", sd->video);
|
||||||
if (sd->video) sd->module->file_close(sd->video);
|
if (sd->video) sd->module->file_close(sd->video);
|
||||||
if (sd->module) _emotion_module_close(sd->module, sd->video);
|
_emotion_module_close(sd->module, sd->video);
|
||||||
evas_object_del(sd->obj);
|
evas_object_del(sd->obj);
|
||||||
if (sd->file) free(sd->file);
|
if (sd->file) free(sd->file);
|
||||||
if (sd->job) ecore_job_del(sd->job);
|
if (sd->job) ecore_job_del(sd->job);
|
||||||
|
|
|
@ -360,7 +360,7 @@ em_file_close(void *ef)
|
||||||
Emotion_Xine_Video *ev;
|
Emotion_Xine_Video *ev;
|
||||||
|
|
||||||
ev = (Emotion_Xine_Video *)ef;
|
ev = (Emotion_Xine_Video *)ef;
|
||||||
|
if (!ev) return;
|
||||||
printf("EX pause end...\n");
|
printf("EX pause end...\n");
|
||||||
if (!emotion_object_play_get(ev->obj))
|
if (!emotion_object_play_get(ev->obj))
|
||||||
// if (xine_get_param(ev->stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
|
// if (xine_get_param(ev->stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE)
|
||||||
|
|
Loading…
Reference in New Issue