diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-03 13:52:14 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-03 13:52:14 +0000 |
commit | 02a871780fdc7e5193028a2eb8b250f88a70074b (patch) | |
tree | 6f3fecd827bba873464ff4a8dfc6fab88f0ace44 /apps/menus/playlist_menu.c | |
parent | 7ae5f12449bcb2ddaf8b578e06d91ddfaa69df72 (diff) |
Remove the need to double up the MENU macros in manu.h.
Icons are now used by their id which must be part of the icons_6x8 enum,
or Icon_NOICON for none
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12571 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/playlist_menu.c')
-rw-r--r-- | apps/menus/playlist_menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index d0d491f74e..8cf4604b0f 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c @@ -63,21 +63,21 @@ int save_playlist_screen(struct playlist_info* playlist) return 0; } MENUITEM_FUNCTION(create_playlist_item, ID2P(LANG_CREATE_PLAYLIST), - (int(*)(void))create_playlist, NULL, NOICON); + (int(*)(void))create_playlist, NULL, Icon_NOICON); MENUITEM_FUNCTION(view_playlist, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), - (int(*)(void))playlist_viewer, NULL, NOICON); + (int(*)(void))playlist_viewer, NULL, Icon_NOICON); MENUITEM_FUNCTION_WPARAM(save_playlist, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), - (int(*)(void*))save_playlist_screen, NULL, NULL, NOICON); + (int(*)(void*))save_playlist_screen, NULL, NULL, Icon_NOICON); MENUITEM_FUNCTION(catalog, ID2P(LANG_CATALOG), - (int(*)(void))catalog_view_playlists, NULL, NOICON); + (int(*)(void))catalog_view_playlists, 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); MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLIST_MENU), NULL, - bitmap_icons_6x8[Icon_Playlist], + Icon_Playlist, &recursive_dir_insert, &warn_on_erase); MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL, - bitmap_icons_6x8[Icon_Playlist], + Icon_Playlist, &create_playlist_item, &view_playlist, &save_playlist, &catalog); bool playlist_menu(void) |