len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 05:35:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FS#9557 - fix the %mv and %t timeout so its intrepreted correctly

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19177 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-11-22 10:31:33 +00:00
parent 5e4a6824bb
commit 0394ebe44d
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,14 @@
/* 3% of 30min file == 54s step size */ /* 3% of 30min file == 54s step size */
#define MIN_FF_REWIND_STEP 500 #define MIN_FF_REWIND_STEP 500
/* Timeout unit expressed in HZ. In WPS, all timeouts are given in seconds
(possibly with a decimal fraction) but stored as integer values.
E.g. 2.5 is stored as 25. This means 25 tenth of a second, i.e. 25 units.
*/
#define TIMEOUT_UNIT (HZ/10) /* I.e. 0.1 sec */
#define DEFAULT_SUBLINE_TIME_MULTIPLIER 20 /* In TIMEOUT_UNIT's */
/* draws the statusbar on the given wps-screen */ /* draws the statusbar on the given wps-screen */
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force) static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force)
@ -1391,7 +1399,7 @@ static const char *get_token_value(struct gui_wps *gwps,
case WPS_TOKEN_BUTTON_VOLUME: case WPS_TOKEN_BUTTON_VOLUME:
if (data->button_time_volume && if (data->button_time_volume &&
TIME_BEFORE(current_tick, data->button_time_volume + TIME_BEFORE(current_tick, data->button_time_volume +
token->value.i)) token->value.i * TIMEOUT_UNIT))
return "v"; return "v";
return NULL; return NULL;
default: default:
@ -1728,7 +1736,7 @@ static bool update_curr_subline(struct gui_wps *gwps, int line)
new_subline_refresh = true; new_subline_refresh = true;
data->lines[line].subline_expire_time = (reset_subline ? data->lines[line].subline_expire_time = (reset_subline ?
current_tick : data->lines[line].subline_expire_time) + current_tick : data->lines[line].subline_expire_time) +
BASE_SUBLINE_TIME*data->sublines[subline_idx].time_mult; TIMEOUT_UNIT*data->sublines[subline_idx].time_mult;
break; break;
} }
} }

3
apps/gui/gwps.h
View file

@ -121,9 +121,6 @@ struct align_pos {
#endif #endif
#define DEFAULT_SUBLINE_TIME_MULTIPLIER 20 /* (10ths of sec) */
#define BASE_SUBLINE_TIME 10 /* base time that multiplier is applied to
(1/HZ sec, or 100ths of sec) */
#define SUBLINE_RESET -1 #define SUBLINE_RESET -1
enum wps_parse_error { enum wps_parse_error {

3
apps/gui/wps_parser.c
View file

@ -26,7 +26,6 @@
#include "file.h" #include "file.h"
#include "misc.h" #include "misc.h"
#include "plugin.h" #include "plugin.h"
#include "kernel.h"
#ifdef __PCTOOL__ #ifdef __PCTOOL__
#ifdef WPSEDITOR #ifdef WPSEDITOR
@ -811,7 +810,7 @@ static int parse_timeout(const char *wps_bufptr,
case WPS_TOKEN_SUBLINE_TIMEOUT: case WPS_TOKEN_SUBLINE_TIMEOUT:
return -1; return -1;
case WPS_TOKEN_BUTTON_VOLUME: case WPS_TOKEN_BUTTON_VOLUME:
val = HZ; val = 10;
break; break;
} }
} }