summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-02-21 10:06:02 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-02-22 09:26:55 +0100
commitc4f33c67a8d75888b21a0f464b0b1c82bd55bd0b (patch)
tree2835fab56c775b14bca1ff1b0af859542557f4c9 /src/lib/emotion
parent7165003bc60177818a491db0d6a557dd0767554b (diff)
move from efl.vpath to eina_vpath
The usages from efl.vpath are moved to to eina_vpath
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/emotion_smart.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index abcdc82..7e33a90 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -69,7 +69,6 @@ struct _Efl_Canvas_Video_Data
69 69
70 Ecore_Job *job; 70 Ecore_Job *job;
71 71
72 Efl_Vpath_File *file_obj;
73 Emotion_Xattr_Data *xattr; 72 Emotion_Xattr_Data *xattr;
74 73
75 const char *title; 74 const char *title;
@@ -372,35 +371,17 @@ _efl_canvas_video_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Canvas_Video_Data *
372 _emotion_image_data_zero(sd->obj); 371 _emotion_image_data_zero(sd->obj);
373 sd->open = 0; 372 sd->open = 0;
374 373
375 if (sd->file_obj)
376 {
377 efl_del(sd->file_obj);
378 sd->file_obj = NULL;
379 }
380 if (file) 374 if (file)
381 { 375 {
382 sd->file_obj = efl_vpath_manager_fetch(EFL_VPATH_MANAGER_CLASS, file); 376 file2 = eina_vpath_resolve(file);
383 efl_vpath_file_do(sd->file_obj);
384 // XXX:FIXME: allow this to be async
385 efl_vpath_file_wait(sd->file_obj);
386 file2 = efl_vpath_file_result_get(sd->file_obj);
387 } 377 }
388 378
389 if (!emotion_engine_instance_file_open(sd->engine_instance, file2)) 379 if (!emotion_engine_instance_file_open(sd->engine_instance, file2))
390 { 380 {
391 WRN("Couldn't open file=%s", sd->file); 381 WRN("Couldn't open file=%s", sd->file);
392 if (sd->file_obj)
393 {
394 efl_del(sd->file_obj);
395 sd->file_obj = NULL;
396 }
397 return EINA_FALSE; 382 return EINA_FALSE;
398 } 383 }
399 if ((sd->file_obj) && (!efl_vpath_file_keep_get(sd->file_obj))) 384 free(file2);
400 {
401 efl_del(sd->file_obj);
402 sd->file_obj = NULL;
403 }
404 DBG("successfully opened file=%s", sd->file); 385 DBG("successfully opened file=%s", sd->file);
405 sd->pos = 0.0; 386 sd->pos = 0.0;
406 if (sd->play) emotion_engine_instance_play(sd->engine_instance, 0.0); 387 if (sd->play) emotion_engine_instance_play(sd->engine_instance, 0.0);