From 02a871780fdc7e5193028a2eb8b250f88a70074b Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sat, 3 Mar 2007 13:52:14 +0000 Subject: 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 --- apps/menus/playback_menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/menus/playback_menu.c') diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index ae735609a8..ebfb52eaa0 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c @@ -60,7 +60,7 @@ MENUITEM_SETTING(play_selected, &global_settings.play_selected, NULL); MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL); MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); -MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, NOICON, +MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON, &ff_rewind_min_step, &ff_rewind_accel); #if CONFIG_CODEC == SWCODEC int buffermargin_callback(int action,const struct menu_item_ex *this_item) @@ -95,7 +95,7 @@ MENUITEM_SETTING(crossfade_fade_out_duration, &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); MENUITEM_SETTING(crossfade_fade_out_mixmode, &global_settings.crossfade_fade_out_mixmode,NULL); -MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, NOICON, +MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, Icon_NOICON, &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, &crossfade_fade_out_delay, &crossfade_fade_out_duration, &crossfade_fade_out_mixmode); @@ -117,7 +117,7 @@ MENUITEM_SETTING(replaygain, &global_settings.replaygain ,replaygain_callback); MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback); MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback); MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback); -MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, NOICON, +MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON, &replaygain,&replaygain_noclip, &replaygain_type,&replaygain_preamp); @@ -165,12 +165,12 @@ MENUITEM_SETTING(cuesheet, &global_settings.cuesheet, cuesheet_callback); MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL); MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL); MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL); -MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, NOICON, +MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, Icon_NOICON, &unplug_mode, &unplug_rw, &unplug_autoresume); #endif MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, - bitmap_icons_6x8[Icon_Playback_menu], + Icon_Playback_menu, &shuffle_item, &repeat_mode, &play_selected, &ff_rewind_settings_menu, &buffer_margin, &fade_on_stop, &party_mode, -- cgit v1.2.3