diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2007-02-10 12:09:28 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2007-02-10 12:09:28 +0000 |
| commit | 4e9766477b37579bfa0249fa17818da8d348db7f (patch) | |
| tree | 0fceae7fd07d436285ae3605621585b58535919d /apps/screens.c | |
| parent | 7bf62e8da66ca8ff0acc2702f92ea4fe06eb94b1 (diff) | |
FS#6638 - Album artist and comment patch for WPS and tagcache. Export
your database before updating because initialization is needed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12255 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screens.c')
| -rw-r--r-- | apps/screens.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/apps/screens.c b/apps/screens.c index d1929c2c8c..631ce80343 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -1142,7 +1142,9 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) LANG_ID3_TITLE, LANG_ID3_ARTIST, LANG_ID3_ALBUM, + LANG_ID3_ALBUMARTIST, LANG_ID3_TRACKNUM, + LANG_ID3_COMMENT, LANG_ID3_GENRE, LANG_ID3_YEAR, LANG_ID3_LENGTH, @@ -1172,7 +1174,10 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) case 2:/*LANG_ID3_ALBUM*/ info=id3->album; break; - case 3:/*LANG_ID3_TRACKNUM*/ + case 3:/*LANG_ID3_ALBUMARTIST*/ + info=id3->albumartist; + break; + case 4:/*LANG_ID3_TRACKNUM*/ if (id3->track_string) info = id3->track_string; else if (id3->tracknum) @@ -1181,10 +1186,13 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) info = buffer; } break; - case 4:/*LANG_ID3_GENRE*/ + case 5:/*LANG_ID3_COMMENT*/ + info=id3->comment; + break; + case 6:/*LANG_ID3_GENRE*/ info = id3_get_genre(id3); break; - case 5:/*LANG_ID3_YEAR*/ + case 7:/*LANG_ID3_YEAR*/ if (id3->year_string) info = id3->year_string; else if (id3->year) @@ -1193,34 +1201,34 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) info = buffer; } break; - case 6:/*LANG_ID3_LENGTH*/ + case 8:/*LANG_ID3_LENGTH*/ gui_wps_format_time(buffer, MAX_PATH, id3->length); info=buffer; break; - case 7:/*LANG_ID3_PLAYLIST*/ + case 9:/*LANG_ID3_PLAYLIST*/ snprintf(buffer, MAX_PATH, "%d/%d", playlist_get_display_index(), playlist_amount()); info=buffer; break; - case 8:/*LANG_ID3_BITRATE*/ + case 10:/*LANG_ID3_BITRATE*/ snprintf(buffer, MAX_PATH, "%d kbps%s", id3->bitrate, id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) ""); info=buffer; break; - case 9:/*LANG_ID3_FRECUENCY*/ + case 11:/*LANG_ID3_FRECUENCY*/ snprintf(buffer, MAX_PATH, "%ld Hz", id3->frequency); info=buffer; break; #if CONFIG_CODEC == SWCODEC - case 10:/*LANG_ID3_TRACK_GAIN*/ + case 12:/*LANG_ID3_TRACK_GAIN*/ info=id3->track_gain_string; break; - case 11:/*LANG_ID3_ALBUM_GAIN*/ + case 13:/*LANG_ID3_ALBUM_GAIN*/ info=id3->album_gain_string; break; - case 12:/*LANG_ID3_PATH*/ + case 14:/*LANG_ID3_PATH*/ #else - case 10:/*LANG_ID3_PATH*/ + case 12:/*LANG_ID3_PATH*/ #endif info=id3->path; break; |