len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "skin tags: fix the id3 track/disc numbers in conditionals"

Browse source 
This reverts commit a395a34671.
This commit is contained in:
Jonathan Gordon 2013-02-28 16:54:26 +11:00
parent 22803114c8
commit c25c5aaded
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/gui/skin_engine/skin_tokens.c
View file

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