diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/wps-display.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c index cc8009ec5c..71ba4c5433 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -285,34 +285,38 @@ static char* get_tag(struct mp3entry* id3, | |||
285 | return id3->artist; | 285 | return id3->artist; |
286 | 286 | ||
287 | case 'n': /* ID3 Track Number */ | 287 | case 'n': /* ID3 Track Number */ |
288 | if (id3->tracknum) | 288 | if (id3->track_string) |
289 | { | 289 | return id3->track_string; |
290 | |||
291 | if (id3->tracknum) { | ||
290 | snprintf(buf, buf_size, "%d", id3->tracknum); | 292 | snprintf(buf, buf_size, "%d", id3->tracknum); |
291 | return buf; | 293 | return buf; |
292 | } | 294 | } |
293 | else | 295 | return NULL; |
294 | { | 296 | |
295 | return NULL; | ||
296 | } | ||
297 | |||
298 | case 'd': /* ID3 Album/Disc */ | 297 | case 'd': /* ID3 Album/Disc */ |
299 | return id3->album; | 298 | return id3->album; |
300 | 299 | ||
300 | case 'c': /* ID3 Composer */ | ||
301 | return id3->composer; | ||
302 | |||
301 | case 'y': /* year */ | 303 | case 'y': /* year */ |
304 | if( id3->year_string ) | ||
305 | return id3->year_string; | ||
306 | |||
302 | if (id3->year) { | 307 | if (id3->year) { |
303 | snprintf(buf, buf_size, "%d", id3->year); | 308 | snprintf(buf, buf_size, "%d", id3->year); |
304 | return buf; | 309 | return buf; |
305 | } | 310 | } |
306 | else | 311 | return NULL; |
307 | return NULL; | ||
308 | break; | ||
309 | 312 | ||
310 | case 'g': /* genre */ | 313 | case 'g': /* genre */ |
314 | if( id3->genre_string ) | ||
315 | return id3->genre_string ; | ||
316 | |||
311 | if (id3->genre < sizeof(genres)/sizeof(char*)) | 317 | if (id3->genre < sizeof(genres)/sizeof(char*)) |
312 | return (char*)genres[id3->genre]; | 318 | return (char*)genres[id3->genre]; |
313 | else | 319 | return NULL; |
314 | return NULL; | ||
315 | break; | ||
316 | 320 | ||
317 | case 'v': /* id3 version */ | 321 | case 'v': /* id3 version */ |
318 | switch (id3->id3version) { | 322 | switch (id3->id3version) { |