diff options
-rw-r--r-- | firmware/id3.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/firmware/id3.c b/firmware/id3.c index f8b85e9ec4..9bf8c48e57 100644 --- a/firmware/id3.c +++ b/firmware/id3.c | |||
@@ -175,8 +175,9 @@ setid3v1title(FILE *file, mp3entry *entry) | |||
175 | static void | 175 | static void |
176 | setid3v2title(FILE *file, mp3entry *entry) | 176 | setid3v2title(FILE *file, mp3entry *entry) |
177 | { | 177 | { |
178 | int minframesize; | 178 | unsigned int minframesize; |
179 | int size, readsize = 0, headerlen; | 179 | unsigned int size; |
180 | unsigned int readsize = 0, headerlen; | ||
180 | char *title = NULL; | 181 | char *title = NULL; |
181 | char *artist = NULL; | 182 | char *artist = NULL; |
182 | char *album = NULL; | 183 | char *album = NULL; |
@@ -200,7 +201,7 @@ setid3v2title(FILE *file, mp3entry *entry) | |||
200 | if(size >= sizeof(buffer)) | 201 | if(size >= sizeof(buffer)) |
201 | size = sizeof(buffer)-1; | 202 | size = sizeof(buffer)-1; |
202 | 203 | ||
203 | if(size != (int)fread(buffer, sizeof(char), size, file)) { | 204 | if(size != fread(buffer, sizeof(char), size, file)) { |
204 | free(buffer); | 205 | free(buffer); |
205 | return; | 206 | return; |
206 | } | 207 | } |
@@ -370,7 +371,6 @@ getsonglength(FILE *file, mp3entry *entry) | |||
370 | 371 | ||
371 | long bpf; | 372 | long bpf; |
372 | long tpf; | 373 | long tpf; |
373 | int i; | ||
374 | 374 | ||
375 | /* Start searching after ID3v2 header */ | 375 | /* Start searching after ID3v2 header */ |
376 | if(fseek(file, entry->id3v2len, SEEK_SET)) | 376 | if(fseek(file, entry->id3v2len, SEEK_SET)) |
@@ -492,9 +492,6 @@ bool | |||
492 | mp3info(mp3entry *entry, char *filename) | 492 | mp3info(mp3entry *entry, char *filename) |
493 | { | 493 | { |
494 | FILE *file; | 494 | FILE *file; |
495 | char *copy; | ||
496 | char *title; | ||
497 | |||
498 | if((file = fopen(filename, "r")) == NULL) | 495 | if((file = fopen(filename, "r")) == NULL) |
499 | return TRUE; | 496 | return TRUE; |
500 | 497 | ||
@@ -544,7 +541,7 @@ int main(int argc, char **argv) | |||
544 | " Title: %s\n" | 541 | " Title: %s\n" |
545 | " Artist: %s\n" | 542 | " Artist: %s\n" |
546 | " Album: %s\n" | 543 | " Album: %s\n" |
547 | " Length: %s\n" | 544 | " Length: %s / %d s\n" |
548 | " Bitrate: %d\n" | 545 | " Bitrate: %d\n" |
549 | " Frequency: %d\n", | 546 | " Frequency: %d\n", |
550 | argv[i], | 547 | argv[i], |
@@ -552,6 +549,7 @@ int main(int argc, char **argv) | |||
552 | mp3.artist?mp3.artist:"<blank>", | 549 | mp3.artist?mp3.artist:"<blank>", |
553 | mp3.album?mp3.album:"<blank>", | 550 | mp3.album?mp3.album:"<blank>", |
554 | secs2str(mp3.length), | 551 | secs2str(mp3.length), |
552 | mp3.length/1000, | ||
555 | mp3.bitrate, | 553 | mp3.bitrate, |
556 | mp3.frequency); | 554 | mp3.frequency); |
557 | } | 555 | } |