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

Accept FS#11313 by Chris Savery. Add composer to the track info screen and some general cleen up.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26409 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-05-30 15:25:15 +00:00
parent 68f4d91825
commit 1593b0557c
3 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/lang/english.lang
View file

@ -13762,3 +13762,17 @@
radio: "Radio Screen" radio: "Radio Screen"
</voice> </voice>
</phrase> </phrase>
<phrase>
id: LANG_ID3_COMPOSER
desc: in tag viewer
user: core
<source>
*: "Composer"
</source>
<dest>
*: "Composer"
</dest>
<voice>
*: ""
</voice>
</phrase>

44
apps/screens.c
View file

@ -612,6 +612,7 @@ static const int id3_headers[]=
{ {
LANG_ID3_TITLE, LANG_ID3_TITLE,
LANG_ID3_ARTIST, LANG_ID3_ARTIST,
LANG_ID3_COMPOSER,
LANG_ID3_ALBUM, LANG_ID3_ALBUM,
LANG_ID3_ALBUMARTIST, LANG_ID3_ALBUMARTIST,
LANG_ID3_GROUPING, LANG_ID3_GROUPING,
@ -653,24 +654,24 @@ static const char* id3_get_info(int selected_item, void* data,
{/* data */ {/* data */
char * val=NULL; char * val=NULL;
switch(info->info_id[info_no]) switch(id3_headers[info->info_id[info_no]])
{ {
case 0:/*LANG_ID3_TITLE*/ case LANG_ID3_TITLE:
val=id3->title; val=id3->title;
break; break;
case 1:/*LANG_ID3_ARTIST*/ case LANG_ID3_ARTIST:
val=id3->artist; val=id3->artist;
break; break;
case 2:/*LANG_ID3_ALBUM*/ case LANG_ID3_ALBUM:
val=id3->album; val=id3->album;
break; break;
case 3:/*LANG_ID3_ALBUMARTIST*/ case LANG_ID3_ALBUMARTIST:
val=id3->albumartist; val=id3->albumartist;
break; break;
case 4:/*LANG_ID3_GROUPING*/ case LANG_ID3_GROUPING:
val=id3->grouping; val=id3->grouping;
break; break;
case 5:/*LANG_ID3_DISCNUM*/ case LANG_ID3_DISCNUM:
if (id3->disc_string) if (id3->disc_string)
val = id3->disc_string; val = id3->disc_string;
else if (id3->discnum) else if (id3->discnum)
@ -679,7 +680,7 @@ static const char* id3_get_info(int selected_item, void* data,
val = buffer; val = buffer;
} }
break; break;
case 6:/*LANG_ID3_TRACKNUM*/ case LANG_ID3_TRACKNUM:
if (id3->track_string) if (id3->track_string)
val = id3->track_string; val = id3->track_string;
else if (id3->tracknum) else if (id3->tracknum)
@ -688,16 +689,16 @@ static const char* id3_get_info(int selected_item, void* data,
val = buffer; val = buffer;
} }
break; break;
case 7:/*LANG_ID3_COMMENT*/ case LANG_ID3_COMMENT:
if (!id3->comment) if (!id3->comment)
return NULL; return NULL;
snprintf(buffer, buffer_len, "%s", id3->comment); snprintf(buffer, buffer_len, "%s", id3->comment);
val=buffer; val=buffer;
break; break;
case 8:/*LANG_ID3_GENRE*/ case LANG_ID3_GENRE:
val = id3->genre_string; val = id3->genre_string;
break; break;
case 9:/*LANG_ID3_YEAR*/ case LANG_ID3_YEAR:
if (id3->year_string) if (id3->year_string)
val = id3->year_string; val = id3->year_string;
else if (id3->year) else if (id3->year)
@ -706,36 +707,35 @@ static const char* id3_get_info(int selected_item, void* data,
val = buffer; val = buffer;
} }
break; break;
case 10:/*LANG_ID3_LENGTH*/ case LANG_ID3_LENGTH:
format_time(buffer, buffer_len, id3->length); format_time(buffer, buffer_len, id3->length);
val=buffer; val=buffer;
break; break;
case 11:/*LANG_ID3_PLAYLIST*/ case LANG_ID3_PLAYLIST:
snprintf(buffer, buffer_len, "%d/%d", snprintf(buffer, buffer_len, "%d/%d",
playlist_get_display_index(), playlist_amount()); playlist_get_display_index(), playlist_amount());
val=buffer; val=buffer;
break; break;
case 12:/*LANG_ID3_BITRATE*/ case LANG_ID3_BITRATE:
snprintf(buffer, buffer_len, "%d kbps%s", id3->bitrate, snprintf(buffer, buffer_len, "%d kbps%s", id3->bitrate,
id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) ""); id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) "");
val=buffer; val=buffer;
break; break;
case 13:/*LANG_ID3_FREQUENCY*/ case LANG_ID3_FREQUENCY:
snprintf(buffer, buffer_len, "%ld Hz", id3->frequency); snprintf(buffer, buffer_len, "%ld Hz", id3->frequency);
val=buffer; val=buffer;
break; break;
#if CONFIG_CODEC == SWCODEC case LANG_ID3_TRACK_GAIN:
case 14:/*LANG_ID3_TRACK_GAIN*/
val=id3->track_gain_string; val=id3->track_gain_string;
break; break;
case 15:/*LANG_ID3_ALBUM_GAIN*/ case LANG_ID3_ALBUM_GAIN:
val=id3->album_gain_string; val=id3->album_gain_string;
break; break;
case 16:/*LANG_ID3_PATH*/ case LANG_ID3_PATH:
#else
case 14:/*LANG_ID3_PATH*/
#endif
val=id3->path; val=id3->path;
break;
case LANG_ID3_COMPOSER:
val=id3->composer;
break; break;
} }
return val && *val ? val : NULL; return val && *val ? val : NULL;

1
docs/CREDITS
View file

@ -541,6 +541,7 @@ Andrew Rodland
Luca Leonardo Scorcia Luca Leonardo Scorcia
Gerhard Zintel Gerhard Zintel
Adrián Cereto Massagué Adrián Cereto Massagué
Chris Savery
The libmad team The libmad team
The wavpack team The wavpack team