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) | |
download | rockbox-f077710b86c611888fde6c3b01c870e87d6ce2e2.tar.gz rockbox-f077710b86c611888fde6c3b01c870e87d6ce2e2.zip |
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) | |||
851 | break; | 851 | break; |
852 | 852 | ||
853 | case BUTTON_ON: | 853 | case BUTTON_ON: |
854 | if (mpeg_is_playing()) | 854 | if (mpeg_status() & MPEG_STATUS_PLAY) |
855 | { | 855 | { |
856 | lcd_stop_scroll(); | 856 | lcd_stop_scroll(); |
857 | if (wps_show() == SYS_USB_CONNECTED) | 857 | 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) | |||
576 | { | 576 | { |
577 | lcd_clear_display(); | 577 | lcd_clear_display(); |
578 | 578 | ||
579 | if (!id3 && !mpeg_is_playing()) | 579 | if (!id3 && !(mpeg_status() & MPEG_STATUS_PLAY)) |
580 | { | 580 | { |
581 | #ifdef HAVE_LCD_CHARCELLS | 581 | #ifdef HAVE_LCD_CHARCELLS |
582 | lcd_puts(0, 0, str(LANG_END_PLAYLIST_PLAYER)); | 582 | 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) | |||
355 | } | 355 | } |
356 | else | 356 | else |
357 | { | 357 | { |
358 | if ( mpeg_is_playing() && id3 && id3->length ) | 358 | if ( (mpeg_status() & MPEG_STATUS_PLAY) && |
359 | id3 && id3->length ) | ||
359 | { | 360 | { |
360 | if (!paused) | 361 | if (!paused) |
361 | mpeg_pause(); | 362 | mpeg_pause(); |
@@ -907,7 +908,7 @@ int wps_show(void) | |||
907 | 908 | ||
908 | ff_rewind = false; | 909 | ff_rewind = false; |
909 | 910 | ||
910 | if(mpeg_is_playing()) | 911 | if(mpeg_status() & MPEG_STATUS_PLAY) |
911 | { | 912 | { |
912 | id3 = mpeg_current_track(); | 913 | id3 = mpeg_current_track(); |
913 | if (id3) { | 914 | if (id3) { |