From 7c623d577beea6fce3eadaa697d5e6835d820bdf Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 27 Jan 2012 00:06:51 +0100 Subject: [PATCH] Use PLA in boomshine.lua instead of the awkward kbd_input context. This enables it on RaaA. Change-Id: I616bb39c1e785e39e9369d2ccef45477911bb5a3 --- apps/plugins/SOURCES.app_build | 4 ++++ apps/plugins/SUBDIRS.app_build | 1 + 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 sort.c theme_remove.c vbrfix.c +#if PLUGIN_BUFFER_SIZE >= 0x80000 +boomshine.lua +#endif + #ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */ #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 @@ /* For all targets with a bitmap display and a touchscreen * In fact, most of the plugins aren't supposed to be used on a touch(mouse) device */ +lua #ifdef HAVE_LCD_BITMAP #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) if action == rb.actions.ACTION_TOUCHSCREEN and HAS_TOUCHSCREEN then _, self.x, self.y = rb.action_get_touchscreen_press() return true - elseif action == rb.actions.ACTION_KBD_SELECT then + elseif action == rb.actions.PLA_SELECT then return true - elseif (action == rb.actions.ACTION_KBD_RIGHT) then + elseif (action == rb.actions.PLA_RIGHT) then self.x = self.x + self.size - elseif (action == rb.actions.ACTION_KBD_LEFT) then + elseif (action == rb.actions.PLA_LEFT) then self.x = self.x - self.size - elseif (action == rb.actions.ACTION_KBD_UP) then + elseif (action == rb.actions.PLA_UP) then self.y = self.y - self.size - elseif (action == rb.actions.ACTION_KBD_DOWN) then + elseif (action == rb.actions.PLA_DOWN) then self.y = self.y + self.size end @@ -233,8 +233,8 @@ function start_round(level, goal, nrBalls, total) end -- Check for actions - local action = rb.get_action(rb.contexts.CONTEXT_KEYBOARD, 0) - if(action == rb.actions.ACTION_KBD_ABORT) then + local action = rb.get_plugin_action(0) + if action == rb.actions.PLA_EXIT or action == rb.actions.PLA_CANCEL then exit = true break end