From c25c5aaded4da949efbf25e3e9fc73b148bf5ae8 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Thu, 28 Feb 2013 16:54:26 +1100 Subject: [PATCH] Revert "skin tags: fix the id3 track/disc numbers in conditionals" This reverts commit a395a346719908e7d02ab7a742eb2b938dcc893d. --- apps/gui/skin_engine/skin_tokens.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 33ffc53a9c..e58393e19c 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -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; } -- 2.11.4.GIT