summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Ferrare <kevin@rockbox.org>2006-06-30 17:03:01 +0000
committerKevin Ferrare <kevin@rockbox.org>2006-06-30 17:03:01 +0000
commitf5c319b305da5baf069c98bf76a455d564fb18c8 (patch)
treefa864d2d6132ba579bdf1edd07bbd014bdafe921
parent0e027bd90c4f0c2aa42c087a1957b42a58e93270 (diff)
downloadrockbox-f5c319b305da5baf069c98bf76a455d564fb18c8.tar.gz
rockbox-f5c319b305da5baf069c98bf76a455d564fb18c8.zip
I should be sleeping
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10158 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/clock.c14
-rw-r--r--apps/plugins/wormlet.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index 756a83dd16..d86a41ad59 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -2067,7 +2067,7 @@ void settings_screen(void)
2067 change_setting(cursorpos-1, 1, false); 2067 change_setting(cursorpos-1, 1, false);
2068 break; 2068 break;
2069#ifdef EXIT_RC_BUTTON 2069#ifdef EXIT_RC_BUTTON
2070 case EXIT_RC_BUTTON 2070 case EXIT_RC_BUTTON:
2071#endif 2071#endif
2072 case EXIT_BUTTON: 2072 case EXIT_BUTTON:
2073 case MENU_BUTTON: 2073 case MENU_BUTTON:
@@ -2115,7 +2115,7 @@ void confirm_reset(void)
2115 case CHANGE_DOWN_BUTTON: 2115 case CHANGE_DOWN_BUTTON:
2116 case CHANGE_UP_BUTTON: 2116 case CHANGE_UP_BUTTON:
2117#ifdef EXIT_RC_BUTTON 2117#ifdef EXIT_RC_BUTTON
2118 case EXIT_RC_BUTTON 2118 case EXIT_RC_BUTTON:
2119#endif 2119#endif
2120 case EXIT_BUTTON: 2120 case EXIT_BUTTON:
2121 ask_reset_done = true; 2121 ask_reset_done = true;
@@ -2159,7 +2159,7 @@ void general_settings(void)
2159 switch(rb->button_get_w_tmo(HZ/4)) 2159 switch(rb->button_get_w_tmo(HZ/4))
2160 { 2160 {
2161#ifdef EXIT_RC_BUTTON 2161#ifdef EXIT_RC_BUTTON
2162 case EXIT_RC_BUTTON 2162 case EXIT_RC_BUTTON:
2163#endif 2163#endif
2164 case EXIT_BUTTON: 2164 case EXIT_BUTTON:
2165 case MENU_BUTTON: 2165 case MENU_BUTTON:
@@ -2509,7 +2509,7 @@ void select_mode(void)
2509 break; 2509 break;
2510 2510
2511#ifdef EXIT_RC_BUTTON 2511#ifdef EXIT_RC_BUTTON
2512 case EXIT_RC_BUTTON 2512 case EXIT_RC_BUTTON:
2513#endif 2513#endif
2514 case EXIT_BUTTON: 2514 case EXIT_BUTTON:
2515 case CHANGE_DOWN_BUTTON: 2515 case CHANGE_DOWN_BUTTON:
@@ -2842,7 +2842,7 @@ void counter_settings(void)
2842 break; 2842 break;
2843 2843
2844#ifdef EXIT_RC_BUTTON 2844#ifdef EXIT_RC_BUTTON
2845 case EXIT_RC_BUTTON 2845 case EXIT_RC_BUTTON:
2846#endif 2846#endif
2847 case EXIT_BUTTON: 2847 case EXIT_BUTTON:
2848 current = counting_up; 2848 current = counting_up;
@@ -2967,7 +2967,7 @@ void main_menu(void)
2967 break; 2967 break;
2968 2968
2969#ifdef EXIT_RC_BUTTON 2969#ifdef EXIT_RC_BUTTON
2970 case EXIT_RC_BUTTON 2970 case EXIT_RC_BUTTON:
2971#endif 2971#endif
2972 case EXIT_BUTTON: 2972 case EXIT_BUTTON:
2973 case CHANGE_DOWN_BUTTON: 2973 case CHANGE_DOWN_BUTTON:
@@ -3088,7 +3088,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
3088 switch (button) 3088 switch (button)
3089 { 3089 {
3090#ifdef EXIT_RC_BUTTON 3090#ifdef EXIT_RC_BUTTON
3091 case EXIT_RC_BUTTON 3091 case EXIT_RC_BUTTON:
3092#endif 3092#endif
3093 case EXIT_BUTTON: /* save and exit */ 3093 case EXIT_BUTTON: /* save and exit */
3094 cleanup(NULL); 3094 cleanup(NULL);
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 6a4a5d28f8..1da772dbbc 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -83,8 +83,6 @@ PLUGIN_HEADER
83#define BTN_QUIT (BUTTON_SELECT|BUTTON_MENU) 83#define BTN_QUIT (BUTTON_SELECT|BUTTON_MENU)
84#define BTN_STOPRESET (BUTTON_SELECT|BUTTON_PLAY) 84#define BTN_STOPRESET (BUTTON_SELECT|BUTTON_PLAY)
85 85
86#define BTN_RC_QUIT BUTTON_RC_STOP
87
88#define PLAYERS_TEXT "Menu/Play" 86#define PLAYERS_TEXT "Menu/Play"
89#define WORMS_TEXT "Left/Right" 87#define WORMS_TEXT "Left/Right"
90 88
@@ -98,6 +96,8 @@ PLUGIN_HEADER
98#define BTN_QUIT BUTTON_OFF 96#define BTN_QUIT BUTTON_OFF
99#define BTN_STOPRESET BUTTON_ON 97#define BTN_STOPRESET BUTTON_ON
100 98
99#define BTN_RC_QUIT BUTTON_RC_STOP
100
101#define PLAYERS_TEXT "Up/Down" 101#define PLAYERS_TEXT "Up/Down"
102#define WORMS_TEXT "Left/Right" 102#define WORMS_TEXT "Left/Right"
103 103