diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-01-27 00:06:51 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-27 09:15:05 +0100 |
commit | 7c623d577beea6fce3eadaa697d5e6835d820bdf (patch) | |
tree | 56c9dedc3cc60c004cf06fbae5a3143557e5bdc3 | |
parent | c406f945924412f4c472413b578e396036e63626 (diff) | |
download | rockbox-7c623d577beea6fce3eadaa697d5e6835d820bdf.tar.gz rockbox-7c623d577beea6fce3eadaa697d5e6835d820bdf.zip |
Use PLA in boomshine.lua instead of the awkward kbd_input context. This enables it on RaaA.
Change-Id: I616bb39c1e785e39e9369d2ccef45477911bb5a3
-rw-r--r-- | apps/plugins/SOURCES.app_build | 4 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS.app_build | 1 | ||||
-rw-r--r-- | apps/plugins/boomshine.lua | 14 |
3 files changed, 12 insertions, 7 deletions
diff --git a/apps/plugins/SOURCES.app_build b/apps/plugins/SOURCES.app_build index 8a94e67a37..d33f9951cf 100644 --- a/apps/plugins/SOURCES.app_build +++ b/apps/plugins/SOURCES.app_build | |||
@@ -11,6 +11,10 @@ search.c | |||
11 | sort.c | 11 | sort.c |
12 | theme_remove.c | 12 | theme_remove.c |
13 | vbrfix.c | 13 | vbrfix.c |
14 | #if PLUGIN_BUFFER_SIZE >= 0x80000 | ||
15 | boomshine.lua | ||
16 | #endif | ||
17 | |||
14 | 18 | ||
15 | #ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */ | 19 | #ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */ |
16 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 20 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/apps/plugins/SUBDIRS.app_build b/apps/plugins/SUBDIRS.app_build index 32fda68425..e9f9253e82 100644 --- a/apps/plugins/SUBDIRS.app_build +++ b/apps/plugins/SUBDIRS.app_build | |||
@@ -6,6 +6,7 @@ | |||
6 | /* For all targets with a bitmap display and a touchscreen | 6 | /* For all targets with a bitmap display and a touchscreen |
7 | * In fact, most of the plugins aren't supposed to be used on a touch(mouse) device | 7 | * In fact, most of the plugins aren't supposed to be used on a touch(mouse) device |
8 | */ | 8 | */ |
9 | lua | ||
9 | #ifdef HAVE_LCD_BITMAP | 10 | #ifdef HAVE_LCD_BITMAP |
10 | 11 | ||
11 | #if CONFIG_CODEC == SWCODEC && PLUGIN_BUFFER_SIZE > 0x20000 | 12 | #if CONFIG_CODEC == SWCODEC && PLUGIN_BUFFER_SIZE > 0x20000 |
diff --git a/apps/plugins/boomshine.lua b/apps/plugins/boomshine.lua index 0d0f9c518a..fe73e8cb66 100644 --- a/apps/plugins/boomshine.lua +++ b/apps/plugins/boomshine.lua | |||
@@ -148,15 +148,15 @@ function Cursor:do_action(action) | |||
148 | if action == rb.actions.ACTION_TOUCHSCREEN and HAS_TOUCHSCREEN then | 148 | if action == rb.actions.ACTION_TOUCHSCREEN and HAS_TOUCHSCREEN then |
149 | _, self.x, self.y = rb.action_get_touchscreen_press() | 149 | _, self.x, self.y = rb.action_get_touchscreen_press() |
150 | return true | 150 | return true |
151 | elseif action == rb.actions.ACTION_KBD_SELECT then | 151 | elseif action == rb.actions.PLA_SELECT then |
152 | return true | 152 | return true |
153 | elseif (action == rb.actions.ACTION_KBD_RIGHT) then | 153 | elseif (action == rb.actions.PLA_RIGHT) then |
154 | self.x = self.x + self.size | 154 | self.x = self.x + self.size |
155 | elseif (action == rb.actions.ACTION_KBD_LEFT) then | 155 | elseif (action == rb.actions.PLA_LEFT) then |
156 | self.x = self.x - self.size | 156 | self.x = self.x - self.size |
157 | elseif (action == rb.actions.ACTION_KBD_UP) then | 157 | elseif (action == rb.actions.PLA_UP) then |
158 | self.y = self.y - self.size | 158 | self.y = self.y - self.size |
159 | elseif (action == rb.actions.ACTION_KBD_DOWN) then | 159 | elseif (action == rb.actions.PLA_DOWN) then |
160 | self.y = self.y + self.size | 160 | self.y = self.y + self.size |
161 | end | 161 | end |
162 | 162 | ||
@@ -233,8 +233,8 @@ function start_round(level, goal, nrBalls, total) | |||
233 | end | 233 | end |
234 | 234 | ||
235 | -- Check for actions | 235 | -- Check for actions |
236 | local action = rb.get_action(rb.contexts.CONTEXT_KEYBOARD, 0) | 236 | local action = rb.get_plugin_action(0) |
237 | if(action == rb.actions.ACTION_KBD_ABORT) then | 237 | if action == rb.actions.PLA_EXIT or action == rb.actions.PLA_CANCEL then |
238 | exit = true | 238 | exit = true |
239 | break | 239 | break |
240 | end | 240 | end |