Revert "skin tags: fix the id3 track/disc numbers in conditionals"
authorJonathan Gordon <rockbox@jdgordon.info>
Thu, 28 Feb 2013 05:54:26 +0000 (28 16:54 +1100)
committerJonathan Gordon <rockbox@jdgordon.info>
Thu, 28 Feb 2013 05:54:26 +0000 (28 16:54 +1100)
apps/gui/skin_engine/skin_tokens.c

index 33ffc53..e58393e 100644 (file)
@@ -254,27 +254,17 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
             case SKIN_TOKEN_METADATA_GENRE:
                 return id3->genre_string;
             case SKIN_TOKEN_METADATA_DISC_NUMBER:
-                if (id3->disc_string) {
-                    if (intval)
-                        *intval = atoi(id3->disc_string);
+                if (id3->disc_string)
                     return id3->disc_string;
-                }
                 if (id3->discnum) {
-                    if (intval)
-                        *intval = id3->discnum;
                     snprintf(buf, buf_size, "%d", id3->discnum);
                     return buf;
                 }
                 return NULL;
             case SKIN_TOKEN_METADATA_TRACK_NUMBER:
-                if (id3->track_string) {
-                    if (intval)
-                        *intval = atoi(id3->track_string);
+                if (id3->track_string)
                     return id3->track_string;
-                }
                 if (id3->tracknum) {
-                    if (intval)
-                        *intval = id3->tracknum;
                     snprintf(buf, buf_size, "%d", id3->tracknum);
                     return buf;
                 }