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

Cleanup play_hop() slightly and remove redundant/uneeded checks, reclaim a tiny bit of binsize

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20097 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-02-24 18:07:42 +00:00
parent fcbfef8175
commit 22b9eb4245
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/gui/gwps-common.c
View file

@ -153,22 +153,20 @@ bool update_onvol_change(struct gui_wps * gwps)
void play_hop(int direction)
{
if(!wps_state.id3 || !wps_state.id3->length
|| global_settings.skip_length == 0)
return;
#define STEP ((unsigned)global_settings.skip_length*1000)
if(direction == 1
&& wps_state.id3->length - wps_state.id3->elapsed < STEP+1000) {
unsigned step = ((unsigned)global_settings.skip_length*1000);
unsigned long *elapsed = &(wps_state.id3->elapsed);
if (direction == 1 && wps_state.id3->length - *elapsed < step+1000) {
#if CONFIG_CODEC == SWCODEC
if(global_settings.beep)
pcmbuf_beep(1000, 150, 1500*global_settings.beep);
#endif
return;
} else if ((direction == -1 && *elapsed < step)) {
*elapsed = 0;
} else {
*elapsed += step * direction;
}
if((direction == -1 && wps_state.id3->elapsed < STEP))
wps_state.id3->elapsed = 0;
else
wps_state.id3->elapsed += STEP *direction;
if((audio_status() & AUDIO_STATUS_PLAY) && !wps_state.paused) {
#if (CONFIG_CODEC == SWCODEC)
audio_pre_ff_rewind();
@ -176,12 +174,11 @@ void play_hop(int direction)
audio_pause();
#endif
}
audio_ff_rewind(wps_state.id3->elapsed);
audio_ff_rewind(*elapsed);
#if (CONFIG_CODEC != SWCODEC)
if (!wps_state.paused)
audio_resume();
#endif
#undef STEP
}
bool ffwd_rew(int button)
@ -2190,4 +2187,3 @@ bool gui_wps_refresh(struct gui_wps *gwps,
viewportmanager_draw_statusbars(NULL);
return true;
}