diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menu.h | 1 | ||||
-rw-r--r-- | apps/settings.h | 1 | ||||
-rw-r--r-- | apps/wps.c | 40 | ||||
-rw-r--r-- | apps/wps.h | 1 |
4 files changed, 24 insertions, 19 deletions
diff --git a/apps/menu.h b/apps/menu.h index d142d5ae60..579de66aa0 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -28,6 +28,7 @@ | |||
28 | #define MENU_PREV BUTTON_UP | 28 | #define MENU_PREV BUTTON_UP |
29 | #define MENU_EXIT BUTTON_LEFT | 29 | #define MENU_EXIT BUTTON_LEFT |
30 | #define MENU_EXIT2 BUTTON_OFF | 30 | #define MENU_EXIT2 BUTTON_OFF |
31 | #define MENU_EXIT3 BUTTON_MODE | ||
31 | #define MENU_ENTER BUTTON_RIGHT | 32 | #define MENU_ENTER BUTTON_RIGHT |
32 | #define MENU_ENTER2 BUTTON_SELECT | 33 | #define MENU_ENTER2 BUTTON_SELECT |
33 | 34 | ||
diff --git a/apps/settings.h b/apps/settings.h index 325009eddb..3e138cfc7e 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -40,6 +40,7 @@ | |||
40 | #define SETTINGS_OK BUTTON_SELECT | 40 | #define SETTINGS_OK BUTTON_SELECT |
41 | #define SETTINGS_OK2 BUTTON_LEFT | 41 | #define SETTINGS_OK2 BUTTON_LEFT |
42 | #define SETTINGS_CANCEL BUTTON_OFF | 42 | #define SETTINGS_CANCEL BUTTON_OFF |
43 | #define SETTINGS_CANCEL2 BUTTON_MODE | ||
43 | 44 | ||
44 | #elif CONFIG_KEYPAD == RECORDER_PAD | 45 | #elif CONFIG_KEYPAD == RECORDER_PAD |
45 | #define SETTINGS_INC BUTTON_UP | 46 | #define SETTINGS_INC BUTTON_UP |
diff --git a/apps/wps.c b/apps/wps.c index 9848be0965..3934f2483f 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -84,24 +84,6 @@ static bool setvol(void) | |||
84 | return false; | 84 | return false; |
85 | } | 85 | } |
86 | 86 | ||
87 | static void display_keylock_text(bool locked) | ||
88 | { | ||
89 | char* s; | ||
90 | lcd_stop_scroll(); | ||
91 | #ifdef HAVE_LCD_CHARCELLS | ||
92 | if(locked) | ||
93 | s = str(LANG_KEYLOCK_ON_PLAYER); | ||
94 | else | ||
95 | s = str(LANG_KEYLOCK_OFF_PLAYER); | ||
96 | #else | ||
97 | if(locked) | ||
98 | s = str(LANG_KEYLOCK_ON_RECORDER); | ||
99 | else | ||
100 | s = str(LANG_KEYLOCK_OFF_RECORDER); | ||
101 | #endif | ||
102 | splash(HZ, true, s); | ||
103 | } | ||
104 | |||
105 | static bool ffwd_rew(int button) | 87 | static bool ffwd_rew(int button) |
106 | { | 88 | { |
107 | static const int ff_rew_steps[] = { | 89 | static const int ff_rew_steps[] = { |
@@ -321,12 +303,32 @@ static void fade(bool fade_in) | |||
321 | } | 303 | } |
322 | 304 | ||
323 | 305 | ||
306 | #ifdef WPS_KEYLOCK | ||
307 | static void display_keylock_text(bool locked) | ||
308 | { | ||
309 | char* s; | ||
310 | lcd_stop_scroll(); | ||
311 | #ifdef HAVE_LCD_CHARCELLS | ||
312 | if(locked) | ||
313 | s = str(LANG_KEYLOCK_ON_PLAYER); | ||
314 | else | ||
315 | s = str(LANG_KEYLOCK_OFF_PLAYER); | ||
316 | #else | ||
317 | if(locked) | ||
318 | s = str(LANG_KEYLOCK_ON_RECORDER); | ||
319 | else | ||
320 | s = str(LANG_KEYLOCK_OFF_RECORDER); | ||
321 | #endif | ||
322 | splash(HZ, true, s); | ||
323 | } | ||
324 | |||
324 | static void waitfor_nokey(void) | 325 | static void waitfor_nokey(void) |
325 | { | 326 | { |
326 | /* wait until all keys are released */ | 327 | /* wait until all keys are released */ |
327 | while (button_get(false) != BUTTON_NONE) | 328 | while (button_get(false) != BUTTON_NONE) |
328 | yield(); | 329 | yield(); |
329 | } | 330 | } |
331 | #endif | ||
330 | 332 | ||
331 | /* demonstrates showing different formats from playtune */ | 333 | /* demonstrates showing different formats from playtune */ |
332 | long wps_show(void) | 334 | long wps_show(void) |
@@ -624,6 +626,7 @@ long wps_show(void) | |||
624 | restore = true; | 626 | restore = true; |
625 | break; | 627 | break; |
626 | 628 | ||
629 | #ifdef WPS_KEYLOCK | ||
627 | /* key lock */ | 630 | /* key lock */ |
628 | case WPS_KEYLOCK: | 631 | case WPS_KEYLOCK: |
629 | case WPS_KEYLOCK | BUTTON_REPEAT: | 632 | case WPS_KEYLOCK | BUTTON_REPEAT: |
@@ -632,6 +635,7 @@ long wps_show(void) | |||
632 | restore = true; | 635 | restore = true; |
633 | waitfor_nokey(); | 636 | waitfor_nokey(); |
634 | break; | 637 | break; |
638 | #endif | ||
635 | 639 | ||
636 | #if CONFIG_KEYPAD == RECORDER_PAD | 640 | #if CONFIG_KEYPAD == RECORDER_PAD |
637 | /* play settings */ | 641 | /* play settings */ |
diff --git a/apps/wps.h b/apps/wps.h index 2a2df85d2e..2a1826aaa8 100644 --- a/apps/wps.h +++ b/apps/wps.h | |||
@@ -37,7 +37,6 @@ | |||
37 | #define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) | 37 | #define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) |
38 | #define WPS_BROWSE_PRE BUTTON_SELECT | 38 | #define WPS_BROWSE_PRE BUTTON_SELECT |
39 | #define WPS_EXIT BUTTON_OFF | 39 | #define WPS_EXIT BUTTON_OFF |
40 | #define WPS_KEYLOCK (BUTTON_MODE | BUTTON_DOWN) | ||
41 | #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) | 40 | #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) |
42 | 41 | ||
43 | #define WPS_RC_NEXT BUTTON_RC_FF | 42 | #define WPS_RC_NEXT BUTTON_RC_FF |