summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-08-19 12:38:27 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-08-19 12:38:27 +0000
commit43bcd823b7258ff763b93ca868f8ed9745a4f9df (patch)
tree14befde750612a1ab04109a031e0d91da7e9c719 /apps
parent9315282b1ecca17f3eb9c705db144820048c58f4 (diff)
downloadrockbox-43bcd823b7258ff763b93ca868f8ed9745a4f9df.zip
rockbox-43bcd823b7258ff763b93ca868f8ed9745a4f9df.tar.gz
rockbox-43bcd823b7258ff763b93ca868f8ed9745a4f9df.tar.bz2
rockbox-43bcd823b7258ff763b93ca868f8ed9745a4f9df.tar.xz
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
Diffstat (limited to 'apps')
-rw-r--r--apps/wps.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/wps.c b/apps/wps.c
index e2c091f..5d4bf16 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -70,6 +70,7 @@
bool keys_locked = false;
bool device_muted = false;
static bool ff_rewind = false;
+static bool paused = false;
static void draw_screen(struct mp3entry* id3)
{
@@ -507,11 +508,7 @@ int wps_show(void)
button_set_release(old_release_mask);
return 0;
-#ifdef HAVE_RECORDER_KEYPAD
case BUTTON_PLAY:
-#else
- case BUTTON_UP:
-#endif
if (keys_locked)
{
display_keylock_text(keys_locked);
@@ -519,12 +516,13 @@ int wps_show(void)
break;
}
- if ( mpeg_is_playing() )
+ if ( !paused )
{
mpeg_pause();
+ paused = true;
status_set_playmode(STATUS_PAUSE);
+ status_draw();
if (global_settings.resume) {
- status_draw();
settings_save();
#ifndef HAVE_RTC
ata_flush();
@@ -534,7 +532,9 @@ int wps_show(void)
else
{
mpeg_resume();
+ paused = false;
status_set_playmode(STATUS_PLAY);
+ status_draw();
}
break;