summaryrefslogtreecommitdiffstats
path: root/apps/plugins/lib/pluginlib_actions.c
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-05-31 17:47:56 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-05-31 17:47:56 +0000
commit29d7db4a46a773793d83cca9583f6aa403f5fa3d (patch)
treef094238dc57392d0574bf1922236e4456b2edd5c /apps/plugins/lib/pluginlib_actions.c
parentc69331ef32171966b19f4348c72539d4c6a149ba (diff)
downloadrockbox-29d7db4a46a773793d83cca9583f6aa403f5fa3d.tar.gz
rockbox-29d7db4a46a773793d83cca9583f6aa403f5fa3d.zip
Replace use of CONTEXT_CUSTOM by get_custom_action with new CONTEXT_PLUGIN, to prevent conflicts with core contexts using CONTEXT_CUSTOM, and use CONTEXT_TREE as the base context for PictureFlow's custom contexts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21149 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/lib/pluginlib_actions.c')
-rw-r--r--apps/plugins/lib/pluginlib_actions.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 550cd56d48..e870c79b9c 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -71,7 +71,7 @@ const struct button_mapping remote_directions[] =
#else
#error pluginlib_actions: Unsupported remote keypad
#endif
- {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
+ {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
};
#endif /* HAVE_REMOTE_LCD */
@@ -174,7 +174,7 @@ const struct button_mapping generic_directions[] =
#else
#error pluginlib_actions: Unsupported keypad
#endif
- {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
+ {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
};
const struct button_mapping generic_left_right_fire[] =
@@ -296,7 +296,7 @@ const struct button_mapping generic_left_right_fire[] =
#else
#error pluginlib_actions: Unsupported keypad
#endif
- {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
+ {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
};
/* these were taken from the bubbles plugin, so may need tweaking */
@@ -457,7 +457,7 @@ const struct button_mapping generic_actions[] =
#else
#error pluginlib_actions: Unsupported keypad
#endif
- {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
+ {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
};
const struct button_mapping generic_increase_decrease[] =
@@ -537,7 +537,7 @@ const struct button_mapping generic_increase_decrease[] =
#else
#error pluginlib_actions: Unsupported keypad
#endif
- {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
+ {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
};
static struct button_mapping **plugin_context_order;
@@ -560,5 +560,5 @@ int pluginlib_getaction(int timeout,
plugin_context_order = (struct button_mapping **)plugin_contexts;
plugin_context_count = count;
last_context = 0;
- return rb->get_custom_action(CONTEXT_CUSTOM,timeout,get_context_map);
+ return rb->get_custom_action(CONTEXT_PLUGIN,timeout,get_context_map);
}