summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-05-28 17:12:47 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-05-28 17:12:47 +0000
commit06b53321b4a30c6efe1d3cfba5467653cfbfc434 (patch)
tree21f8227b2b6c7306757a4eec7ead56c2b631691d /apps
parent17987addf86c773b8a99b64579154d009fc25101 (diff)
downloadrockbox-06b53321b4a30c6efe1d3cfba5467653cfbfc434.tar.gz
rockbox-06b53321b4a30c6efe1d3cfba5467653cfbfc434.tar.bz2
rockbox-06b53321b4a30c6efe1d3cfba5467653cfbfc434.zip
Create WPS context (onplay) menus using MAKE_ONPLAYMENU macro. Partial fix for FS#9037 - Menu exit behaviour is inconsistent in WPS context menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17646 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/onplay.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/onplay.c b/apps/onplay.c
index 7ab459192e..6b9669cf5b 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -99,8 +99,9 @@ MENUITEM_FUNCTION(bookmark_load_menu_item, 0,
ID2P(LANG_BOOKMARK_MENU_LIST),
bookmark_load_menu, NULL,
bookmark_menu_callback, Icon_Bookmark);
-MAKE_MENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU), bookmark_menu_callback,
- Icon_Bookmark, &bookmark_create_menu_item, &bookmark_load_menu_item);
+MAKE_ONPLAYMENU(bookmark_menu, ID2P(LANG_BOOKMARK_MENU), bookmark_menu_callback,
+ Icon_Bookmark, &bookmark_create_menu_item,
+ &bookmark_load_menu_item);
static int bookmark_menu_callback(int action,
const struct menu_item_ex *this_item)
{
@@ -252,9 +253,9 @@ MENUITEM_FUNCTION(cat_add_to_list, 0, ID2P(LANG_CATALOG_ADD_TO),
cat_add_to_a_playlist, 0, NULL, Icon_Playlist);
MENUITEM_FUNCTION(cat_add_to_new, 0, ID2P(LANG_CATALOG_ADD_TO_NEW),
cat_add_to_a_new_playlist, 0, NULL, Icon_Playlist);
-MAKE_MENU( cat_playlist_menu, ID2P(LANG_CATALOG), cat_playlist_callback,
- Icon_Playlist, &cat_view_lists,
- &cat_add_to_list, &cat_add_to_new );
+MAKE_ONPLAYMENU(cat_playlist_menu, ID2P(LANG_CATALOG), cat_playlist_callback,
+ Icon_Playlist, &cat_view_lists, &cat_add_to_list,
+ &cat_add_to_new);
static int cat_playlist_callback(int action,
const struct menu_item_ex *this_item)