From 6f898d5ebe3c32797f77b85b4742996cc7e6922a Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Fri, 4 Sep 2015 20:30:29 +0200 Subject: [PATCH] fix typop no longer working for still images. Add some error messages Thanks to dassify for noticing --- src/bin/media.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/src/bin/media.c b/src/bin/media.c index 7cb4d6ca..da7d2c16 100644 --- a/src/bin/media.c +++ b/src/bin/media.c @@ -320,7 +320,7 @@ _type_img_anim_handle(Evas_Object *obj) EINA_SAFETY_ON_NULL_RETURN_VAL(sd, -1); if (!evas_object_image_animated_get(sd->o_img)) - return -1; + return 0; sd->fr = 1; 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); e = evas_object_evas_get(parent); - if (!e) return NULL; + if (!e) + { + ERR("can not get evas"); + return NULL; + } if (!_smart) _smart_init(); 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? if (_type_thumb_init(obj) < 0) - goto err; + { + ERR("failed to init '%s'", src); + goto err; + } } else { @@ -1312,19 +1319,31 @@ media_add(Evas_Object *parent, const char *src, const Config *config, int mode, { case MEDIA_TYPE_IMG: if (!sd->url && (_type_img_init(obj) < 0)) - goto err; + { + ERR("failed to init '%s'", src); + goto err; + } break; case MEDIA_TYPE_SCALE: if (!sd->url && (_type_scale_init(obj) < 0)) - goto err; + { + ERR("failed to init '%s'", src); + goto err; + } break; case MEDIA_TYPE_EDJE: if (!sd->url && (_type_edje_init(obj) < 0)) - goto err; + { + ERR("failed to init '%s'", src); + goto err; + } break; case MEDIA_TYPE_MOV: if (!sd->url && (_type_mov_init(obj) < 0)) - goto err; + { + ERR("failed to init '%s'", src); + goto err; + } break; default: break;