diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-14 06:58:30 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-14 06:58:30 +0000 |
commit | 5599d6806d12d22b724d7967717edae07db3e08f (patch) | |
tree | accbaab8ecb8b3d7078daeb2df1d76a4b0ab67df /apps/menus/playback_menu.c | |
parent | 7df87126f0ff5fea2554928db3d8ab7af06c6737 (diff) | |
download | rockbox-5599d6806d12d22b724d7967717edae07db3e08f.tar.gz rockbox-5599d6806d12d22b724d7967717edae07db3e08f.zip |
Icons in the menus. Thanks midkay for them.
Any menus which dont yet show them are not converted to the new system.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12300 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/playback_menu.c')
-rw-r--r-- | apps/menus/playback_menu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 74a64831dd..7c0f75198d 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -60,7 +60,7 @@ MENUITEM_SETTING(resume, &global_settings.resume, NULL); | |||
60 | 60 | ||
61 | MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL); | 61 | MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL); |
62 | MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); | 62 | MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL); |
63 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, | 63 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, NOICON, |
64 | &ff_rewind_min_step, &ff_rewind_accel); | 64 | &ff_rewind_min_step, &ff_rewind_accel); |
65 | #if CONFIG_CODEC == SWCODEC | 65 | #if CONFIG_CODEC == SWCODEC |
66 | int buffermargin_callback(int action,const struct menu_item_ex *this_item) | 66 | int buffermargin_callback(int action,const struct menu_item_ex *this_item) |
@@ -95,7 +95,7 @@ MENUITEM_SETTING(crossfade_fade_out_duration, | |||
95 | &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); | 95 | &global_settings.crossfade_fade_out_duration, setcrossfadeonexit_callback); |
96 | MENUITEM_SETTING(crossfade_fade_out_mixmode, | 96 | MENUITEM_SETTING(crossfade_fade_out_mixmode, |
97 | &global_settings.crossfade_fade_out_mixmode,NULL); | 97 | &global_settings.crossfade_fade_out_mixmode,NULL); |
98 | MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, | 98 | MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, NOICON, |
99 | &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, | 99 | &crossfade, &crossfade_fade_in_delay, &crossfade_fade_in_duration, |
100 | &crossfade_fade_out_delay, &crossfade_fade_out_duration, | 100 | &crossfade_fade_out_delay, &crossfade_fade_out_duration, |
101 | &crossfade_fade_out_mixmode); | 101 | &crossfade_fade_out_mixmode); |
@@ -117,7 +117,7 @@ MENUITEM_SETTING(replaygain, &global_settings.replaygain ,replaygain_callback); | |||
117 | MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback); | 117 | MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback); |
118 | MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback); | 118 | MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback); |
119 | MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback); | 119 | MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback); |
120 | MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, | 120 | MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, NOICON, |
121 | &replaygain,&replaygain_noclip, | 121 | &replaygain,&replaygain_noclip, |
122 | &replaygain_type,&replaygain_preamp); | 122 | &replaygain_type,&replaygain_preamp); |
123 | 123 | ||
@@ -150,11 +150,12 @@ MENUITEM_SETTING(audioscrobbler, &global_settings.audioscrobbler, audioscrobbler | |||
150 | MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL); | 150 | MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL); |
151 | MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL); | 151 | MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL); |
152 | MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL); | 152 | MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL); |
153 | MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, | 153 | MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, NOICON, |
154 | &unplug_mode, &unplug_rw, &unplug_autoresume); | 154 | &unplug_mode, &unplug_rw, &unplug_autoresume); |
155 | #endif | 155 | #endif |
156 | 156 | ||
157 | MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, | 157 | MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, |
158 | bitmap_icons_6x8[Icon_Playback_menu], | ||
158 | &shuffle_item, &repeat_mode, &play_selected, &resume, | 159 | &shuffle_item, &repeat_mode, &play_selected, &resume, |
159 | &ff_rewind_settings_menu, | 160 | &ff_rewind_settings_menu, |
160 | &buffer_margin, &fade_on_stop, &party_mode, | 161 | &buffer_margin, &fade_on_stop, &party_mode, |