diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-08-19 12:38:27 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-08-19 12:38:27 +0000 |
commit | 43bcd823b7258ff763b93ca868f8ed9745a4f9df (patch) | |
tree | 14befde750612a1ab04109a031e0d91da7e9c719 | |
parent | 9315282b1ecca17f3eb9c705db144820048c58f4 (diff) | |
download | rockbox-43bcd823b7258ff763b93ca868f8ed9745a4f9df.tar.gz rockbox-43bcd823b7258ff763b93ca868f8ed9745a4f9df.zip |
Pause now works again (I broke it with my mpeg_is_playing() fix...)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1802 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/wps.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/wps.c b/apps/wps.c index e2c091fa81..5d4bf1673b 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -70,6 +70,7 @@ | |||
70 | bool keys_locked = false; | 70 | bool keys_locked = false; |
71 | bool device_muted = false; | 71 | bool device_muted = false; |
72 | static bool ff_rewind = false; | 72 | static bool ff_rewind = false; |
73 | static bool paused = false; | ||
73 | 74 | ||
74 | static void draw_screen(struct mp3entry* id3) | 75 | static void draw_screen(struct mp3entry* id3) |
75 | { | 76 | { |
@@ -507,11 +508,7 @@ int wps_show(void) | |||
507 | button_set_release(old_release_mask); | 508 | button_set_release(old_release_mask); |
508 | return 0; | 509 | return 0; |
509 | 510 | ||
510 | #ifdef HAVE_RECORDER_KEYPAD | ||
511 | case BUTTON_PLAY: | 511 | case BUTTON_PLAY: |
512 | #else | ||
513 | case BUTTON_UP: | ||
514 | #endif | ||
515 | if (keys_locked) | 512 | if (keys_locked) |
516 | { | 513 | { |
517 | display_keylock_text(keys_locked); | 514 | display_keylock_text(keys_locked); |
@@ -519,12 +516,13 @@ int wps_show(void) | |||
519 | break; | 516 | break; |
520 | } | 517 | } |
521 | 518 | ||
522 | if ( mpeg_is_playing() ) | 519 | if ( !paused ) |
523 | { | 520 | { |
524 | mpeg_pause(); | 521 | mpeg_pause(); |
522 | paused = true; | ||
525 | status_set_playmode(STATUS_PAUSE); | 523 | status_set_playmode(STATUS_PAUSE); |
524 | status_draw(); | ||
526 | if (global_settings.resume) { | 525 | if (global_settings.resume) { |
527 | status_draw(); | ||
528 | settings_save(); | 526 | settings_save(); |
529 | #ifndef HAVE_RTC | 527 | #ifndef HAVE_RTC |
530 | ata_flush(); | 528 | ata_flush(); |
@@ -534,7 +532,9 @@ int wps_show(void) | |||
534 | else | 532 | else |
535 | { | 533 | { |
536 | mpeg_resume(); | 534 | mpeg_resume(); |
535 | paused = false; | ||
537 | status_set_playmode(STATUS_PLAY); | 536 | status_set_playmode(STATUS_PLAY); |
537 | status_draw(); | ||
538 | } | 538 | } |
539 | break; | 539 | break; |
540 | 540 | ||