Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved ff/rw max step calculation (patch #882931 by Craigh Sather)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4691 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2004-05-22 01:09:47 +00:00
parent dfb5c6ed61
commit 1c6ba0adac
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/wps.c
View file

@ -20,6 +20,7 @@
#include <string.h>
#include <stdlib.h>
#include "system.h"
#include "file.h"
#include "lcd.h"
#include "font.h"
@ -49,6 +50,7 @@
#include "bookmark.h"
#define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */
/* 3% of 30min file == 54s step size */
#define MIN_FF_REWIND_STEP 500
bool keys_locked = false;
static bool ff_rewind = false;
@ -327,15 +329,31 @@ static bool ffwd_rew(int button)
case BUTTON_RIGHT | BUTTON_REPEAT:
if (ff_rewind)
{
if (direction == 1)
{
/* fast forwarding, calc max step relative to end */
max_step =
(id3->length - (id3->elapsed + ff_rewind_count)) *
FF_REWIND_MAX_PERCENT / 100;
}
else
{
/* rewinding, calc max step relative to start */
max_step = (id3->elapsed + ff_rewind_count) *
FF_REWIND_MAX_PERCENT / 100;
}
max_step = MAX(max_step, MIN_FF_REWIND_STEP);
if (step > max_step)
step = max_step;
ff_rewind_count += step * direction;
if (global_settings.ff_rewind_accel != 0 &&
current_tick >= accel_tick)
{
step *= 2;
if (step > max_step)
step = max_step;
accel_tick = current_tick +
global_settings.ff_rewind_accel*HZ;
}
@ -361,12 +379,6 @@ static bool ffwd_rew(int button)
step = ff_rew_steps[global_settings.ff_rewind_min_step];
max_step = id3->length * FF_REWIND_MAX_PERCENT / 100;
if (step > max_step)
step = max_step;
ff_rewind_count = step * direction;
accel_tick = current_tick +
global_settings.ff_rewind_accel*HZ;
}