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

* Make %t stricter by aborting if a value is not given.

Browse source 
* Move the default value for %mv back into wps_parser.c where it belongs
* Add the debug line for the %mv tag


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18773 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2008-10-11 13:49:38 +00:00
parent 4f80274708
commit 61c6526013
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1389,8 +1389,6 @@ static const char *get_token_value(struct gui_wps *gwps,
return NULL;
#endif
case WPS_TOKEN_BUTTON_VOLUME:
if (token->value.i == 0)
token->value.i = HZ;
if (data->button_time_volume &&
TIME_BEFORE(current_tick, data->button_time_volume +
token->value.i))

5
apps/gui/wps_debug.c
View file

@ -431,7 +431,10 @@ static char *get_token_desc(struct wps_token *token, struct wps_data *data,
snprintf(buf, bufsize, "enable VP:%d",
token->value.i);
break;
case WPS_TOKEN_BUTTON_VOLUME:
snprintf(buf, bufsize, "Volume button timeout:%d",
token->value.i);
break;
default:
snprintf(buf, bufsize, "FIXME (code: %d)",
token->type);

12
apps/gui/wps_parser.c
View file

@ -802,6 +802,18 @@ static int parse_timeout(const char *wps_bufptr,
if (have_tenth == false)
val *= 10;
if (val == 0 && skip == 0)
{
/* decide what to do if no value was specified */
switch (token->type)
{
case WPS_TOKEN_SUBLINE_TIMEOUT:
return -1;
case WPS_TOKEN_BUTTON_VOLUME:
val = HZ;
break;
}
}
token->value.i = val;
return skip;