diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-08-21 17:38:56 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-08-21 17:38:56 +0000 |
| commit | 0c2e9f21e31422942001bf603f3d340b5a648136 (patch) | |
| tree | f6ba531b33759edddfaa6c53ed2aa25379750b58 /apps/wps.c | |
| parent | 84cf9d446c68b577256c92b631d68bbeae6451b8 (diff) | |
| download | rockbox-0c2e9f21e31422942001bf603f3d340b5a648136.tar.gz rockbox-0c2e9f21e31422942001bf603f3d340b5a648136.zip | |
Stays in pause mode after seek
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1896 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/wps.c')
| -rw-r--r-- | apps/wps.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/apps/wps.c b/apps/wps.c index c14cbb4488..8667ad9969 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
| @@ -597,7 +597,8 @@ int wps_show(void) | |||
| 597 | { | 597 | { |
| 598 | if ( mpeg_is_playing() && id3 && id3->length ) | 598 | if ( mpeg_is_playing() && id3 && id3->length ) |
| 599 | { | 599 | { |
| 600 | mpeg_pause(); | 600 | if (!paused) |
| 601 | mpeg_pause(); | ||
| 601 | #ifdef HAVE_PLAYER_KEYPAD | 602 | #ifdef HAVE_PLAYER_KEYPAD |
| 602 | lcd_stop_scroll(); | 603 | lcd_stop_scroll(); |
| 603 | #endif | 604 | #endif |
| @@ -629,7 +630,8 @@ int wps_show(void) | |||
| 629 | { | 630 | { |
| 630 | if ( mpeg_is_playing() && id3 && id3->length ) | 631 | if ( mpeg_is_playing() && id3 && id3->length ) |
| 631 | { | 632 | { |
| 632 | mpeg_pause(); | 633 | if (!paused) |
| 634 | mpeg_pause(); | ||
| 633 | #ifdef HAVE_PLAYER_KEYPAD | 635 | #ifdef HAVE_PLAYER_KEYPAD |
| 634 | lcd_stop_scroll(); | 636 | lcd_stop_scroll(); |
| 635 | #endif | 637 | #endif |
| @@ -664,8 +666,12 @@ int wps_show(void) | |||
| 664 | mpeg_ff_rewind(ff_rewind_count); | 666 | mpeg_ff_rewind(ff_rewind_count); |
| 665 | ff_rewind_count = 0; | 667 | ff_rewind_count = 0; |
| 666 | ff_rewind = false; | 668 | ff_rewind = false; |
| 667 | mpeg_resume(); | 669 | if (paused) |
| 668 | status_set_playmode(STATUS_PLAY); | 670 | status_set_playmode(STATUS_PAUSE); |
| 671 | else { | ||
| 672 | mpeg_resume(); | ||
| 673 | status_set_playmode(STATUS_PLAY); | ||
| 674 | } | ||
| 669 | #ifdef HAVE_LCD_CHARCELLS | 675 | #ifdef HAVE_LCD_CHARCELLS |
| 670 | draw_screen(id3); | 676 | draw_screen(id3); |
| 671 | #endif | 677 | #endif |
| @@ -710,8 +716,12 @@ int wps_show(void) | |||
| 710 | mpeg_ff_rewind(ff_rewind_count); | 716 | mpeg_ff_rewind(ff_rewind_count); |
| 711 | ff_rewind_count = 0; | 717 | ff_rewind_count = 0; |
| 712 | ff_rewind = false; | 718 | ff_rewind = false; |
| 713 | mpeg_resume(); | 719 | if (paused) |
| 714 | status_set_playmode(STATUS_PLAY); | 720 | status_set_playmode(STATUS_PAUSE); |
| 721 | else { | ||
| 722 | mpeg_resume(); | ||
| 723 | status_set_playmode(STATUS_PLAY); | ||
| 724 | } | ||
| 715 | #ifdef HAVE_LCD_CHARCELLS | 725 | #ifdef HAVE_LCD_CHARCELLS |
| 716 | draw_screen(id3); | 726 | draw_screen(id3); |
| 717 | #endif | 727 | #endif |