len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21149 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andrew Mahone 2009-05-31 17:47:56 +00:00
parent c69331ef32
commit 29d7db4a46
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/plugins/lib/pluginlib_actions.c
View file

@ -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);
}