diff options
author | Kevin Ferrare <kevin@rockbox.org> | 2006-06-30 16:43:47 +0000 |
---|---|---|
committer | Kevin Ferrare <kevin@rockbox.org> | 2006-06-30 16:43:47 +0000 |
commit | 0e027bd90c4f0c2aa42c087a1957b42a58e93270 (patch) | |
tree | d21b7009fb818c907fcfc2268f1b9a12fd9263de /apps/plugins/clock.c | |
parent | 7bbf53eae502417e6e0fbb204e319310f28f33ad (diff) | |
download | rockbox-0e027bd90c4f0c2aa42c087a1957b42a58e93270.tar.gz rockbox-0e027bd90c4f0c2aa42c087a1957b42a58e93270.zip |
To avoid having to use the main unit when accidentally launching a plugin from the remote, plugins now support remote quit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10157 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/clock.c')
-rw-r--r-- | apps/plugins/clock.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index 81caafcf53..756a83dd16 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c | |||
@@ -155,6 +155,8 @@ PLUGIN_HEADER | |||
155 | #define CHANGE_UP_BUTTON BUTTON_RIGHT | 155 | #define CHANGE_UP_BUTTON BUTTON_RIGHT |
156 | #define CHANGE_DOWN_BUTTON BUTTON_LEFT | 156 | #define CHANGE_DOWN_BUTTON BUTTON_LEFT |
157 | 157 | ||
158 | #define EXIT_RC_BUTTON BUTTON_RC_STOP | ||
159 | |||
158 | #define YESTEXT "Select/Navi" | 160 | #define YESTEXT "Select/Navi" |
159 | #define NAVI_BUTTON_TEXT_LEFT "LEFT" | 161 | #define NAVI_BUTTON_TEXT_LEFT "LEFT" |
160 | #define NAVI_BUTTON_TEXT_RIGHT "RIGHT" | 162 | #define NAVI_BUTTON_TEXT_RIGHT "RIGHT" |
@@ -1778,6 +1780,9 @@ bool help_screen(void) | |||
1778 | 1780 | ||
1779 | switch(rb->button_get_w_tmo(HZ/4)) | 1781 | switch(rb->button_get_w_tmo(HZ/4)) |
1780 | { | 1782 | { |
1783 | #ifdef EXIT_RC_BUTTON | ||
1784 | case EXIT_RC_BUTTON: | ||
1785 | #endif | ||
1781 | case EXIT_BUTTON: | 1786 | case EXIT_BUTTON: |
1782 | done = true; | 1787 | done = true; |
1783 | break; | 1788 | break; |
@@ -2061,7 +2066,9 @@ void settings_screen(void) | |||
2061 | case CHANGE_UP_BUTTON: | 2066 | case CHANGE_UP_BUTTON: |
2062 | change_setting(cursorpos-1, 1, false); | 2067 | change_setting(cursorpos-1, 1, false); |
2063 | break; | 2068 | break; |
2064 | 2069 | #ifdef EXIT_RC_BUTTON | |
2070 | case EXIT_RC_BUTTON | ||
2071 | #endif | ||
2065 | case EXIT_BUTTON: | 2072 | case EXIT_BUTTON: |
2066 | case MENU_BUTTON: | 2073 | case MENU_BUTTON: |
2067 | done = true; | 2074 | done = true; |
@@ -2107,6 +2114,9 @@ void confirm_reset(void) | |||
2107 | #endif | 2114 | #endif |
2108 | case CHANGE_DOWN_BUTTON: | 2115 | case CHANGE_DOWN_BUTTON: |
2109 | case CHANGE_UP_BUTTON: | 2116 | case CHANGE_UP_BUTTON: |
2117 | #ifdef EXIT_RC_BUTTON | ||
2118 | case EXIT_RC_BUTTON | ||
2119 | #endif | ||
2110 | case EXIT_BUTTON: | 2120 | case EXIT_BUTTON: |
2111 | ask_reset_done = true; | 2121 | ask_reset_done = true; |
2112 | break; | 2122 | break; |
@@ -2148,6 +2158,9 @@ void general_settings(void) | |||
2148 | 2158 | ||
2149 | switch(rb->button_get_w_tmo(HZ/4)) | 2159 | switch(rb->button_get_w_tmo(HZ/4)) |
2150 | { | 2160 | { |
2161 | #ifdef EXIT_RC_BUTTON | ||
2162 | case EXIT_RC_BUTTON | ||
2163 | #endif | ||
2151 | case EXIT_BUTTON: | 2164 | case EXIT_BUTTON: |
2152 | case MENU_BUTTON: | 2165 | case MENU_BUTTON: |
2153 | if(settings.general[general_savesetting] == 2) | 2166 | if(settings.general[general_savesetting] == 2) |
@@ -2495,6 +2508,9 @@ void select_mode(void) | |||
2495 | done = true; | 2508 | done = true; |
2496 | break; | 2509 | break; |
2497 | 2510 | ||
2511 | #ifdef EXIT_RC_BUTTON | ||
2512 | case EXIT_RC_BUTTON | ||
2513 | #endif | ||
2498 | case EXIT_BUTTON: | 2514 | case EXIT_BUTTON: |
2499 | case CHANGE_DOWN_BUTTON: | 2515 | case CHANGE_DOWN_BUTTON: |
2500 | done = true; | 2516 | done = true; |
@@ -2825,6 +2841,9 @@ void counter_settings(void) | |||
2825 | } | 2841 | } |
2826 | break; | 2842 | break; |
2827 | 2843 | ||
2844 | #ifdef EXIT_RC_BUTTON | ||
2845 | case EXIT_RC_BUTTON | ||
2846 | #endif | ||
2828 | case EXIT_BUTTON: | 2847 | case EXIT_BUTTON: |
2829 | current = counting_up; | 2848 | current = counting_up; |
2830 | if(current != original) | 2849 | if(current != original) |
@@ -2947,6 +2966,9 @@ void main_menu(void) | |||
2947 | } | 2966 | } |
2948 | break; | 2967 | break; |
2949 | 2968 | ||
2969 | #ifdef EXIT_RC_BUTTON | ||
2970 | case EXIT_RC_BUTTON | ||
2971 | #endif | ||
2950 | case EXIT_BUTTON: | 2972 | case EXIT_BUTTON: |
2951 | case CHANGE_DOWN_BUTTON: | 2973 | case CHANGE_DOWN_BUTTON: |
2952 | #ifdef ALT_MENU_BUTTON | 2974 | #ifdef ALT_MENU_BUTTON |
@@ -3065,6 +3087,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
3065 | button = rb->button_get_w_tmo(HZ/10); | 3087 | button = rb->button_get_w_tmo(HZ/10); |
3066 | switch (button) | 3088 | switch (button) |
3067 | { | 3089 | { |
3090 | #ifdef EXIT_RC_BUTTON | ||
3091 | case EXIT_RC_BUTTON | ||
3092 | #endif | ||
3068 | case EXIT_BUTTON: /* save and exit */ | 3093 | case EXIT_BUTTON: /* save and exit */ |
3069 | cleanup(NULL); | 3094 | cleanup(NULL); |
3070 | return PLUGIN_OK; | 3095 | return PLUGIN_OK; |