Unify the way functions are called from menus.

Optionally, the functions return value can be checked for a value to 
tell the menu to quit.


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

1 files changed, 10 insertions, 8 deletions

diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c
index d4b311154a..b73341c1d9 100644
--- a/apps/menus/playlist_menu.c
+++ b/apps/menus/playlist_menu.c
@@ -62,14 +62,16 @@ int save_playlist_screen(struct playlist_info* playlist)
 
     return 0;
 }
-MENUITEM_FUNCTION(create_playlist_item, ID2P(LANG_CREATE_PLAYLIST), 
-                  (int(*)(void))create_playlist, NULL, Icon_NOICON);
-MENUITEM_FUNCTION(view_playlist, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), 
-                  (int(*)(void))playlist_viewer, NULL, Icon_NOICON);
-MENUITEM_FUNCTION_WPARAM(save_playlist, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), 
-                         (int(*)(void*))save_playlist_screen, NULL, NULL, Icon_NOICON);
-MENUITEM_FUNCTION(catalog, ID2P(LANG_CATALOG), 
-                  (int(*)(void))catalog_view_playlists, NULL, Icon_NOICON);
+MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), 
+                  (int(*)(void))create_playlist, NULL, 0, NULL, Icon_NOICON);
+MENUITEM_FUNCTION(view_playlist, 0, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), 
+                  (int(*)(void))playlist_viewer, NULL, 0, NULL, Icon_NOICON);
+MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), 
+                         (int(*)(void*))save_playlist_screen, 
+                        NULL, 0, NULL, Icon_NOICON);
+MENUITEM_FUNCTION(catalog, 0, ID2P(LANG_CATALOG), 
+                  (int(*)(void))catalog_view_playlists,
+                   NULL, 0, NULL, Icon_NOICON);
 MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL);
 MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL);