From 235d1ae79574476b2ed5167b33dc8e06489b35a0 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 1 Nov 2009 02:36:51 +0000 Subject: Fix FS#10745 - %mv not working in sbs... This fix is as good as we can do, but not perfect. Because the sbs is only updated when a button is pressed it will stay in the "volume changing" state probalby longer than expected.. which isnt terrible, but useful to remember. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23455 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_parser.c | 1 - apps/gui/skin_engine/skin_tokens.c | 4 ++-- apps/gui/skin_engine/wps_internals.h | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'apps/gui/skin_engine') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 434e7c9fa5..7f6e80d108 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1632,7 +1632,6 @@ void skin_data_reset(struct wps_data *wps_data) #endif wps_data->tokens = NULL; wps_data->num_tokens = 0; - wps_data->button_time_volume = 0; #ifdef HAVE_LCD_BITMAP wps_data->peak_meter_enabled = false; diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index aeb7bdbbde..5156dd7ce7 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -818,8 +818,8 @@ const char *get_token_value(struct gui_wps *gwps, return NULL; #endif case WPS_TOKEN_BUTTON_VOLUME: - if (data->button_time_volume && - TIME_BEFORE(current_tick, data->button_time_volume + + if (global_status.last_volume_change && + TIME_BEFORE(current_tick, global_status.last_volume_change + token->value.i * TIMEOUT_UNIT)) return "v"; return NULL; diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 1fd68646ad..d54b54ff00 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -264,8 +264,6 @@ struct wps_data /* Total number of tokens in the WPS. During WPS parsing, this is the index of the token being parsed. */ int num_tokens; - /* tick the volume button was last pressed */ - unsigned int button_time_volume; #ifdef HAVE_LCD_BITMAP bool peak_meter_enabled; -- cgit v1.2.3