diff options
| author | Marianne Arnold <pixelma@rockbox.org> | 2007-06-25 20:54:11 +0000 |
|---|---|---|
| committer | Marianne Arnold <pixelma@rockbox.org> | 2007-06-25 20:54:11 +0000 |
| commit | 74aabc8381e9faa221b87b7d2280238d30f2e9c5 (patch) | |
| tree | 735ebccb6c3d8946f2cb2cafcf1e1e786f0fafe2 /apps | |
| parent | 6bba70b0ec269c53e46c2f36156fc802b3c763a6 (diff) | |
| download | rockbox-74aabc8381e9faa221b87b7d2280238d30f2e9c5.zip rockbox-74aabc8381e9faa221b87b7d2280238d30f2e9c5.tar.gz rockbox-74aabc8381e9faa221b87b7d2280238d30f2e9c5.tar.bz2 rockbox-74aabc8381e9faa221b87b7d2280238d30f2e9c5.tar.xz | |
Make the '%mh' wps tag (to indicate keylock status) available on the Archos targets as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13716 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/gwps-common.c | 7 | ||||
| -rw-r--r-- | apps/gui/gwps.h | 3 | ||||
| -rw-r--r-- | apps/gui/wps_parser.c | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index a66c1aa..fe7e1ed 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c @@ -1293,13 +1293,16 @@ static char *get_token_value(struct gui_wps *gwps, } #endif -#ifdef HAS_BUTTON_HOLD case WPS_TOKEN_MAIN_HOLD: +#ifdef HAS_BUTTON_HOLD if (button_hold()) +#else + if (is_keys_locked()) +#endif /*hold switch or softlock*/ return "h"; else return NULL; -#endif + #ifdef HAS_REMOTE_BUTTON_HOLD case WPS_TOKEN_REMOTE_HOLD: if (remote_button_hold()) diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index cafcf13..ab82581 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h @@ -203,9 +203,8 @@ enum wps_token_type { WPS_TOKEN_REPEAT_MODE, WPS_TOKEN_PLAYBACK_STATUS, -#ifdef HAS_BUTTON_HOLD WPS_TOKEN_MAIN_HOLD, -#endif + #ifdef HAS_REMOTE_BUTTON_HOLD WPS_TOKEN_REMOTE_HOLD, #endif diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index cb930bc..43ea516 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -227,9 +227,8 @@ static const struct wps_tag all_tags[] = { { WPS_TOKEN_VLED_HDD, "lh", WPS_REFRESH_DYNAMIC, NULL }, #endif -#ifdef HAS_BUTTON_HOLD { WPS_TOKEN_MAIN_HOLD, "mh", WPS_REFRESH_DYNAMIC, NULL }, -#endif + #ifdef HAS_REMOTE_BUTTON_HOLD { WPS_TOKEN_REMOTE_HOLD, "mr", WPS_REFRESH_DYNAMIC, NULL }, #endif |