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.tar.gz rockbox-74aabc8381e9faa221b87b7d2280238d30f2e9c5.zip |
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 a66c1aa4b5..fe7e1ed979 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, | |||
1293 | } | 1293 | } |
1294 | #endif | 1294 | #endif |
1295 | 1295 | ||
1296 | #ifdef HAS_BUTTON_HOLD | ||
1297 | case WPS_TOKEN_MAIN_HOLD: | 1296 | case WPS_TOKEN_MAIN_HOLD: |
1297 | #ifdef HAS_BUTTON_HOLD | ||
1298 | if (button_hold()) | 1298 | if (button_hold()) |
1299 | #else | ||
1300 | if (is_keys_locked()) | ||
1301 | #endif /*hold switch or softlock*/ | ||
1299 | return "h"; | 1302 | return "h"; |
1300 | else | 1303 | else |
1301 | return NULL; | 1304 | return NULL; |
1302 | #endif | 1305 | |
1303 | #ifdef HAS_REMOTE_BUTTON_HOLD | 1306 | #ifdef HAS_REMOTE_BUTTON_HOLD |
1304 | case WPS_TOKEN_REMOTE_HOLD: | 1307 | case WPS_TOKEN_REMOTE_HOLD: |
1305 | if (remote_button_hold()) | 1308 | if (remote_button_hold()) |
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index cafcf135bc..ab8258147e 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -203,9 +203,8 @@ enum wps_token_type { | |||
203 | WPS_TOKEN_REPEAT_MODE, | 203 | WPS_TOKEN_REPEAT_MODE, |
204 | WPS_TOKEN_PLAYBACK_STATUS, | 204 | WPS_TOKEN_PLAYBACK_STATUS, |
205 | 205 | ||
206 | #ifdef HAS_BUTTON_HOLD | ||
207 | WPS_TOKEN_MAIN_HOLD, | 206 | WPS_TOKEN_MAIN_HOLD, |
208 | #endif | 207 | |
209 | #ifdef HAS_REMOTE_BUTTON_HOLD | 208 | #ifdef HAS_REMOTE_BUTTON_HOLD |
210 | WPS_TOKEN_REMOTE_HOLD, | 209 | WPS_TOKEN_REMOTE_HOLD, |
211 | #endif | 210 | #endif |
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index cb930bc74c..43ea516b53 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -227,9 +227,8 @@ static const struct wps_tag all_tags[] = { | |||
227 | { WPS_TOKEN_VLED_HDD, "lh", WPS_REFRESH_DYNAMIC, NULL }, | 227 | { WPS_TOKEN_VLED_HDD, "lh", WPS_REFRESH_DYNAMIC, NULL }, |
228 | #endif | 228 | #endif |
229 | 229 | ||
230 | #ifdef HAS_BUTTON_HOLD | ||
231 | { WPS_TOKEN_MAIN_HOLD, "mh", WPS_REFRESH_DYNAMIC, NULL }, | 230 | { WPS_TOKEN_MAIN_HOLD, "mh", WPS_REFRESH_DYNAMIC, NULL }, |
232 | #endif | 231 | |
233 | #ifdef HAS_REMOTE_BUTTON_HOLD | 232 | #ifdef HAS_REMOTE_BUTTON_HOLD |
234 | { WPS_TOKEN_REMOTE_HOLD, "mr", WPS_REFRESH_DYNAMIC, NULL }, | 233 | { WPS_TOKEN_REMOTE_HOLD, "mr", WPS_REFRESH_DYNAMIC, NULL }, |
235 | #endif | 234 | #endif |