devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Pause now works again (I broke it with my mpeg_is_playing() fix...)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1802 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-08-19 12:38:27 +00:00
parent 9315282b1e
commit 43bcd823b7
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/wps.c
View file

@ -70,6 +70,7 @@
bool keys_locked = false; bool keys_locked = false;
bool device_muted = false; bool device_muted = false;
static bool ff_rewind = false; static bool ff_rewind = false;
static bool paused = false;
static void draw_screen(struct mp3entry* id3) static void draw_screen(struct mp3entry* id3)
{ {
@ -507,11 +508,7 @@ int wps_show(void)
button_set_release(old_release_mask); button_set_release(old_release_mask);
return 0; return 0;
#ifdef HAVE_RECORDER_KEYPAD
case BUTTON_PLAY: case BUTTON_PLAY:
#else
case BUTTON_UP:
#endif
if (keys_locked) if (keys_locked)
{ {
display_keylock_text(keys_locked); display_keylock_text(keys_locked);
@ -519,12 +516,13 @@ int wps_show(void)
break; break;
} }
if ( mpeg_is_playing() ) if ( !paused )
{ {
mpeg_pause(); mpeg_pause();
paused = true;
status_set_playmode(STATUS_PAUSE); status_set_playmode(STATUS_PAUSE);
status_draw();
if (global_settings.resume) { if (global_settings.resume) {
status_draw();
settings_save(); settings_save();
#ifndef HAVE_RTC #ifndef HAVE_RTC
ata_flush(); ata_flush();
@ -534,7 +532,9 @@ int wps_show(void)
else else
{ {
mpeg_resume(); mpeg_resume();
paused = false;
status_set_playmode(STATUS_PLAY); status_set_playmode(STATUS_PLAY);
status_draw();
} }
break; break;