diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2013-02-28 16:53:41 +1100 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2013-02-28 16:53:41 +1100 |
| commit | 3a13150a812b7be14c5f2e43ee2a04348cbf0f1b (patch) | |
| tree | 1978383c9ae0191b402330d571d27279d7460329 /apps/gui/skin_engine | |
| parent | 2febee5265909fd116dce1d39d1091dcbc532b59 (diff) | |
| download | rockbox-3a13150a812b7be14c5f2e43ee2a04348cbf0f1b.tar.gz rockbox-3a13150a812b7be14c5f2e43ee2a04348cbf0f1b.zip | |
Revert "skin tags: fix the id3 track/disc numbers in conditionals"
This reverts commit a395a346719908e7d02ab7a742eb2b938dcc893d.
And fixes FS#12836 - need to rethink how to do this later.
Diffstat (limited to 'apps/gui/skin_engine')
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 14 |
1 files 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; } |