diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-03 13:27:19 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-03 13:27:19 +0000 |
commit | 4b472de39b30c079ff846aec83d2da33cc0adcc5 (patch) | |
tree | f2435c9307c6aa495f4dc34c098290ddad3f97c3 /apps/plugins/lamp.c | |
parent | 3681ff197d3cf5393df3d56d7b6f7b39af0fc47f (diff) | |
download | rockbox-4b472de39b30c079ff846aec83d2da33cc0adcc5.tar.gz rockbox-4b472de39b30c079ff846aec83d2da33cc0adcc5.zip |
a few more button/statusbar fixes...
* hopefully fix the last of the plugins which dont handle the enw SYS event.
* fix FS#9750 - WPS's which dont specify (or force the wps on) wernt showing the statusbar at all
* lamp, battery_bench, *_flash button handling fixes
* plugins using the core menu code will again show the statusbar
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19656 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/lamp.c')
-rw-r--r-- | apps/plugins/lamp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index e355ee4ce3..ace6545865 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c | |||
@@ -110,6 +110,7 @@ static int colorset[NUM_COLORSETS][3] = { { 255, 255, 255 } , /* white */ | |||
110 | /* this is the plugin entry point */ | 110 | /* this is the plugin entry point */ |
111 | enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) | 111 | enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) |
112 | { | 112 | { |
113 | long button; | ||
113 | (void)parameter; | 114 | (void)parameter; |
114 | rb = api; | 115 | rb = api; |
115 | 116 | ||
@@ -167,7 +168,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
167 | rb->lcd_clear_display(); | 168 | rb->lcd_clear_display(); |
168 | rb->lcd_update(); | 169 | rb->lcd_update(); |
169 | 170 | ||
170 | switch(rb->button_get(true)) | 171 | switch((button = rb->button_get(true))) |
171 | { | 172 | { |
172 | case LAMP_RIGHT: | 173 | case LAMP_RIGHT: |
173 | #ifdef LAMP_NEXT | 174 | #ifdef LAMP_NEXT |
@@ -196,9 +197,10 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
196 | case (LAMP_PREV|BUTTON_REL): | 197 | case (LAMP_PREV|BUTTON_REL): |
197 | #endif /* LAMP_PREV */ | 198 | #endif /* LAMP_PREV */ |
198 | /* eat these... */ | 199 | /* eat these... */ |
199 | break; | 200 | break; |
200 | default: | 201 | default: |
201 | quit = true; | 202 | if (!IS_SYSEVENT(button)) |
203 | quit = true; | ||
202 | } | 204 | } |
203 | } while (!quit); | 205 | } while (!quit); |
204 | 206 | ||