diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2003-04-11 00:29:15 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2003-04-11 00:29:15 +0000 |
commit | 9d860e19d2aedc9dc672a037b7c2de728dd6477e (patch) | |
tree | 5d193eb0bac65aead2d5d80f40f1055d0fa7cadf /firmware | |
parent | 9c1f29f9fb7438b0d669e541291f5df674ef45fe (diff) | |
download | rockbox-9d860e19d2aedc9dc672a037b7c2de728dd6477e.tar.gz rockbox-9d860e19d2aedc9dc672a037b7c2de728dd6477e.zip |
Better handling of next/prev
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3528 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/mpeg.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 718d5c4c62..015d6a9e2a 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -77,6 +77,7 @@ static enum | |||
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | extern char* playlist_peek(int steps); | 79 | extern char* playlist_peek(int steps); |
80 | extern bool playlist_check(int steps); | ||
80 | extern int playlist_next(int steps); | 81 | extern int playlist_next(int steps); |
81 | extern int playlist_amount(void); | 82 | extern int playlist_amount(void); |
82 | extern void update_file_pos( int id, int pos ); | 83 | extern void update_file_pos( int id, int pos ); |
@@ -1415,7 +1416,7 @@ static void mpeg_thread(void) | |||
1415 | } | 1416 | } |
1416 | } | 1417 | } |
1417 | else { | 1418 | else { |
1418 | if (!playlist_peek(1)) | 1419 | if (!playlist_check(1)) |
1419 | break; | 1420 | break; |
1420 | 1421 | ||
1421 | /* stop the current stream */ | 1422 | /* stop the current stream */ |
@@ -1450,8 +1451,10 @@ static void mpeg_thread(void) | |||
1450 | 1451 | ||
1451 | case MPEG_PREV: { | 1452 | case MPEG_PREV: { |
1452 | DEBUGF("MPEG_PREV\n"); | 1453 | DEBUGF("MPEG_PREV\n"); |
1453 | if (!playlist_peek(-1)) | 1454 | |
1455 | if (!playlist_check(-1)) | ||
1454 | break; | 1456 | break; |
1457 | |||
1455 | /* stop the current stream */ | 1458 | /* stop the current stream */ |
1456 | play_pending = false; | 1459 | play_pending = false; |
1457 | playing = false; | 1460 | playing = false; |