S#10387 - Rework pluginlib actions

It changes pluginlib actions to contain only a single and simple context (and
other one for remote directional buttons),
consisting of 7(9) buttons: up/down/left/right, select OR short select and long
select, exit and cancel (plus 2 for scrollwheel targets).
This ensures contexts don't clash with other contexts and simplifies them, at
the expense of reduced versatility. However, the versatility made it largely unusable
due to the great number of targets.
This should allow for using pluginlib actions safely for the most simple plugins (e.g. almost all demos).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26202 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 5 deletions

diff --git a/apps/plugins/rocklife.c b/apps/plugins/rocklife.c
index 35c848de1d..210cffa78d 100644
--- a/apps/plugins/rocklife.c
+++ b/apps/plugins/rocklife.c
@@ -66,11 +66,11 @@
 
 PLUGIN_HEADER
 
-#define ROCKLIFE_PLAY_PAUSE PLA_FIRE
+#define ROCKLIFE_PLAY_PAUSE PLA_SELECT
 #define ROCKLIFE_INIT       PLA_DOWN
 #define ROCKLIFE_NEXT       PLA_RIGHT
 #define ROCKLIFE_NEXT_REP   PLA_RIGHT_REPEAT
-#define ROCKLIFE_QUIT       PLA_QUIT
+#define ROCKLIFE_QUIT       PLA_CANCEL
 #define ROCKLIFE_STATUS     PLA_LEFT
 
 #define PATTERN_RANDOM     0
@@ -80,7 +80,7 @@ PLUGIN_HEADER
 #define PATTERN_GLIDER_GUN 4
 
 const struct button_mapping *plugin_contexts[]
-= {generic_directions, generic_actions};
+= {pla_main_ctx};
 
 #define GRID_W LCD_WIDTH
 #define GRID_H LCD_HEIGHT
@@ -512,7 +512,7 @@ enum plugin_status plugin_start(const void* parameter)
     show_grid(pgrid);
 
     while(!quit) {
-        button = pluginlib_getaction(TIMEOUT_BLOCK, plugin_contexts, 2);
+        button = pluginlib_getaction(TIMEOUT_BLOCK, plugin_contexts, ARRAYLEN(plugin_contexts));
         switch(button) {
         case ROCKLIFE_NEXT:
         case ROCKLIFE_NEXT_REP:
@@ -537,7 +537,7 @@ enum plugin_status plugin_start(const void* parameter)
                 /* show new generation */
                 rb->yield();
                 show_grid(pgrid);
-                button = pluginlib_getaction(0, plugin_contexts, 2);
+                button = pluginlib_getaction(0, plugin_contexts, ARRAYLEN(plugin_contexts));
                 switch(button) {
                 case ROCKLIFE_PLAY_PAUSE:
                 case ROCKLIFE_QUIT: