devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Better handling of bad playlists, and when all tracks fit in memory

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2550 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-10-09 13:47:38 +00:00
parent d035a9b0bc
commit 56e5d1a0a1
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/mpeg.c
View file

@ -57,6 +57,7 @@ extern void bitswap(unsigned char *data, int length);
extern char* playlist_peek(int steps); extern char* playlist_peek(int steps);
extern int playlist_next(int steps); extern int playlist_next(int steps);
extern int playlist_amount(void);
extern void update_file_pos( int id, int pos ); extern void update_file_pos( int id, int pos );
static char *units[] = static char *units[] =
@ -709,6 +710,7 @@ static int add_track_to_tag_list(char *filename)
/* If next_track is true, opens the next track, if false, opens prev track */ /* If next_track is true, opens the next track, if false, opens prev track */
static int new_file(int steps) static int new_file(int steps)
{ {
int max_steps = playlist_amount();
int start = num_tracks_in_memory() - 1; int start = num_tracks_in_memory() - 1;
if (start < 0) if (start < 0)
@ -727,6 +729,10 @@ static int new_file(int steps)
if(mpeg_file < 0) { if(mpeg_file < 0) {
DEBUGF("Couldn't open file: %s\n",trackname); DEBUGF("Couldn't open file: %s\n",trackname);
steps++; steps++;
/* Bail out if no file could be opened */
if(steps > max_steps)
return -1;
} }
else else
{ {