summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmike <michael.blumenkrantz@gmail.com>2014-02-14 22:22:38 -0500
committerzmike <michael.blumenkrantz@gmail.com>2014-02-14 22:22:38 -0500
commit75988d83e05c77950a038a8e60cc83fc11246e3b (patch)
tree1b0fc6c862bc883935eec133908422b24b0c2eb6
parent94b37b8775704e9f82979e8dc79cc42829c59af7 (diff)
fix eet lyric loading
-rw-r--r--src/modules/eet_loader.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/eet_loader.c b/src/modules/eet_loader.c
index 3372cdc..157fb53 100644
--- a/src/modules/eet_loader.c
+++ b/src/modules/eet_loader.c
@@ -39,17 +39,21 @@ _loader_fetch(Empc_Fetch_Request *req)
39 char *a, *b, *c; 39 char *a, *b, *c;
40 int num = 0; 40 int num = 0;
41 Evas_Object *o = NULL; 41 Evas_Object *o = NULL;
42 Eet_File *ef = NULL;
42 43
43 if (req->type == EMPC_METADATA_TYPE_IMAGE) 44 if (req->type == EMPC_METADATA_TYPE_IMAGE)
44 { 45 {
45 if (!try_img()) 46 if (!try_img())
46 goto end; 47 goto end;
48 ef = ef_img;
47 } 49 }
48 else if (req->type == EMPC_METADATA_TYPE_TEXT) 50 else if (req->type == EMPC_METADATA_TYPE_TEXT)
49 { 51 {
50 if (!try_lyr()) 52 if (!try_lyr())
51 goto end; 53 goto end;
54 ef = ef_lyr;
52 } 55 }
56 if (!ef) goto end;
53 if (req->artist) 57 if (req->artist)
54 { 58 {
55 a = strdupa(req->artist); 59 a = strdupa(req->artist);
@@ -69,7 +73,7 @@ _loader_fetch(Empc_Fetch_Request *req)
69 snprintf(buf, sizeof(buf), "%s:::%s", a ?: "", b ?: ""); 73 snprintf(buf, sizeof(buf), "%s:::%s", a ?: "", b ?: "");
70 else 74 else
71 snprintf(buf, sizeof(buf), "%s:::%s", a ?: "", c ?: ""); 75 snprintf(buf, sizeof(buf), "%s:::%s", a ?: "", c ?: "");
72 free(eet_list(ef_img, buf, &num)); 76 free(eet_list(ef, buf, &num));
73 if (num) 77 if (num)
74 { 78 {
75 if (req->type == EMPC_METADATA_TYPE_IMAGE) 79 if (req->type == EMPC_METADATA_TYPE_IMAGE)