vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix typop no longer working for still images. Add some error messages 

Thanks to dassify for noticing
This commit is contained in:
Boris Faure 2015-09-04 20:30:29 +02:00
parent 4c00bec4d6
commit 6f898d5ebe
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/bin/media.c
View File

@ -320,7 +320,7 @@ _type_img_anim_handle(Evas_Object *obj)
EINA_SAFETY_ON_NULL_RETURN_VAL(sd, -1); EINA_SAFETY_ON_NULL_RETURN_VAL(sd, -1);
if (!evas_object_image_animated_get(sd->o_img)) if (!evas_object_image_animated_get(sd->o_img))
return -1; return 0;
sd->fr = 1; sd->fr = 1;
sd->frnum = evas_object_image_animated_frame_count_get(sd->o_img); sd->frnum = evas_object_image_animated_frame_count_get(sd->o_img);
@ -1171,7 +1171,11 @@ media_add(Evas_Object *parent, const char *src, const Config *config, int mode,
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
e = evas_object_evas_get(parent); e = evas_object_evas_get(parent);
if (!e) return NULL; if (!e)
{
ERR("can not get evas");
return NULL;
}
if (!_smart) _smart_init(); if (!_smart) _smart_init();
obj = evas_object_smart_add(e, _smart); obj = evas_object_smart_add(e, _smart);
@ -1304,7 +1308,10 @@ media_add(Evas_Object *parent, const char *src, const Config *config, int mode,
{ {
// XXX: handle sd->url being true? // XXX: handle sd->url being true?
if (_type_thumb_init(obj) < 0) if (_type_thumb_init(obj) < 0)
goto err; {
ERR("failed to init '%s'", src);
goto err;
}
} }
else else
{ {
@ -1312,19 +1319,31 @@ media_add(Evas_Object *parent, const char *src, const Config *config, int mode,
{ {
case MEDIA_TYPE_IMG: case MEDIA_TYPE_IMG:
if (!sd->url && (_type_img_init(obj) < 0)) if (!sd->url && (_type_img_init(obj) < 0))
goto err; {
ERR("failed to init '%s'", src);
goto err;
}
break; break;
case MEDIA_TYPE_SCALE: case MEDIA_TYPE_SCALE:
if (!sd->url && (_type_scale_init(obj) < 0)) if (!sd->url && (_type_scale_init(obj) < 0))
goto err; {
ERR("failed to init '%s'", src);
goto err;
}
break; break;
case MEDIA_TYPE_EDJE: case MEDIA_TYPE_EDJE:
if (!sd->url && (_type_edje_init(obj) < 0)) if (!sd->url && (_type_edje_init(obj) < 0))
goto err; {
ERR("failed to init '%s'", src);
goto err;
}
break; break;
case MEDIA_TYPE_MOV: case MEDIA_TYPE_MOV:
if (!sd->url && (_type_mov_init(obj) < 0)) if (!sd->url && (_type_mov_init(obj) < 0))
goto err; {
ERR("failed to init '%s'", src);
goto err;
}
break; break;
default: default:
break; break;