diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-30 15:25:15 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-05-30 15:25:15 +0000 |
commit | 1593b0557cb7baffd28d485231aef10ff9e6616e (patch) | |
tree | 79e2ddd0a3c299f1064ef9b3283cfc8510902b93 /apps/screens.c | |
parent | 68f4d918255e1fafa5c6ba253dff9e6722f48214 (diff) | |
download | rockbox-1593b0557cb7baffd28d485231aef10ff9e6616e.tar.gz rockbox-1593b0557cb7baffd28d485231aef10ff9e6616e.zip |
Accept FS#11313 by Chris Savery. Add composer to the track info screen and some general cleen up.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26409 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/apps/screens.c b/apps/screens.c index d988a521d0..c6a76350e5 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -612,6 +612,7 @@ static const int id3_headers[]= | |||
612 | { | 612 | { |
613 | LANG_ID3_TITLE, | 613 | LANG_ID3_TITLE, |
614 | LANG_ID3_ARTIST, | 614 | LANG_ID3_ARTIST, |
615 | LANG_ID3_COMPOSER, | ||
615 | LANG_ID3_ALBUM, | 616 | LANG_ID3_ALBUM, |
616 | LANG_ID3_ALBUMARTIST, | 617 | LANG_ID3_ALBUMARTIST, |
617 | LANG_ID3_GROUPING, | 618 | LANG_ID3_GROUPING, |
@@ -653,24 +654,24 @@ static const char* id3_get_info(int selected_item, void* data, | |||
653 | {/* data */ | 654 | {/* data */ |
654 | 655 | ||
655 | char * val=NULL; | 656 | char * val=NULL; |
656 | switch(info->info_id[info_no]) | 657 | switch(id3_headers[info->info_id[info_no]]) |
657 | { | 658 | { |
658 | case 0:/*LANG_ID3_TITLE*/ | 659 | case LANG_ID3_TITLE: |
659 | val=id3->title; | 660 | val=id3->title; |
660 | break; | 661 | break; |
661 | case 1:/*LANG_ID3_ARTIST*/ | 662 | case LANG_ID3_ARTIST: |
662 | val=id3->artist; | 663 | val=id3->artist; |
663 | break; | 664 | break; |
664 | case 2:/*LANG_ID3_ALBUM*/ | 665 | case LANG_ID3_ALBUM: |
665 | val=id3->album; | 666 | val=id3->album; |
666 | break; | 667 | break; |
667 | case 3:/*LANG_ID3_ALBUMARTIST*/ | 668 | case LANG_ID3_ALBUMARTIST: |
668 | val=id3->albumartist; | 669 | val=id3->albumartist; |
669 | break; | 670 | break; |
670 | case 4:/*LANG_ID3_GROUPING*/ | 671 | case LANG_ID3_GROUPING: |
671 | val=id3->grouping; | 672 | val=id3->grouping; |
672 | break; | 673 | break; |
673 | case 5:/*LANG_ID3_DISCNUM*/ | 674 | case LANG_ID3_DISCNUM: |
674 | if (id3->disc_string) | 675 | if (id3->disc_string) |
675 | val = id3->disc_string; | 676 | val = id3->disc_string; |
676 | else if (id3->discnum) | 677 | else if (id3->discnum) |
@@ -679,7 +680,7 @@ static const char* id3_get_info(int selected_item, void* data, | |||
679 | val = buffer; | 680 | val = buffer; |
680 | } | 681 | } |
681 | break; | 682 | break; |
682 | case 6:/*LANG_ID3_TRACKNUM*/ | 683 | case LANG_ID3_TRACKNUM: |
683 | if (id3->track_string) | 684 | if (id3->track_string) |
684 | val = id3->track_string; | 685 | val = id3->track_string; |
685 | else if (id3->tracknum) | 686 | else if (id3->tracknum) |
@@ -688,16 +689,16 @@ static const char* id3_get_info(int selected_item, void* data, | |||
688 | val = buffer; | 689 | val = buffer; |
689 | } | 690 | } |
690 | break; | 691 | break; |
691 | case 7:/*LANG_ID3_COMMENT*/ | 692 | case LANG_ID3_COMMENT: |
692 | if (!id3->comment) | 693 | if (!id3->comment) |
693 | return NULL; | 694 | return NULL; |
694 | snprintf(buffer, buffer_len, "%s", id3->comment); | 695 | snprintf(buffer, buffer_len, "%s", id3->comment); |
695 | val=buffer; | 696 | val=buffer; |
696 | break; | 697 | break; |
697 | case 8:/*LANG_ID3_GENRE*/ | 698 | case LANG_ID3_GENRE: |
698 | val = id3->genre_string; | 699 | val = id3->genre_string; |
699 | break; | 700 | break; |
700 | case 9:/*LANG_ID3_YEAR*/ | 701 | case LANG_ID3_YEAR: |
701 | if (id3->year_string) | 702 | if (id3->year_string) |
702 | val = id3->year_string; | 703 | val = id3->year_string; |
703 | else if (id3->year) | 704 | else if (id3->year) |
@@ -706,36 +707,35 @@ static const char* id3_get_info(int selected_item, void* data, | |||
706 | val = buffer; | 707 | val = buffer; |
707 | } | 708 | } |
708 | break; | 709 | break; |
709 | case 10:/*LANG_ID3_LENGTH*/ | 710 | case LANG_ID3_LENGTH: |
710 | format_time(buffer, buffer_len, id3->length); | 711 | format_time(buffer, buffer_len, id3->length); |
711 | val=buffer; | 712 | val=buffer; |
712 | break; | 713 | break; |
713 | case 11:/*LANG_ID3_PLAYLIST*/ | 714 | case LANG_ID3_PLAYLIST: |
714 | snprintf(buffer, buffer_len, "%d/%d", | 715 | snprintf(buffer, buffer_len, "%d/%d", |
715 | playlist_get_display_index(), playlist_amount()); | 716 | playlist_get_display_index(), playlist_amount()); |
716 | val=buffer; | 717 | val=buffer; |
717 | break; | 718 | break; |
718 | case 12:/*LANG_ID3_BITRATE*/ | 719 | case LANG_ID3_BITRATE: |
719 | snprintf(buffer, buffer_len, "%d kbps%s", id3->bitrate, | 720 | snprintf(buffer, buffer_len, "%d kbps%s", id3->bitrate, |
720 | id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) ""); | 721 | id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) ""); |
721 | val=buffer; | 722 | val=buffer; |
722 | break; | 723 | break; |
723 | case 13:/*LANG_ID3_FREQUENCY*/ | 724 | case LANG_ID3_FREQUENCY: |
724 | snprintf(buffer, buffer_len, "%ld Hz", id3->frequency); | 725 | snprintf(buffer, buffer_len, "%ld Hz", id3->frequency); |
725 | val=buffer; | 726 | val=buffer; |
726 | break; | 727 | break; |
727 | #if CONFIG_CODEC == SWCODEC | 728 | case LANG_ID3_TRACK_GAIN: |
728 | case 14:/*LANG_ID3_TRACK_GAIN*/ | ||
729 | val=id3->track_gain_string; | 729 | val=id3->track_gain_string; |
730 | break; | 730 | break; |
731 | case 15:/*LANG_ID3_ALBUM_GAIN*/ | 731 | case LANG_ID3_ALBUM_GAIN: |
732 | val=id3->album_gain_string; | 732 | val=id3->album_gain_string; |
733 | break; | 733 | break; |
734 | case 16:/*LANG_ID3_PATH*/ | 734 | case LANG_ID3_PATH: |
735 | #else | ||
736 | case 14:/*LANG_ID3_PATH*/ | ||
737 | #endif | ||
738 | val=id3->path; | 735 | val=id3->path; |
736 | break; | ||
737 | case LANG_ID3_COMPOSER: | ||
738 | val=id3->composer; | ||
739 | break; | 739 | break; |
740 | } | 740 | } |
741 | return val && *val ? val : NULL; | 741 | return val && *val ? val : NULL; |