diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-08-28 11:50:19 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-08-28 11:50:19 +0000 |
commit | cfbdf142bc7a9696b4992fa04497b8bf2cdab3f6 (patch) | |
tree | 4738b309ebb756e6c68093bbf12dcd3f5367a648 /firmware/mpeg.c | |
parent | 606b0f545dadb245ae262cc1daaa4b301cc9a595 (diff) | |
download | rockbox-cfbdf142bc7a9696b4992fa04497b8bf2cdab3f6.tar.gz rockbox-cfbdf142bc7a9696b4992fa04497b8bf2cdab3f6.zip |
More error handling, handles empty MP3 files now. Part 2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2031 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r-- | firmware/mpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 1f24ea7425..bea43407dd 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -671,8 +671,6 @@ static int new_file(int steps) | |||
671 | { | 671 | { |
672 | int new_tag_idx = tag_write_idx; | 672 | int new_tag_idx = tag_write_idx; |
673 | 673 | ||
674 | index = playlist_next(steps); | ||
675 | |||
676 | if(add_track_to_tag_list(trackname)) | 674 | if(add_track_to_tag_list(trackname)) |
677 | { | 675 | { |
678 | /* Bad mp3 file */ | 676 | /* Bad mp3 file */ |
@@ -682,6 +680,8 @@ static int new_file(int steps) | |||
682 | } | 680 | } |
683 | else | 681 | else |
684 | { | 682 | { |
683 | index = playlist_next(steps); | ||
684 | |||
685 | /* skip past id3v2 tag (to an even byte) */ | 685 | /* skip past id3v2 tag (to an even byte) */ |
686 | lseek(mpeg_file, | 686 | lseek(mpeg_file, |
687 | id3tags[new_tag_idx]->id3.id3v2len & ~1, | 687 | id3tags[new_tag_idx]->id3.id3v2len & ~1, |