diff options
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/apps/screens.c b/apps/screens.c index 1f0939ab8d..b74347405e 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -1151,6 +1151,7 @@ static const int id3_headers[]= | |||
1151 | LANG_ID3_ARTIST, | 1151 | LANG_ID3_ARTIST, |
1152 | LANG_ID3_ALBUM, | 1152 | LANG_ID3_ALBUM, |
1153 | LANG_ID3_ALBUMARTIST, | 1153 | LANG_ID3_ALBUMARTIST, |
1154 | LANG_ID3_GROUPING, | ||
1154 | LANG_ID3_DISCNUM, | 1155 | LANG_ID3_DISCNUM, |
1155 | LANG_ID3_TRACKNUM, | 1156 | LANG_ID3_TRACKNUM, |
1156 | LANG_ID3_COMMENT, | 1157 | LANG_ID3_COMMENT, |
@@ -1193,7 +1194,10 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) | |||
1193 | case 3:/*LANG_ID3_ALBUMARTIST*/ | 1194 | case 3:/*LANG_ID3_ALBUMARTIST*/ |
1194 | info=id3->albumartist; | 1195 | info=id3->albumartist; |
1195 | break; | 1196 | break; |
1196 | case 4:/*LANG_ID3_DISCNUM*/ | 1197 | case 4:/*LANG_ID3_ALBUMARTIST*/ |
1198 | info=id3->grouping; | ||
1199 | break; | ||
1200 | case 5:/*LANG_ID3_DISCNUM*/ | ||
1197 | if (id3->disc_string) | 1201 | if (id3->disc_string) |
1198 | info = id3->disc_string; | 1202 | info = id3->disc_string; |
1199 | else if (id3->discnum) | 1203 | else if (id3->discnum) |
@@ -1202,7 +1206,7 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) | |||
1202 | info = buffer; | 1206 | info = buffer; |
1203 | } | 1207 | } |
1204 | break; | 1208 | break; |
1205 | case 5:/*LANG_ID3_TRACKNUM*/ | 1209 | case 6:/*LANG_ID3_TRACKNUM*/ |
1206 | if (id3->track_string) | 1210 | if (id3->track_string) |
1207 | info = id3->track_string; | 1211 | info = id3->track_string; |
1208 | else if (id3->tracknum) | 1212 | else if (id3->tracknum) |
@@ -1211,13 +1215,13 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) | |||
1211 | info = buffer; | 1215 | info = buffer; |
1212 | } | 1216 | } |
1213 | break; | 1217 | break; |
1214 | case 6:/*LANG_ID3_COMMENT*/ | 1218 | case 7:/*LANG_ID3_COMMENT*/ |
1215 | info=id3->comment; | 1219 | info=id3->comment; |
1216 | break; | 1220 | break; |
1217 | case 7:/*LANG_ID3_GENRE*/ | 1221 | case 8:/*LANG_ID3_GENRE*/ |
1218 | info = id3->genre_string; | 1222 | info = id3->genre_string; |
1219 | break; | 1223 | break; |
1220 | case 8:/*LANG_ID3_YEAR*/ | 1224 | case 9:/*LANG_ID3_YEAR*/ |
1221 | if (id3->year_string) | 1225 | if (id3->year_string) |
1222 | info = id3->year_string; | 1226 | info = id3->year_string; |
1223 | else if (id3->year) | 1227 | else if (id3->year) |
@@ -1226,34 +1230,34 @@ static char * id3_get_info(int selected_item, void* data, char *buffer) | |||
1226 | info = buffer; | 1230 | info = buffer; |
1227 | } | 1231 | } |
1228 | break; | 1232 | break; |
1229 | case 9:/*LANG_ID3_LENGTH*/ | 1233 | case 10:/*LANG_ID3_LENGTH*/ |
1230 | format_time(buffer, MAX_PATH, id3->length); | 1234 | format_time(buffer, MAX_PATH, id3->length); |
1231 | info=buffer; | 1235 | info=buffer; |
1232 | break; | 1236 | break; |
1233 | case 10:/*LANG_ID3_PLAYLIST*/ | 1237 | case 11:/*LANG_ID3_PLAYLIST*/ |
1234 | snprintf(buffer, MAX_PATH, "%d/%d", playlist_get_display_index(), | 1238 | snprintf(buffer, MAX_PATH, "%d/%d", playlist_get_display_index(), |
1235 | playlist_amount()); | 1239 | playlist_amount()); |
1236 | info=buffer; | 1240 | info=buffer; |
1237 | break; | 1241 | break; |
1238 | case 11:/*LANG_ID3_BITRATE*/ | 1242 | case 12:/*LANG_ID3_BITRATE*/ |
1239 | snprintf(buffer, MAX_PATH, "%d kbps%s", id3->bitrate, | 1243 | snprintf(buffer, MAX_PATH, "%d kbps%s", id3->bitrate, |
1240 | id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) ""); | 1244 | id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) ""); |
1241 | info=buffer; | 1245 | info=buffer; |
1242 | break; | 1246 | break; |
1243 | case 12:/*LANG_ID3_FREQUENCY*/ | 1247 | case 13:/*LANG_ID3_FREQUENCY*/ |
1244 | snprintf(buffer, MAX_PATH, "%ld Hz", id3->frequency); | 1248 | snprintf(buffer, MAX_PATH, "%ld Hz", id3->frequency); |
1245 | info=buffer; | 1249 | info=buffer; |
1246 | break; | 1250 | break; |
1247 | #if CONFIG_CODEC == SWCODEC | 1251 | #if CONFIG_CODEC == SWCODEC |
1248 | case 13:/*LANG_ID3_TRACK_GAIN*/ | 1252 | case 14:/*LANG_ID3_TRACK_GAIN*/ |
1249 | info=id3->track_gain_string; | 1253 | info=id3->track_gain_string; |
1250 | break; | 1254 | break; |
1251 | case 14:/*LANG_ID3_ALBUM_GAIN*/ | 1255 | case 15:/*LANG_ID3_ALBUM_GAIN*/ |
1252 | info=id3->album_gain_string; | 1256 | info=id3->album_gain_string; |
1253 | break; | 1257 | break; |
1254 | case 15:/*LANG_ID3_PATH*/ | 1258 | case 16:/*LANG_ID3_PATH*/ |
1255 | #else | 1259 | #else |
1256 | case 13:/*LANG_ID3_PATH*/ | 1260 | case 17:/*LANG_ID3_PATH*/ |
1257 | #endif | 1261 | #endif |
1258 | info=id3->path; | 1262 | info=id3->path; |
1259 | break; | 1263 | break; |