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

Fix the resume problems on hwcodec which were uncovered by r20483+r20485. The timing problem was there before; checking for id3 availability as a criterion whether to exit the wps was plain wrong. Now it exits only if playback actually finished.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20568 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2009-03-29 17:58:24 +00:00
parent efef625b3f
commit ae61b94a3f
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/gui/gwps.c
View file

@ -255,18 +255,11 @@ long gui_wps_show(void)
{ {
wps_state.id3 = audio_current_track(); wps_state.id3 = audio_current_track();
wps_state.nid3 = audio_next_track(); wps_state.nid3 = audio_next_track();
if (wps_state.id3) { restore = true; /* force initial full redraw */
FOR_NB_SCREENS(i)
{
if (!gui_wps_display(&gui_wps[i]))
exit = true;
}
}
} }
while ( 1 ) while ( 1 )
{ {
yield();
bool audio_paused = (audio_status() & AUDIO_STATUS_PAUSE)?true:false; bool audio_paused = (audio_status() & AUDIO_STATUS_PAUSE)?true:false;
/* did someone else (i.e power thread) change audio pause mode? */ /* did someone else (i.e power thread) change audio pause mode? */
@ -328,10 +321,9 @@ long gui_wps_show(void)
button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,HZ/5); button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,HZ/5);
} }
/* Exit if audio has stopped playing. This can happen if using the /* Exit if audio has stopped playing. This happens e.g. at end of
sleep timer with the charger plugged or if starting a recording playlist or if using the sleep timer. */
from F1 */ if (!(audio_status() & AUDIO_STATUS_PLAY))
if (!audio_status())
exit = true; exit = true;
/* The iPods/X5/M5 use a single button for the A-B mode markers, /* The iPods/X5/M5 use a single button for the A-B mode markers,
defined as ACTION_WPSAB_SINGLE in their config files. */ defined as ACTION_WPSAB_SINGLE in their config files. */
@ -684,13 +676,12 @@ long gui_wps_show(void)
{ {
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
if(!gui_wps_update(&gui_wps[i])) gui_wps_update(&gui_wps[i]);
exit = true;
} }
update_track = false; update_track = false;
} }
if (restore && if (restore && wps_state.id3 &&
((restoretimer == RESTORE_WPS_INSTANTLY) || ((restoretimer == RESTORE_WPS_INSTANTLY) ||
TIME_AFTER(current_tick, restoretimer))) TIME_AFTER(current_tick, restoretimer)))
{ {
@ -699,8 +690,7 @@ long gui_wps_show(void)
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
screens[i].stop_scroll(); screens[i].stop_scroll();
if (!gui_wps_display(&gui_wps[i])) gui_wps_display(&gui_wps[i]);
exit = true;
} }
} }