diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-09-24 07:49:16 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-09-24 07:49:16 +0000 |
commit | f077710b86c611888fde6c3b01c870e87d6ce2e2 (patch) | |
tree | 6b4a75145cf3ad1ad660bbc89c45cef811c200ea /apps | |
parent | 1a07eef1671ff2d0c460adc8271da0fb7cafcb67 (diff) |
New mpeg_status() function replaces mpeg_is_playing()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2379 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/tree.c | 2 | ||||
-rw-r--r-- | apps/wps-display.c | 2 | ||||
-rw-r--r-- | apps/wps.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/apps/tree.c b/apps/tree.c index 9689ac5ae9..d3ee244ff6 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -851,7 +851,7 @@ bool dirbrowse(char *root) break; case BUTTON_ON: - if (mpeg_is_playing()) + if (mpeg_status() & MPEG_STATUS_PLAY) { lcd_stop_scroll(); if (wps_show() == SYS_USB_CONNECTED) diff --git a/apps/wps-display.c b/apps/wps-display.c index 72905e441b..98a1d8b632 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c @@ -576,7 +576,7 @@ void wps_display(struct mp3entry* id3) { lcd_clear_display(); - if (!id3 && !mpeg_is_playing()) + if (!id3 && !(mpeg_status() & MPEG_STATUS_PLAY)) { #ifdef HAVE_LCD_CHARCELLS lcd_puts(0, 0, str(LANG_END_PLAYLIST_PLAYER)); diff --git a/apps/wps.c b/apps/wps.c index a8b7900b0a..c8fafc5913 100644 --- a/apps/wps.c +++ b/apps/wps.c @@ -355,7 +355,8 @@ static bool ffwd_rew(int button) } else { - if ( mpeg_is_playing() && id3 && id3->length ) + if ( (mpeg_status() & MPEG_STATUS_PLAY) && + id3 && id3->length ) { if (!paused) mpeg_pause(); @@ -907,7 +908,7 @@ int wps_show(void) ff_rewind = false; - if(mpeg_is_playing()) + if(mpeg_status() & MPEG_STATUS_PLAY) { id3 = mpeg_current_track(); if (id3) { |