diff options
-rw-r--r-- | apps/gui/icon.h | 2 | ||||
-rw-r--r-- | apps/menu.c | 18 | ||||
-rw-r--r-- | apps/menu.h | 46 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 34 | ||||
-rw-r--r-- | apps/menus/eq_menu.c | 46 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 32 | ||||
-rw-r--r-- | apps/menus/playback_menu.c | 10 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 12 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 2 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 34 | ||||
-rw-r--r-- | apps/menus/sound_menu.c | 4 | ||||
-rw-r--r-- | apps/player/icons.h | 26 | ||||
-rw-r--r-- | apps/recorder/icons.h | 2 | ||||
-rw-r--r-- | apps/recorder/radio.c | 26 | ||||
-rw-r--r-- | apps/root_menu.c | 20 |
15 files changed, 153 insertions, 161 deletions
diff --git a/apps/gui/icon.h b/apps/gui/icon.h index 14b66d3c51..e21db7a133 100644 --- a/apps/gui/icon.h +++ b/apps/gui/icon.h | |||
@@ -30,6 +30,8 @@ typedef short ICON; | |||
30 | #define NOICON -1 | 30 | #define NOICON -1 |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #define Icon_NOICON -1 | ||
34 | |||
33 | #define CURSOR_CHAR 0x92 | 35 | #define CURSOR_CHAR 0x92 |
34 | #define CURSOR_WIDTH 6 | 36 | #define CURSOR_WIDTH 6 |
35 | #define CURSOR_HEIGHT 8 | 37 | #define CURSOR_HEIGHT 8 |
diff --git a/apps/menu.c b/apps/menu.c index c4b9317e6c..98cce52a47 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -353,14 +353,14 @@ static char * get_menu_item_name(int selected_item,void * data, char *buffer) | |||
353 | static void menu_get_icon(int selected_item, void * data, ICON * icon) | 353 | static void menu_get_icon(int selected_item, void * data, ICON * icon) |
354 | { | 354 | { |
355 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; | 355 | const struct menu_item_ex *menu = (const struct menu_item_ex *)data; |
356 | ICON menu_icon = NOICON; | 356 | int menu_icon; |
357 | selected_item = get_menu_selection(selected_item, menu); | 357 | selected_item = get_menu_selection(selected_item, menu); |
358 | 358 | ||
359 | menu = menu->submenus[selected_item]; | 359 | menu = menu->submenus[selected_item]; |
360 | if (menu->flags&MENU_HAS_DESC) | 360 | if (menu->flags&MENU_HAS_DESC) |
361 | menu_icon = menu->callback_and_desc->icon; | 361 | menu_icon = menu->callback_and_desc->icon_id; |
362 | else if (menu->flags&MENU_DYNAMIC_DESC) | 362 | else if (menu->flags&MENU_DYNAMIC_DESC) |
363 | menu_icon = menu->menu_get_name_and_icon->icon; | 363 | menu_icon = menu->menu_get_name_and_icon->icon_id; |
364 | 364 | ||
365 | switch (menu->flags&MENU_TYPE_MASK) | 365 | switch (menu->flags&MENU_TYPE_MASK) |
366 | { | 366 | { |
@@ -368,18 +368,18 @@ static void menu_get_icon(int selected_item, void * data, ICON * icon) | |||
368 | *icon = bitmap_icons_6x8[Icon_Menu_setting]; | 368 | *icon = bitmap_icons_6x8[Icon_Menu_setting]; |
369 | break; | 369 | break; |
370 | case MT_MENU: | 370 | case MT_MENU: |
371 | if (menu_icon == NOICON) | 371 | if (menu_icon == Icon_NOICON) |
372 | *icon = bitmap_icons_6x8[Icon_Submenu]; | 372 | *icon = bitmap_icons_6x8[Icon_Submenu]; |
373 | else | 373 | else |
374 | *icon = menu_icon; | 374 | *icon = bitmap_icons_6x8[menu_icon]; |
375 | break; | 375 | break; |
376 | case MT_FUNCTION_CALL: | 376 | case MT_FUNCTION_CALL: |
377 | case MT_FUNCTION_WITH_PARAM: | 377 | case MT_FUNCTION_WITH_PARAM: |
378 | case MT_RETURN_VALUE: | 378 | case MT_RETURN_VALUE: |
379 | if (menu_icon == NOICON) | 379 | if (menu_icon == Icon_NOICON) |
380 | *icon = bitmap_icons_6x8[Icon_Menu_functioncall]; | 380 | *icon = bitmap_icons_6x8[Icon_Menu_functioncall]; |
381 | else | 381 | else |
382 | *icon = menu_icon; | 382 | *icon = bitmap_icons_6x8[menu_icon]; |
383 | break; | 383 | break; |
384 | default: | 384 | default: |
385 | *icon = NOICON; | 385 | *icon = NOICON; |
@@ -415,10 +415,10 @@ static void init_menu_lists(const struct menu_item_ex *menu, | |||
415 | 415 | ||
416 | gui_synclist_init(lists,get_menu_item_name,(void*)menu,false,1); | 416 | gui_synclist_init(lists,get_menu_item_name,(void*)menu,false,1); |
417 | #ifdef HAVE_LCD_BITMAP | 417 | #ifdef HAVE_LCD_BITMAP |
418 | if (menu->callback_and_desc->icon == NOICON) | 418 | if (menu->callback_and_desc->icon_id == Icon_NOICON) |
419 | icon = bitmap_icons_6x8[Icon_Submenu_Entered]; | 419 | icon = bitmap_icons_6x8[Icon_Submenu_Entered]; |
420 | else | 420 | else |
421 | icon = menu->callback_and_desc->icon; | 421 | icon = bitmap_icons_6x8[menu->callback_and_desc->icon_id]; |
422 | gui_synclist_set_title(lists, P2STR(menu->callback_and_desc->desc), icon); | 422 | gui_synclist_set_title(lists, P2STR(menu->callback_and_desc->desc), icon); |
423 | gui_synclist_set_icon_callback(lists, menu_get_icon); | 423 | gui_synclist_set_icon_callback(lists, menu_get_icon); |
424 | #else | 424 | #else |
diff --git a/apps/menu.h b/apps/menu.h index 4cb7446ae1..f5bc2dd179 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -100,9 +100,7 @@ struct menu_item_ex { | |||
100 | int (*menu_callback)(int action, | 100 | int (*menu_callback)(int action, |
101 | const struct menu_item_ex *this_item); | 101 | const struct menu_item_ex *this_item); |
102 | unsigned char *desc; /* string or ID */ | 102 | unsigned char *desc; /* string or ID */ |
103 | #ifdef HAVE_LCD_BITMAP | 103 | int icon_id; /* from icons_6x8 in icons.h */ |
104 | ICON icon; /* Icon to display */ | ||
105 | #endif | ||
106 | } *callback_and_desc; | 104 | } *callback_and_desc; |
107 | /* For when the item text is dynamic */ | 105 | /* For when the item text is dynamic */ |
108 | const struct menu_get_name_and_icon { | 106 | const struct menu_get_name_and_icon { |
@@ -110,9 +108,7 @@ struct menu_item_ex { | |||
110 | const struct menu_item_ex *this_item); | 108 | const struct menu_item_ex *this_item); |
111 | char *(*list_get_name)(int selected_item, void * data, char *buffer); | 109 | char *(*list_get_name)(int selected_item, void * data, char *buffer); |
112 | void *list_get_name_data; | 110 | void *list_get_name_data; |
113 | #ifdef HAVE_LCD_BITMAP | 111 | int icon_id; |
114 | ICON icon; /* Icon to display */ | ||
115 | #endif | ||
116 | } *menu_get_name_and_icon; | 112 | } *menu_get_name_and_icon; |
117 | }; | 113 | }; |
118 | }; | 114 | }; |
@@ -143,13 +139,12 @@ bool do_setting_from_menu(const struct menu_item_ex *temp); | |||
143 | and its return value will be the index of the chosen item */ | 139 | and its return value will be the index of the chosen item */ |
144 | #define MENUITEM_STRINGLIST(name, str, callback, ... ) \ | 140 | #define MENUITEM_STRINGLIST(name, str, callback, ... ) \ |
145 | static const char *name##_[] = {__VA_ARGS__}; \ | 141 | static const char *name##_[] = {__VA_ARGS__}; \ |
146 | static const struct menu_callback_with_desc name##__ = {callback,str, NOICON};\ | 142 | static const struct menu_callback_with_desc name##__ = {callback,str, Icon_NOICON};\ |
147 | static const struct menu_item_ex name = \ | 143 | static const struct menu_item_ex name = \ |
148 | {MT_RETURN_ID|MENU_HAS_DESC| \ | 144 | {MT_RETURN_ID|MENU_HAS_DESC| \ |
149 | MENU_ITEM_COUNT(sizeof( name##_)/sizeof(*name##_)), \ | 145 | MENU_ITEM_COUNT(sizeof( name##_)/sizeof(*name##_)), \ |
150 | { .submenus = name##_},{.callback_and_desc = & name##__}}; | 146 | { .submenus = name##_},{.callback_and_desc = & name##__}}; |
151 | 147 | ||
152 | #ifdef HAVE_LCD_BITMAP /* Kill the player port already.... PLEASE!! */ | ||
153 | 148 | ||
154 | /* returns a value associated with the item */ | 149 | /* returns a value associated with the item */ |
155 | #define MENUITEM_RETURNVALUE(name, str, val, cb, icon) \ | 150 | #define MENUITEM_RETURNVALUE(name, str, val, cb, icon) \ |
@@ -208,38 +203,5 @@ bool do_setting_from_menu(const struct menu_item_ex *temp); | |||
208 | { (void*)name##_},{.callback_and_desc = & name##__}}; | 203 | { (void*)name##_},{.callback_and_desc = & name##__}}; |
209 | 204 | ||
210 | 205 | ||
211 | #else /* HAVE_LCD_BITMAP */ | 206 | |
212 | #define MENUITEM_RETURNVALUE(name, str, val, cb, icon) \ | ||
213 | static const struct menu_callback_with_desc name##_ = {cb,str}; \ | ||
214 | static const struct menu_item_ex name = \ | ||
215 | { MT_RETURN_VALUE|MENU_HAS_DESC, { .value = val}, \ | ||
216 | {.callback_and_desc = & name##_}}; | ||
217 | #define MENUITEM_RETURNVALUE_DYNTEXT(name, val, cb, text_callback, text_cb_data, icon) \ | ||
218 | static const struct menu_get_name_and_icon name##_ \ | ||
219 | = {cb,text_callback,text_cb_data}; \ | ||
220 | static const struct menu_item_ex name = \ | ||
221 | { MT_RETURN_VALUE|MENU_DYNAMIC_DESC, { .value = val}, \ | ||
222 | {.menu_get_name_and_icon = & name##_}}; | ||
223 | #define MENUITEM_FUNCTION(name, str, func, callback, icon) \ | ||
224 | static const struct menu_callback_with_desc name##_ = {callback,str}; \ | ||
225 | const struct menu_item_ex name = \ | ||
226 | { MT_FUNCTION_CALL|MENU_HAS_DESC, { .function = func}, \ | ||
227 | {.callback_and_desc = & name##_}}; | ||
228 | #define MENUITEM_FUNCTION_WPARAM(name, str, func, param, callback, icon) \ | ||
229 | static const struct menu_callback_with_desc name##_ = {callback,str}; \ | ||
230 | static const struct menu_func_with_param name##__ = {func, param}; \ | ||
231 | static const struct menu_item_ex name = \ | ||
232 | { MT_FUNCTION_WITH_PARAM|MENU_HAS_DESC, \ | ||
233 | { .func_with_param = &name##__}, \ | ||
234 | {.callback_and_desc = & name##_}}; | ||
235 | #define MAKE_MENU( name, str, callback, icon, ... ) \ | ||
236 | static const struct menu_item_ex *name##_[] = {__VA_ARGS__}; \ | ||
237 | static const struct menu_callback_with_desc name##__ = {callback,str};\ | ||
238 | const struct menu_item_ex name = \ | ||
239 | {MT_MENU|MENU_HAS_DESC| \ | ||
240 | MENU_ITEM_COUNT(sizeof( name##_)/sizeof(*name##_)), \ | ||
241 | { (void*)name##_},{.callback_and_desc = & name##__}}; | ||
242 | |||
243 | #endif /* HAVE_LCD_BITMAP */ | ||
244 | |||
245 | #endif /* End __MENU_H__ */ | 207 | #endif /* End __MENU_H__ */ |
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 254162e7f0..26eac23f21 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -160,18 +160,18 @@ static int reset_color(void) | |||
160 | return 0; | 160 | return 0; |
161 | } | 161 | } |
162 | MENUITEM_FUNCTION(clear_main_bd, ID2P(LANG_CLEAR_BACKDROP), | 162 | MENUITEM_FUNCTION(clear_main_bd, ID2P(LANG_CLEAR_BACKDROP), |
163 | clear_main_backdrop, NULL, NOICON); | 163 | clear_main_backdrop, NULL, Icon_NOICON); |
164 | MENUITEM_FUNCTION(set_bg_col, ID2P(LANG_BACKGROUND_COLOR), | 164 | MENUITEM_FUNCTION(set_bg_col, ID2P(LANG_BACKGROUND_COLOR), |
165 | set_bg_color, NULL, NOICON); | 165 | set_bg_color, NULL, Icon_NOICON); |
166 | MENUITEM_FUNCTION(set_fg_col, ID2P(LANG_FOREGROUND_COLOR), | 166 | MENUITEM_FUNCTION(set_fg_col, ID2P(LANG_FOREGROUND_COLOR), |
167 | set_fg_color, NULL, NOICON); | 167 | set_fg_color, NULL, Icon_NOICON); |
168 | MENUITEM_FUNCTION(reset_colors, ID2P(LANG_RESET_COLORS), | 168 | MENUITEM_FUNCTION(reset_colors, ID2P(LANG_RESET_COLORS), |
169 | reset_color, NULL, NOICON); | 169 | reset_color, NULL, Icon_NOICON); |
170 | #endif | 170 | #endif |
171 | 171 | ||
172 | /* now the actual menu */ | 172 | /* now the actual menu */ |
173 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | 173 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), |
174 | NULL, bitmap_icons_6x8[Icon_Display_menu] | 174 | NULL, Icon_Display_menu |
175 | #if CONFIG_BACKLIGHT | 175 | #if CONFIG_BACKLIGHT |
176 | ,&backlight_timeout | 176 | ,&backlight_timeout |
177 | # if CONFIG_CHARGING | 177 | # if CONFIG_CHARGING |
@@ -258,7 +258,7 @@ MENUITEM_SETTING(remote_reduce_ticking, | |||
258 | #endif | 258 | #endif |
259 | 259 | ||
260 | MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), | 260 | MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), |
261 | NULL, bitmap_icons_6x8[Icon_Remote_Display_menu], | 261 | NULL, Icon_Remote_Display_menu, |
262 | &remote_backlight_timeout, | 262 | &remote_backlight_timeout, |
263 | #if CONFIG_CHARGING | 263 | #if CONFIG_CHARGING |
264 | &remote_backlight_timeout_plugged, | 264 | &remote_backlight_timeout_plugged, |
@@ -290,7 +290,7 @@ MENUITEM_SETTING(remote_scroll_speed, &global_settings.remote_scroll_speed, NULL | |||
290 | MENUITEM_SETTING(remote_scroll_delay, &global_settings.remote_scroll_delay, NULL); | 290 | MENUITEM_SETTING(remote_scroll_delay, &global_settings.remote_scroll_delay, NULL); |
291 | MENUITEM_SETTING(remote_scroll_step, &global_settings.remote_scroll_step, NULL); | 291 | MENUITEM_SETTING(remote_scroll_step, &global_settings.remote_scroll_step, NULL); |
292 | MENUITEM_SETTING(remote_bidir_limit, &global_settings.remote_bidir_limit, NULL); | 292 | MENUITEM_SETTING(remote_bidir_limit, &global_settings.remote_bidir_limit, NULL); |
293 | MAKE_MENU(remote_scroll_sets, ID2P(LANG_REMOTE_SCROLL_SETS), 0, NOICON, | 293 | MAKE_MENU(remote_scroll_sets, ID2P(LANG_REMOTE_SCROLL_SETS), 0, Icon_NOICON, |
294 | &remote_scroll_speed, &remote_scroll_delay, | 294 | &remote_scroll_speed, &remote_scroll_delay, |
295 | &remote_scroll_step, &remote_bidir_limit); | 295 | &remote_scroll_step, &remote_bidir_limit); |
296 | #endif /* HAVE_REMOTE_LCD */ | 296 | #endif /* HAVE_REMOTE_LCD */ |
@@ -316,7 +316,7 @@ MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); | |||
316 | #endif | 316 | #endif |
317 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); | 317 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); |
318 | 318 | ||
319 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, NOICON, | 319 | MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, |
320 | &scroll_speed, &scroll_delay, | 320 | &scroll_speed, &scroll_delay, |
321 | #ifdef HAVE_LCD_BITMAP | 321 | #ifdef HAVE_LCD_BITMAP |
322 | &scroll_step, | 322 | &scroll_step, |
@@ -346,7 +346,7 @@ MENUITEM_SETTING(buttonbar, &global_settings.buttonbar, NULL); | |||
346 | #endif | 346 | #endif |
347 | MENUITEM_SETTING(volume_type, &global_settings.volume_type, NULL); | 347 | MENUITEM_SETTING(volume_type, &global_settings.volume_type, NULL); |
348 | MENUITEM_SETTING(battery_display, &global_settings.battery_display, NULL); | 348 | MENUITEM_SETTING(battery_display, &global_settings.battery_display, NULL); |
349 | MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, NOICON, | 349 | MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON, |
350 | &scrollbar_item, &statusbar, | 350 | &scrollbar_item, &statusbar, |
351 | #if CONFIG_KEYPAD == RECORDER_PAD | 351 | #if CONFIG_KEYPAD == RECORDER_PAD |
352 | &buttonbar, | 352 | &buttonbar, |
@@ -493,12 +493,12 @@ static int peak_meter_max(void) { | |||
493 | return retval; | 493 | return retval; |
494 | } | 494 | } |
495 | MENUITEM_FUNCTION(peak_meter_scale_item, ID2P(LANG_PM_SCALE), | 495 | MENUITEM_FUNCTION(peak_meter_scale_item, ID2P(LANG_PM_SCALE), |
496 | peak_meter_scale, NULL, NOICON); | 496 | peak_meter_scale, NULL, Icon_NOICON); |
497 | MENUITEM_FUNCTION(peak_meter_min_item, ID2P(LANG_PM_MIN), | 497 | MENUITEM_FUNCTION(peak_meter_min_item, ID2P(LANG_PM_MIN), |
498 | peak_meter_min, NULL, NOICON); | 498 | peak_meter_min, NULL, Icon_NOICON); |
499 | MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), | 499 | MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), |
500 | peak_meter_max, NULL, NOICON); | 500 | peak_meter_max, NULL, Icon_NOICON); |
501 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, NOICON, | 501 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, |
502 | &peak_meter_clip_hold, &peak_meter_release, | 502 | &peak_meter_clip_hold, &peak_meter_release, |
503 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); | 503 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); |
504 | #endif /* HAVE_LCD_BITMAP */ | 504 | #endif /* HAVE_LCD_BITMAP */ |
@@ -528,13 +528,13 @@ static int browse_folder(void *param) | |||
528 | 528 | ||
529 | #ifdef HAVE_LCD_BITMAP | 529 | #ifdef HAVE_LCD_BITMAP |
530 | MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), | 530 | MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), |
531 | browse_folder, (void*)&fonts, NULL, NOICON); | 531 | browse_folder, (void*)&fonts, NULL, Icon_NOICON); |
532 | #endif | 532 | #endif |
533 | MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), | 533 | MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), |
534 | browse_folder, (void*)&wps, NULL, NOICON); | 534 | browse_folder, (void*)&wps, NULL, Icon_NOICON); |
535 | #ifdef HAVE_REMOTE_LCD | 535 | #ifdef HAVE_REMOTE_LCD |
536 | MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), | 536 | MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), |
537 | browse_folder, (void*)&rwps, NULL, NOICON); | 537 | browse_folder, (void*)&rwps, NULL, Icon_NOICON); |
538 | #endif | 538 | #endif |
539 | 539 | ||
540 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); | 540 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); |
@@ -542,7 +542,7 @@ MENUITEM_SETTING(codepage_setting, &global_settings.default_codepage, NULL); | |||
542 | 542 | ||
543 | 543 | ||
544 | MAKE_MENU(display_menu, ID2P(LANG_DISPLAY), | 544 | MAKE_MENU(display_menu, ID2P(LANG_DISPLAY), |
545 | NULL, bitmap_icons_6x8[Icon_Display_menu], | 545 | NULL, Icon_Display_menu, |
546 | #ifdef HAVE_LCD_BITMAP | 546 | #ifdef HAVE_LCD_BITMAP |
547 | &browse_fonts, | 547 | &browse_fonts, |
548 | #endif | 548 | #endif |
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index 25ab170169..65b17a73c9 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -144,21 +144,21 @@ MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback) | |||
144 | 144 | ||
145 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_0, do_option, (void*)&gain_0, NULL, | 145 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_0, do_option, (void*)&gain_0, NULL, |
146 | gainitem_get_name, | 146 | gainitem_get_name, |
147 | &global_settings.eq_band0_cutoff, NOICON); | 147 | &global_settings.eq_band0_cutoff, Icon_NOICON); |
148 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_1, do_option, (void*)&gain_1, NULL, | 148 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_1, do_option, (void*)&gain_1, NULL, |
149 | gainitem_get_name, | 149 | gainitem_get_name, |
150 | &global_settings.eq_band1_cutoff, NOICON); | 150 | &global_settings.eq_band1_cutoff, Icon_NOICON); |
151 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_2, do_option, (void*)&gain_2, NULL, | 151 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_2, do_option, (void*)&gain_2, NULL, |
152 | gainitem_get_name, | 152 | gainitem_get_name, |
153 | &global_settings.eq_band2_cutoff, NOICON); | 153 | &global_settings.eq_band2_cutoff, Icon_NOICON); |
154 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_3, do_option, (void*)&gain_3, NULL, | 154 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_3, do_option, (void*)&gain_3, NULL, |
155 | gainitem_get_name, | 155 | gainitem_get_name, |
156 | &global_settings.eq_band3_cutoff, NOICON); | 156 | &global_settings.eq_band3_cutoff, Icon_NOICON); |
157 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_4, do_option, (void*)&gain_4, NULL, | 157 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(gain_item_4, do_option, (void*)&gain_4, NULL, |
158 | gainitem_get_name, | 158 | gainitem_get_name, |
159 | &global_settings.eq_band4_cutoff, NOICON); | 159 | &global_settings.eq_band4_cutoff, Icon_NOICON); |
160 | 160 | ||
161 | MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, NOICON, &gain_item_0, | 161 | MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, |
162 | &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4); | 162 | &gain_item_1, &gain_item_2, &gain_item_3, &gain_item_4); |
163 | 163 | ||
164 | static const struct menu_item_ex *band_items[3][3] = { | 164 | static const struct menu_item_ex *band_items[3][3] = { |
@@ -183,7 +183,7 @@ int do_center_band_menu(void* param) | |||
183 | cb_and_desc.menu_callback = NULL; | 183 | cb_and_desc.menu_callback = NULL; |
184 | snprintf(desc, MAX_PATH, str(LANG_EQUALIZER_BAND_PEAK), band); | 184 | snprintf(desc, MAX_PATH, str(LANG_EQUALIZER_BAND_PEAK), band); |
185 | cb_and_desc.desc = desc; | 185 | cb_and_desc.desc = desc; |
186 | cb_and_desc.icon = bitmap_icons_6x8[Icon_EQ]; | 186 | cb_and_desc.icon_id = Icon_EQ; |
187 | menu.flags = MT_MENU|(3<<MENU_COUNT_SHIFT)|MENU_HAS_DESC; | 187 | menu.flags = MT_MENU|(3<<MENU_COUNT_SHIFT)|MENU_HAS_DESC; |
188 | menu.submenus = band_items[band-1]; | 188 | menu.submenus = band_items[band-1]; |
189 | menu.callback_and_desc = &cb_and_desc; | 189 | menu.callback_and_desc = &cb_and_desc; |
@@ -191,17 +191,17 @@ int do_center_band_menu(void* param) | |||
191 | return 0; | 191 | return 0; |
192 | } | 192 | } |
193 | MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, | 193 | MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, |
194 | bitmap_icons_6x8[Icon_EQ], &cutoff_0, &q_0, &gain_0); | 194 | Icon_EQ, &cutoff_0, &q_0, &gain_0); |
195 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_1_menu, do_center_band_menu, (void*)1, NULL, | 195 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_1_menu, do_center_band_menu, (void*)1, NULL, |
196 | centerband_get_name, (void*)1, bitmap_icons_6x8[Icon_EQ]); | 196 | centerband_get_name, (void*)1, Icon_EQ); |
197 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_2_menu, do_center_band_menu, (void*)2, NULL, | 197 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_2_menu, do_center_band_menu, (void*)2, NULL, |
198 | centerband_get_name, (void*)2, bitmap_icons_6x8[Icon_EQ]); | 198 | centerband_get_name, (void*)2, Icon_EQ); |
199 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_3_menu, do_center_band_menu, (void*)3, NULL, | 199 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(band_3_menu, do_center_band_menu, (void*)3, NULL, |
200 | centerband_get_name, (void*)3, bitmap_icons_6x8[Icon_EQ]); | 200 | centerband_get_name, (void*)3, Icon_EQ); |
201 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, | 201 | MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, |
202 | bitmap_icons_6x8[Icon_EQ], &cutoff_4, &q_4, &gain_4); | 202 | Icon_EQ, &cutoff_4, &q_4, &gain_4); |
203 | 203 | ||
204 | MAKE_MENU(advanced_eq_menu_, ID2P(LANG_EQUALIZER_ADVANCED), NULL, bitmap_icons_6x8[Icon_EQ], | 204 | MAKE_MENU(advanced_eq_menu_, ID2P(LANG_EQUALIZER_ADVANCED), NULL, Icon_EQ, |
205 | &band_0_menu, &band_1_menu, &band_2_menu, &band_3_menu, &band_4_menu); | 205 | &band_0_menu, &band_1_menu, &band_2_menu, &band_3_menu, &band_4_menu); |
206 | 206 | ||
207 | 207 | ||
@@ -627,13 +627,13 @@ bool eq_browse_presets(void) | |||
627 | 627 | ||
628 | MENUITEM_FUNCTION(eq_graphical, ID2P(LANG_EQUALIZER_GRAPHICAL), | 628 | MENUITEM_FUNCTION(eq_graphical, ID2P(LANG_EQUALIZER_GRAPHICAL), |
629 | (int(*)(void))eq_menu_graphical, NULL, | 629 | (int(*)(void))eq_menu_graphical, NULL, |
630 | bitmap_icons_6x8[Icon_EQ]); | 630 | Icon_EQ); |
631 | MENUITEM_FUNCTION(eq_save, ID2P(LANG_EQUALIZER_SAVE), | 631 | MENUITEM_FUNCTION(eq_save, ID2P(LANG_EQUALIZER_SAVE), |
632 | (int(*)(void))eq_save_preset, NULL, NOICON); | 632 | (int(*)(void))eq_save_preset, NULL, Icon_NOICON); |
633 | MENUITEM_FUNCTION(eq_browse, ID2P(LANG_EQUALIZER_BROWSE), | 633 | MENUITEM_FUNCTION(eq_browse, ID2P(LANG_EQUALIZER_BROWSE), |
634 | (int(*)(void))eq_browse_presets, NULL, NOICON); | 634 | (int(*)(void))eq_browse_presets, NULL, Icon_NOICON); |
635 | 635 | ||
636 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, bitmap_icons_6x8[Icon_EQ], | 636 | MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ, |
637 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, | 637 | &eq_enable, &eq_graphical, &eq_precut, &gain_menu, |
638 | &advanced_eq_menu_, &eq_save, &eq_browse); | 638 | &advanced_eq_menu_, &eq_save, &eq_browse); |
639 | 639 | ||
@@ -753,33 +753,33 @@ MENUITEM_SETTING(hw_eq_enable, &global_settings.eq_hw_enabled, hweq_enable_callb | |||
753 | 753 | ||
754 | MENUITEM_SETTING(hw_eq_cutoff_0, &global_settings.eq_hw_band0_cutoff, band0_callback); | 754 | MENUITEM_SETTING(hw_eq_cutoff_0, &global_settings.eq_hw_band0_cutoff, band0_callback); |
755 | MENUITEM_SETTING(hw_eq_gain_0, &global_settings.eq_hw_band0_gain, band0_callback); | 755 | MENUITEM_SETTING(hw_eq_gain_0, &global_settings.eq_hw_band0_gain, band0_callback); |
756 | MAKE_MENU(hw_eq_band0, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, NOICON, | 756 | MAKE_MENU(hw_eq_band0, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, Icon_NOICON, |
757 | &hw_eq_cutoff_0, &hw_eq_gain_0); | 757 | &hw_eq_cutoff_0, &hw_eq_gain_0); |
758 | 758 | ||
759 | MENUITEM_SETTING(hw_eq_cutoff_1, &global_settings.eq_hw_band1_center, band1_callback); | 759 | MENUITEM_SETTING(hw_eq_cutoff_1, &global_settings.eq_hw_band1_center, band1_callback); |
760 | MENUITEM_SETTING(hw_eq_bandwidth_1, &global_settings.eq_hw_band1_bandwidth, band1_callback); | 760 | MENUITEM_SETTING(hw_eq_bandwidth_1, &global_settings.eq_hw_band1_bandwidth, band1_callback); |
761 | MENUITEM_SETTING(hw_eq_gain_1, &global_settings.eq_hw_band1_gain, band1_callback); | 761 | MENUITEM_SETTING(hw_eq_gain_1, &global_settings.eq_hw_band1_gain, band1_callback); |
762 | MAKE_MENU(hw_eq_band1, "Peak Filter 1", NULL, NOICON, | 762 | MAKE_MENU(hw_eq_band1, "Peak Filter 1", NULL, Icon_NOICON, |
763 | &hw_eq_cutoff_1, &hw_eq_bandwidth_1, &hw_eq_gain_1); | 763 | &hw_eq_cutoff_1, &hw_eq_bandwidth_1, &hw_eq_gain_1); |
764 | 764 | ||
765 | MENUITEM_SETTING(hw_eq_cutoff_2, &global_settings.eq_hw_band2_center, band2_callback); | 765 | MENUITEM_SETTING(hw_eq_cutoff_2, &global_settings.eq_hw_band2_center, band2_callback); |
766 | MENUITEM_SETTING(hw_eq_bandwidth_2, &global_settings.eq_hw_band2_bandwidth, band2_callback); | 766 | MENUITEM_SETTING(hw_eq_bandwidth_2, &global_settings.eq_hw_band2_bandwidth, band2_callback); |
767 | MENUITEM_SETTING(hw_eq_gain_2, &global_settings.eq_hw_band2_gain, band2_callback); | 767 | MENUITEM_SETTING(hw_eq_gain_2, &global_settings.eq_hw_band2_gain, band2_callback); |
768 | MAKE_MENU(hw_eq_band2, "Peak Filter 2", NULL, NOICON, | 768 | MAKE_MENU(hw_eq_band2, "Peak Filter 2", NULL, Icon_NOICON, |
769 | &hw_eq_cutoff_2, &hw_eq_bandwidth_2, &hw_eq_gain_2); | 769 | &hw_eq_cutoff_2, &hw_eq_bandwidth_2, &hw_eq_gain_2); |
770 | 770 | ||
771 | MENUITEM_SETTING(hw_eq_cutoff_3, &global_settings.eq_hw_band3_center, band3_callback); | 771 | MENUITEM_SETTING(hw_eq_cutoff_3, &global_settings.eq_hw_band3_center, band3_callback); |
772 | MENUITEM_SETTING(hw_eq_bandwidth_3, &global_settings.eq_hw_band3_bandwidth, band3_callback); | 772 | MENUITEM_SETTING(hw_eq_bandwidth_3, &global_settings.eq_hw_band3_bandwidth, band3_callback); |
773 | MENUITEM_SETTING(hw_eq_gain_3, &global_settings.eq_hw_band3_gain, band3_callback); | 773 | MENUITEM_SETTING(hw_eq_gain_3, &global_settings.eq_hw_band3_gain, band3_callback); |
774 | MAKE_MENU(hw_eq_band3, "Peak Filter 3", NULL, NOICON, | 774 | MAKE_MENU(hw_eq_band3, "Peak Filter 3", NULL, Icon_NOICON, |
775 | &hw_eq_cutoff_3, &hw_eq_bandwidth_3, &hw_eq_gain_3); | 775 | &hw_eq_cutoff_3, &hw_eq_bandwidth_3, &hw_eq_gain_3); |
776 | 776 | ||
777 | MENUITEM_SETTING(hw_eq_cutoff_4, &global_settings.eq_hw_band4_cutoff, band4_callback); | 777 | MENUITEM_SETTING(hw_eq_cutoff_4, &global_settings.eq_hw_band4_cutoff, band4_callback); |
778 | MENUITEM_SETTING(hw_eq_gain_4, &global_settings.eq_hw_band4_gain, band4_callback); | 778 | MENUITEM_SETTING(hw_eq_gain_4, &global_settings.eq_hw_band4_gain, band4_callback); |
779 | MAKE_MENU(hw_eq_band4, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, NOICON, | 779 | MAKE_MENU(hw_eq_band4, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, Icon_NOICON, |
780 | &hw_eq_cutoff_4, &hw_eq_gain_4); | 780 | &hw_eq_cutoff_4, &hw_eq_gain_4); |
781 | 781 | ||
782 | MAKE_MENU(hw_eq_menu, ID2P(LANG_EQUALIZER_HARDWARE), NULL, bitmap_icons_6x8[Icon_EQ], | 782 | MAKE_MENU(hw_eq_menu, ID2P(LANG_EQUALIZER_HARDWARE), NULL, Icon_EQ, |
783 | &hw_eq_enable, &hw_eq_band0, &hw_eq_band1, | 783 | &hw_eq_enable, &hw_eq_band0, &hw_eq_band1, |
784 | &hw_eq_band2, &hw_eq_band3, &hw_eq_band4); | 784 | &hw_eq_band2, &hw_eq_band3, &hw_eq_band4); |
785 | 785 | ||
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index cdcd81c4b5..0e7e7f7bc2 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -96,14 +96,14 @@ static int write_settings_file(void* param) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | MENUITEM_FUNCTION_WPARAM(browse_configs, ID2P(LANG_CUSTOM_CFG), | 98 | MENUITEM_FUNCTION_WPARAM(browse_configs, ID2P(LANG_CUSTOM_CFG), |
99 | browse_folder, (void*)&config, NULL, NOICON); | 99 | browse_folder, (void*)&config, NULL, Icon_NOICON); |
100 | MENUITEM_FUNCTION_WPARAM(save_settings_item, ID2P(LANG_SAVE_SETTINGS), | 100 | MENUITEM_FUNCTION_WPARAM(save_settings_item, ID2P(LANG_SAVE_SETTINGS), |
101 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, NOICON); | 101 | write_settings_file, (void*)SETTINGS_SAVE_ALL, NULL, Icon_NOICON); |
102 | MENUITEM_FUNCTION_WPARAM(save_theme_item, ID2P(LANG_SAVE_THEME), | 102 | MENUITEM_FUNCTION_WPARAM(save_theme_item, ID2P(LANG_SAVE_THEME), |
103 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, NOICON); | 103 | write_settings_file, (void*)SETTINGS_SAVE_THEME, NULL, Icon_NOICON); |
104 | MENUITEM_FUNCTION(reset_settings_item,ID2P(LANG_RESET),reset_settings, NULL, NOICON); | 104 | MENUITEM_FUNCTION(reset_settings_item,ID2P(LANG_RESET),reset_settings, NULL, Icon_NOICON); |
105 | 105 | ||
106 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, bitmap_icons_6x8[Icon_Config], | 106 | MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, |
107 | &browse_configs, &reset_settings_item, | 107 | &browse_configs, &reset_settings_item, |
108 | &save_settings_item, &save_theme_item); | 108 | &save_settings_item, &save_theme_item); |
109 | /* MANAGE SETTINGS MENU */ | 109 | /* MANAGE SETTINGS MENU */ |
@@ -340,7 +340,7 @@ static bool show_info(void) | |||
340 | return false; | 340 | return false; |
341 | } | 341 | } |
342 | MENUITEM_FUNCTION(show_info_item, ID2P(LANG_INFO_MENU), | 342 | MENUITEM_FUNCTION(show_info_item, ID2P(LANG_INFO_MENU), |
343 | (menu_function)show_info, NULL, NOICON); | 343 | (menu_function)show_info, NULL, Icon_NOICON); |
344 | 344 | ||
345 | 345 | ||
346 | /* sleep Menu */ | 346 | /* sleep Menu */ |
@@ -373,24 +373,24 @@ static int sleep_timer(void) | |||
373 | } | 373 | } |
374 | 374 | ||
375 | MENUITEM_FUNCTION(sleep_timer_call, ID2P(LANG_SLEEP_TIMER), sleep_timer, | 375 | MENUITEM_FUNCTION(sleep_timer_call, ID2P(LANG_SLEEP_TIMER), sleep_timer, |
376 | NULL, bitmap_icons_6x8[Icon_Menu_setting]); /* make it look like a | 376 | NULL, Icon_Menu_setting); /* make it look like a |
377 | setting to the user */ | 377 | setting to the user */ |
378 | MENUITEM_FUNCTION(show_credits_item, ID2P(LANG_VERSION), | 378 | MENUITEM_FUNCTION(show_credits_item, ID2P(LANG_VERSION), |
379 | (menu_function)show_credits, NULL, NOICON); | 379 | (menu_function)show_credits, NULL, Icon_NOICON); |
380 | MENUITEM_FUNCTION(show_runtime_item, ID2P(LANG_RUNNING_TIME), | 380 | MENUITEM_FUNCTION(show_runtime_item, ID2P(LANG_RUNNING_TIME), |
381 | (menu_function)view_runtime, NULL, NOICON); | 381 | (menu_function)view_runtime, NULL, Icon_NOICON); |
382 | MENUITEM_FUNCTION(debug_menu_item, ID2P(LANG_DEBUG), | 382 | MENUITEM_FUNCTION(debug_menu_item, ID2P(LANG_DEBUG), |
383 | (menu_function)debug_menu, NULL, NOICON); | 383 | (menu_function)debug_menu, NULL, Icon_NOICON); |
384 | #ifdef SIMULATOR | 384 | #ifdef SIMULATOR |
385 | MENUITEM_FUNCTION(simulate_usb_item, ID2P(LANG_USB), | 385 | MENUITEM_FUNCTION(simulate_usb_item, ID2P(LANG_USB), |
386 | (menu_function)simulate_usb, NULL, NOICON); | 386 | (menu_function)simulate_usb, NULL, Icon_NOICON); |
387 | #ifdef ROCKBOX_HAS_LOGF | 387 | #ifdef ROCKBOX_HAS_LOGF |
388 | MENUITEM_FUNCTION(logfdisplay_item, "logf",(int (*)(void)) logfdisplay, NULL, NOICON); | 388 | MENUITEM_FUNCTION(logfdisplay_item, "logf",(int (*)(void)) logfdisplay, NULL, Icon_NOICON); |
389 | MENUITEM_FUNCTION(logfdump_item, "logfdump",(int (*)(void)) logfdump, NULL, NOICON); | 389 | MENUITEM_FUNCTION(logfdump_item, "logfdump",(int (*)(void)) logfdump, NULL, Icon_NOICON); |
390 | #endif | 390 | #endif |
391 | #endif | 391 | #endif |
392 | 392 | ||
393 | MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, bitmap_icons_6x8[Icon_Questionmark], | 393 | MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, Icon_Questionmark, |
394 | &show_info_item, &show_credits_item, &show_runtime_item, | 394 | &show_info_item, &show_credits_item, &show_runtime_item, |
395 | &sleep_timer_call, &debug_menu_item | 395 | &sleep_timer_call, &debug_menu_item |
396 | #ifdef SIMULATOR | 396 | #ifdef SIMULATOR |
@@ -407,7 +407,7 @@ MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, bitmap_icons_6x8[Icon_Questionmark], | |||
407 | /* MAIN MENU */ | 407 | /* MAIN MENU */ |
408 | 408 | ||
409 | MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), | 409 | MENUITEM_FUNCTION_WPARAM(browse_themes, ID2P(LANG_CUSTOM_THEME), |
410 | browse_folder, (void*)&theme, NULL, bitmap_icons_6x8[Icon_Folder]); | 410 | browse_folder, (void*)&theme, NULL, Icon_Folder); |
411 | 411 | ||
412 | #ifdef HAVE_LCD_CHARCELLS | 412 | #ifdef HAVE_LCD_CHARCELLS |
413 | int mainmenu_callback(int action,const struct menu_item_ex *this_item) | 413 | int mainmenu_callback(int action,const struct menu_item_ex *this_item) |
@@ -428,7 +428,7 @@ int mainmenu_callback(int action,const struct menu_item_ex *this_item) | |||
428 | #define mainmenu_callback NULL | 428 | #define mainmenu_callback NULL |
429 | #endif | 429 | #endif |
430 | MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS_MENU), mainmenu_callback, | 430 | MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS_MENU), mainmenu_callback, |
431 | bitmap_icons_6x8[Icon_Submenu_Entered], | 431 | Icon_Submenu_Entered, |
432 | &sound_settings, | 432 | &sound_settings, |
433 | &settings_menu_item, &manage_settings, &browse_themes, | 433 | &settings_menu_item, &manage_settings, &browse_themes, |
434 | #ifdef HAVE_RECORDING | 434 | #ifdef HAVE_RECORDING |
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); | |||
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, NOICON, | 63 | MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_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, NOICON, | 98 | MAKE_MENU(crossfade_settings_menu,ID2P(LANG_CROSSFADE),0, Icon_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, NOICON, | 120 | MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON, |
121 | &replaygain,&replaygain_noclip, | 121 | &replaygain,&replaygain_noclip, |
122 | &replaygain_type,&replaygain_preamp); | 122 | &replaygain_type,&replaygain_preamp); |
123 | 123 | ||
@@ -165,12 +165,12 @@ MENUITEM_SETTING(cuesheet, &global_settings.cuesheet, cuesheet_callback); | |||
165 | MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL); | 165 | MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL); |
166 | MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL); | 166 | MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL); |
167 | MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL); | 167 | MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL); |
168 | MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, NOICON, | 168 | MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, Icon_NOICON, |
169 | &unplug_mode, &unplug_rw, &unplug_autoresume); | 169 | &unplug_mode, &unplug_rw, &unplug_autoresume); |
170 | #endif | 170 | #endif |
171 | 171 | ||
172 | MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, | 172 | MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, |
173 | bitmap_icons_6x8[Icon_Playback_menu], | 173 | Icon_Playback_menu, |
174 | &shuffle_item, &repeat_mode, &play_selected, | 174 | &shuffle_item, &repeat_mode, &play_selected, |
175 | &ff_rewind_settings_menu, | 175 | &ff_rewind_settings_menu, |
176 | &buffer_margin, &fade_on_stop, &party_mode, | 176 | &buffer_margin, &fade_on_stop, &party_mode, |
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) | |||
63 | return 0; | 63 | return 0; |
64 | } | 64 | } |
65 | MENUITEM_FUNCTION(create_playlist_item, ID2P(LANG_CREATE_PLAYLIST), | 65 | MENUITEM_FUNCTION(create_playlist_item, ID2P(LANG_CREATE_PLAYLIST), |
66 | (int(*)(void))create_playlist, NULL, NOICON); | 66 | (int(*)(void))create_playlist, NULL, Icon_NOICON); |
67 | MENUITEM_FUNCTION(view_playlist, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 67 | MENUITEM_FUNCTION(view_playlist, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), |
68 | (int(*)(void))playlist_viewer, NULL, NOICON); | 68 | (int(*)(void))playlist_viewer, NULL, Icon_NOICON); |
69 | MENUITEM_FUNCTION_WPARAM(save_playlist, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 69 | MENUITEM_FUNCTION_WPARAM(save_playlist, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
70 | (int(*)(void*))save_playlist_screen, NULL, NULL, NOICON); | 70 | (int(*)(void*))save_playlist_screen, NULL, NULL, Icon_NOICON); |
71 | MENUITEM_FUNCTION(catalog, ID2P(LANG_CATALOG), | 71 | MENUITEM_FUNCTION(catalog, ID2P(LANG_CATALOG), |
72 | (int(*)(void))catalog_view_playlists, NULL, NOICON); | 72 | (int(*)(void))catalog_view_playlists, NULL, Icon_NOICON); |
73 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); | 73 | MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL); |
74 | MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); | 74 | MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL); |
75 | 75 | ||
76 | MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLIST_MENU), NULL, | 76 | MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLIST_MENU), NULL, |
77 | bitmap_icons_6x8[Icon_Playlist], | 77 | Icon_Playlist, |
78 | &recursive_dir_insert, &warn_on_erase); | 78 | &recursive_dir_insert, &warn_on_erase); |
79 | MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL, | 79 | MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL, |
80 | bitmap_icons_6x8[Icon_Playlist], | 80 | Icon_Playlist, |
81 | &create_playlist_item, &view_playlist, &save_playlist, &catalog); | 81 | &create_playlist_item, &view_playlist, &save_playlist, &catalog); |
82 | 82 | ||
83 | bool playlist_menu(void) | 83 | bool playlist_menu(void) |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 028b57bb99..248cf1655a 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -32,5 +32,5 @@ | |||
32 | /* TEMP */ | 32 | /* TEMP */ |
33 | bool recording_menu(bool no_source); /* from apps/sound_menu.h */ | 33 | bool recording_menu(bool no_source); /* from apps/sound_menu.h */ |
34 | MENUITEM_FUNCTION_WPARAM(recording_settings, ID2P(LANG_RECORDING_SETTINGS), | 34 | MENUITEM_FUNCTION_WPARAM(recording_settings, ID2P(LANG_RECORDING_SETTINGS), |
35 | (int (*)(void*))recording_menu,0, NULL, NOICON); | 35 | (int (*)(void*))recording_menu,0, NULL, Icon_NOICON); |
36 | #endif | 36 | #endif |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 8caa5fd8b0..690f9e62e4 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -47,15 +47,15 @@ MENUITEM_SETTING(tagcache_ram, &global_settings.tagcache_ram, NULL); | |||
47 | #endif | 47 | #endif |
48 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); | 48 | MENUITEM_SETTING(tagcache_autoupdate, &global_settings.tagcache_autoupdate, NULL); |
49 | MENUITEM_FUNCTION(tc_init, ID2P(LANG_TAGCACHE_FORCE_UPDATE), | 49 | MENUITEM_FUNCTION(tc_init, ID2P(LANG_TAGCACHE_FORCE_UPDATE), |
50 | (int(*)(void))tagcache_rebuild, NULL, NOICON); | 50 | (int(*)(void))tagcache_rebuild, NULL, Icon_NOICON); |
51 | MENUITEM_FUNCTION(tc_update, ID2P(LANG_TAGCACHE_UPDATE), | 51 | MENUITEM_FUNCTION(tc_update, ID2P(LANG_TAGCACHE_UPDATE), |
52 | (int(*)(void))tagcache_update, NULL, NOICON); | 52 | (int(*)(void))tagcache_update, NULL, Icon_NOICON); |
53 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); | 53 | MENUITEM_SETTING(runtimedb, &global_settings.runtimedb, NULL); |
54 | MENUITEM_FUNCTION(tc_export, ID2P(LANG_TAGCACHE_EXPORT), | 54 | MENUITEM_FUNCTION(tc_export, ID2P(LANG_TAGCACHE_EXPORT), |
55 | (int(*)(void))tagtree_export, NULL, NOICON); | 55 | (int(*)(void))tagtree_export, NULL, Icon_NOICON); |
56 | MENUITEM_FUNCTION(tc_import, ID2P(LANG_TAGCACHE_IMPORT), | 56 | MENUITEM_FUNCTION(tc_import, ID2P(LANG_TAGCACHE_IMPORT), |
57 | (int(*)(void))tagtree_import, NULL, NOICON); | 57 | (int(*)(void))tagtree_import, NULL, Icon_NOICON); |
58 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, NOICON, | 58 | MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON, |
59 | #ifdef HAVE_TC_RAMCACHE | 59 | #ifdef HAVE_TC_RAMCACHE |
60 | &tagcache_ram, | 60 | &tagcache_ram, |
61 | #endif | 61 | #endif |
@@ -91,7 +91,7 @@ static int fileview_callback(int action,const struct menu_item_ex *this_item) | |||
91 | return action; | 91 | return action; |
92 | } | 92 | } |
93 | 93 | ||
94 | MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, bitmap_icons_6x8[Icon_file_view_menu], | 94 | MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, |
95 | &sort_case, &sort_dir, &sort_file, | 95 | &sort_case, &sort_dir, &sort_file, |
96 | &dirfilter, &browse_current, &show_path_in_browser); | 96 | &dirfilter, &browse_current, &show_path_in_browser); |
97 | /* FILE VIEW MENU */ | 97 | /* FILE VIEW MENU */ |
@@ -121,7 +121,7 @@ static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | |||
121 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); | 121 | MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callback); |
122 | #endif | 122 | #endif |
123 | #endif | 123 | #endif |
124 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, NOICON, | 124 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, |
125 | &battery_capacity, | 125 | &battery_capacity, |
126 | #if BATTERY_TYPES_COUNT > 1 | 126 | #if BATTERY_TYPES_COUNT > 1 |
127 | &battery_type, | 127 | &battery_type, |
@@ -160,7 +160,7 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item) | |||
160 | } | 160 | } |
161 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); | 161 | MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback); |
162 | #endif | 162 | #endif |
163 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, NOICON, | 163 | MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, |
164 | &disk_spindown, | 164 | &disk_spindown, |
165 | #ifdef HAVE_DIRCACHE | 165 | #ifdef HAVE_DIRCACHE |
166 | &dircache, | 166 | &dircache, |
@@ -200,9 +200,9 @@ static int timedate_set(void) | |||
200 | return result; | 200 | return result; |
201 | } | 201 | } |
202 | 202 | ||
203 | MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, NOICON); | 203 | MENUITEM_FUNCTION(time_set, ID2P(LANG_TIME), timedate_set, NULL, Icon_NOICON); |
204 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); | 204 | MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL); |
205 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, NOICON, &time_set, &timeformat); | 205 | MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat); |
206 | #endif | 206 | #endif |
207 | 207 | ||
208 | /* System menu */ | 208 | /* System menu */ |
@@ -210,13 +210,13 @@ MENUITEM_SETTING(poweroff, &global_settings.poweroff, NULL); | |||
210 | 210 | ||
211 | #ifdef HAVE_RTC_ALARM | 211 | #ifdef HAVE_RTC_ALARM |
212 | MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), | 212 | MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), |
213 | (menu_function)alarm_screen, NULL, NOICON); | 213 | (menu_function)alarm_screen, NULL, Icon_NOICON); |
214 | #endif | 214 | #endif |
215 | 215 | ||
216 | /* Limits menu */ | 216 | /* Limits menu */ |
217 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); | 217 | MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); |
218 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); | 218 | MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); |
219 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, NOICON, | 219 | MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, |
220 | &max_files_in_dir, &max_files_in_playlist); | 220 | &max_files_in_dir, &max_files_in_playlist); |
221 | 221 | ||
222 | #if CONFIG_CODEC == MAS3507D | 222 | #if CONFIG_CODEC == MAS3507D |
@@ -242,7 +242,7 @@ MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | |||
242 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 242 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
243 | 243 | ||
244 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | 244 | MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), |
245 | 0, bitmap_icons_6x8[Icon_System_menu], | 245 | 0, Icon_System_menu, |
246 | &start_screen, | 246 | &start_screen, |
247 | #ifndef SIMULATOR | 247 | #ifndef SIMULATOR |
248 | &battery_menu, | 248 | &battery_menu, |
@@ -294,7 +294,7 @@ MENUITEM_SETTING(autocreatebookmark, | |||
294 | MENUITEM_SETTING(autoloadbookmark, &global_settings.autoloadbookmark, NULL); | 294 | MENUITEM_SETTING(autoloadbookmark, &global_settings.autoloadbookmark, NULL); |
295 | MENUITEM_SETTING(usemrb, &global_settings.usemrb, NULL); | 295 | MENUITEM_SETTING(usemrb, &global_settings.usemrb, NULL); |
296 | MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0, | 296 | MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0, |
297 | bitmap_icons_6x8[Icon_Bookmark], | 297 | Icon_Bookmark, |
298 | &autocreatebookmark, &autoloadbookmark, &usemrb); | 298 | &autocreatebookmark, &autoloadbookmark, &usemrb); |
299 | /* BOOKMARK MENU */ | 299 | /* BOOKMARK MENU */ |
300 | /***********************************/ | 300 | /***********************************/ |
@@ -328,7 +328,7 @@ static int talk_callback(int action,const struct menu_item_ex *this_item) | |||
328 | } | 328 | } |
329 | return action; | 329 | return action; |
330 | } | 330 | } |
331 | MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, bitmap_icons_6x8[Icon_Voice], | 331 | MAKE_MENU(voice_settings_menu, ID2P(LANG_VOICE), 0, Icon_Voice, |
332 | &talk_menu, &talk_dir, &talk_file_item); | 332 | &talk_menu, &talk_dir, &talk_file_item); |
333 | /* VOICE MENU */ | 333 | /* VOICE MENU */ |
334 | /***********************************/ | 334 | /***********************************/ |
@@ -340,10 +340,10 @@ static int language_browse(void) | |||
340 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); | 340 | return (int)rockbox_browse(LANG_DIR, SHOW_LNG); |
341 | } | 341 | } |
342 | MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse, | 342 | MENUITEM_FUNCTION(browse_langs, ID2P(LANG_LANGUAGE), language_browse, |
343 | NULL, bitmap_icons_6x8[Icon_Language]); | 343 | NULL, Icon_Language); |
344 | 344 | ||
345 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, | 345 | MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, |
346 | bitmap_icons_6x8[Icon_General_settings_menu], | 346 | Icon_General_settings_menu, |
347 | &playback_menu_item, &playlist_settings, &file_menu, | 347 | &playback_menu_item, &playlist_settings, &file_menu, |
348 | #ifdef HAVE_TAGCACHE | 348 | #ifdef HAVE_TAGCACHE |
349 | &tagcache_menu, | 349 | &tagcache_menu, |
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c index 1fa8ec6d02..4efc36bdf2 100644 --- a/apps/menus/sound_menu.c +++ b/apps/menus/sound_menu.c | |||
@@ -72,7 +72,7 @@ MENUITEM_SETTING(stereo_width, &global_settings.stereo_width, soundmenu_callback | |||
72 | &global_settings.crossfeed_hf_attenuation, soundmenu_callback); | 72 | &global_settings.crossfeed_hf_attenuation, soundmenu_callback); |
73 | MENUITEM_SETTING(crossfeed_hf_cutoff, | 73 | MENUITEM_SETTING(crossfeed_hf_cutoff, |
74 | &global_settings.crossfeed_hf_cutoff, soundmenu_callback); | 74 | &global_settings.crossfeed_hf_cutoff, soundmenu_callback); |
75 | MAKE_MENU(crossfeed_menu,ID2P(LANG_CROSSFEED), NULL, NOICON, | 75 | MAKE_MENU(crossfeed_menu,ID2P(LANG_CROSSFEED), NULL, Icon_NOICON, |
76 | &crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain, | 76 | &crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain, |
77 | &crossfeed_hf_attenuation, &crossfeed_hf_cutoff); | 77 | &crossfeed_hf_attenuation, &crossfeed_hf_cutoff); |
78 | 78 | ||
@@ -93,7 +93,7 @@ MENUITEM_SETTING(stereo_width, &global_settings.stereo_width, soundmenu_callback | |||
93 | 93 | ||
94 | 94 | ||
95 | 95 | ||
96 | MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, bitmap_icons_6x8[Icon_Audio], | 96 | MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio, |
97 | &volume, | 97 | &volume, |
98 | &bass,&treble, | 98 | &bass,&treble, |
99 | &balance,&channel_config,&stereo_width | 99 | &balance,&channel_config,&stereo_width |
diff --git a/apps/player/icons.h b/apps/player/icons.h index 89aa5f7984..32a6adf75a 100644 --- a/apps/player/icons.h +++ b/apps/player/icons.h | |||
@@ -43,6 +43,32 @@ enum { | |||
43 | Icon_Config, | 43 | Icon_Config, |
44 | }; | 44 | }; |
45 | 45 | ||
46 | /* put icons from the 6x8 enum here if the player | ||
47 | doesnt have an icon for it */ | ||
48 | enum unused_but_needed { | ||
49 | Icon_Cursor, | ||
50 | Icon_Font, | ||
51 | Icon_Preset, | ||
52 | Icon_Keyboard, | ||
53 | Icon_Reverse_Cursor, | ||
54 | Icon_Questionmark, | ||
55 | Icon_Menu_setting, | ||
56 | Icon_Menu_functioncall, | ||
57 | Icon_Submenu, | ||
58 | Icon_Submenu_Entered, | ||
59 | Icon_Recording, | ||
60 | Icon_Voice, | ||
61 | Icon_General_settings_menu, | ||
62 | Icon_System_menu, | ||
63 | Icon_Playback_menu, | ||
64 | Icon_Display_menu, | ||
65 | Icon_Remote_Display_menu, | ||
66 | Icon_Radio_screen, | ||
67 | Icon_file_view_menu, | ||
68 | Icon_EQ, | ||
69 | Icon_Rockbox, | ||
70 | Icon6x8Last, | ||
71 | }; | ||
46 | #endif | 72 | #endif |
47 | 73 | ||
48 | #endif /* _ICONS_H_ */ | 74 | #endif /* _ICONS_H_ */ |
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 3503e73f6d..7b1d69de1b 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -49,6 +49,8 @@ enum icons_5x8 { | |||
49 | Icon5x8Last | 49 | Icon5x8Last |
50 | }; | 50 | }; |
51 | 51 | ||
52 | /* If any icons are added to this enum, they must be | ||
53 | added to the unused_but_needed enum in ../player/icons.h */ | ||
52 | enum icons_6x8 { | 54 | enum icons_6x8 { |
53 | Icon_Audio, | 55 | Icon_Audio, |
54 | Icon_Folder, | 56 | Icon_Folder, |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index f15a10f329..636f74f9d5 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1206,9 +1206,9 @@ static int clear_preset_list(void) | |||
1206 | } | 1206 | } |
1207 | 1207 | ||
1208 | MENUITEM_FUNCTION(radio_edit_preset_item, ID2P(LANG_FM_EDIT_PRESET), | 1208 | MENUITEM_FUNCTION(radio_edit_preset_item, ID2P(LANG_FM_EDIT_PRESET), |
1209 | radio_edit_preset, NULL, NOICON); | 1209 | radio_edit_preset, NULL, Icon_NOICON); |
1210 | MENUITEM_FUNCTION(radio_delete_preset_item, ID2P(LANG_FM_DELETE_PRESET), | 1210 | MENUITEM_FUNCTION(radio_delete_preset_item, ID2P(LANG_FM_DELETE_PRESET), |
1211 | radio_delete_preset, NULL, NOICON); | 1211 | radio_delete_preset, NULL, Icon_NOICON); |
1212 | int radio_preset_callback(int action, const struct menu_item_ex *this_item) | 1212 | int radio_preset_callback(int action, const struct menu_item_ex *this_item) |
1213 | { | 1213 | { |
1214 | (void)this_item; | 1214 | (void)this_item; |
@@ -1217,7 +1217,7 @@ int radio_preset_callback(int action, const struct menu_item_ex *this_item) | |||
1217 | return action; | 1217 | return action; |
1218 | } | 1218 | } |
1219 | MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_FM_BUTTONBAR_PRESETS), | 1219 | MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_FM_BUTTONBAR_PRESETS), |
1220 | radio_preset_callback, NOICON, &radio_edit_preset_item, | 1220 | radio_preset_callback, Icon_NOICON, &radio_edit_preset_item, |
1221 | &radio_delete_preset_item); | 1221 | &radio_delete_preset_item); |
1222 | /* present a list of preset stations */ | 1222 | /* present a list of preset stations */ |
1223 | char * presets_get_name(int selected_item, void * data, char *buffer) | 1223 | char * presets_get_name(int selected_item, void * data, char *buffer) |
@@ -1335,7 +1335,7 @@ static int toggle_radio_mode(void* param) | |||
1335 | return 0; | 1335 | return 0; |
1336 | } | 1336 | } |
1337 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(radio_mode_item, toggle_radio_mode, NULL, NULL, | 1337 | MENUITEM_FUNCTION_WPARAM_DYNTEXT(radio_mode_item, toggle_radio_mode, NULL, NULL, |
1338 | get_mode_text, NULL, NOICON); | 1338 | get_mode_text, NULL, Icon_NOICON); |
1339 | #endif | 1339 | #endif |
1340 | 1340 | ||
1341 | static int scan_presets(void) | 1341 | static int scan_presets(void) |
@@ -1434,7 +1434,7 @@ static int fm_recording_screen(void) | |||
1434 | return ret; | 1434 | return ret; |
1435 | } | 1435 | } |
1436 | MENUITEM_FUNCTION(recscreen_item, ID2P(LANG_RECORDING_MENU), | 1436 | MENUITEM_FUNCTION(recscreen_item, ID2P(LANG_RECORDING_MENU), |
1437 | fm_recording_screen, NULL, NOICON); | 1437 | fm_recording_screen, NULL, Icon_NOICON); |
1438 | #endif /* defined(HAVE_FMRADIO_IN) && CONFIG_CODEC == SWCODEC */ | 1438 | #endif /* defined(HAVE_FMRADIO_IN) && CONFIG_CODEC == SWCODEC */ |
1439 | 1439 | ||
1440 | #if defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC | 1440 | #if defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC |
@@ -1456,31 +1456,31 @@ static int fm_recording_settings(void) | |||
1456 | return ret; | 1456 | return ret; |
1457 | } | 1457 | } |
1458 | MENUITEM_FUNCTION(recsettings_item, ID2P(LANG_RECORDING_SETTINGS), | 1458 | MENUITEM_FUNCTION(recsettings_item, ID2P(LANG_RECORDING_SETTINGS), |
1459 | fm_recording_settings, NULL, NOICON); | 1459 | fm_recording_settings, NULL, Icon_NOICON); |
1460 | #endif /* defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC */ | 1460 | #endif /* defined(HAVE_FMRADIO_IN) || CONFIG_CODEC != SWCODEC */ |
1461 | #endif /* HAVE_RECORDING */ | 1461 | #endif /* HAVE_RECORDING */ |
1462 | #endif /* SIMULATOR */ | 1462 | #endif /* SIMULATOR */ |
1463 | #ifndef FM_PRESET | 1463 | #ifndef FM_PRESET |
1464 | MENUITEM_FUNCTION(radio_presets_item, ID2P(LANG_FM_BUTTONBAR_PRESETS), | 1464 | MENUITEM_FUNCTION(radio_presets_item, ID2P(LANG_FM_BUTTONBAR_PRESETS), |
1465 | handle_radio_presets, NULL, NOICON); | 1465 | handle_radio_presets, NULL, Icon_NOICON); |
1466 | #endif | 1466 | #endif |
1467 | #ifndef FM_PRESET_ADD | 1467 | #ifndef FM_PRESET_ADD |
1468 | MENUITEM_FUNCTION(radio_addpreset_item, ID2P(LANG_FM_ADD_PRESET), | 1468 | MENUITEM_FUNCTION(radio_addpreset_item, ID2P(LANG_FM_ADD_PRESET), |
1469 | radio_add_preset, NULL, NOICON); | 1469 | radio_add_preset, NULL, Icon_NOICON); |
1470 | #endif | 1470 | #endif |
1471 | 1471 | ||
1472 | 1472 | ||
1473 | MENUITEM_FUNCTION(presetload_item, ID2P(LANG_FM_PRESET_LOAD), | 1473 | MENUITEM_FUNCTION(presetload_item, ID2P(LANG_FM_PRESET_LOAD), |
1474 | load_preset_list, NULL, NOICON); | 1474 | load_preset_list, NULL, Icon_NOICON); |
1475 | MENUITEM_FUNCTION(presetsave_item, ID2P(LANG_FM_PRESET_SAVE), | 1475 | MENUITEM_FUNCTION(presetsave_item, ID2P(LANG_FM_PRESET_SAVE), |
1476 | save_preset_list, NULL, NOICON); | 1476 | save_preset_list, NULL, Icon_NOICON); |
1477 | MENUITEM_FUNCTION(presetclear_item, ID2P(LANG_FM_PRESET_CLEAR), | 1477 | MENUITEM_FUNCTION(presetclear_item, ID2P(LANG_FM_PRESET_CLEAR), |
1478 | clear_preset_list, NULL, NOICON); | 1478 | clear_preset_list, NULL, Icon_NOICON); |
1479 | MENUITEM_FUNCTION(scan_presets_item, ID2P(LANG_FM_SCAN_PRESETS), | 1479 | MENUITEM_FUNCTION(scan_presets_item, ID2P(LANG_FM_SCAN_PRESETS), |
1480 | scan_presets, NULL, NOICON); | 1480 | scan_presets, NULL, Icon_NOICON); |
1481 | 1481 | ||
1482 | MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, | 1482 | MAKE_MENU(radio_menu_items, ID2P(LANG_FM_MENU), NULL, |
1483 | bitmap_icons_6x8[Icon_Radio_screen], | 1483 | Icon_Radio_screen, |
1484 | #ifndef FM_PRESET | 1484 | #ifndef FM_PRESET |
1485 | &radio_presets_item, | 1485 | &radio_presets_item, |
1486 | #endif | 1486 | #endif |
diff --git a/apps/root_menu.c b/apps/root_menu.c index 604349e6e9..270fbb0669 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -224,11 +224,11 @@ static void check_boot(void) | |||
224 | int item_callback(int action, const struct menu_item_ex *this_item) ; | 224 | int item_callback(int action, const struct menu_item_ex *this_item) ; |
225 | 225 | ||
226 | MENUITEM_RETURNVALUE(file_browser, ID2P(LANG_DIR_BROWSER), GO_TO_FILEBROWSER, | 226 | MENUITEM_RETURNVALUE(file_browser, ID2P(LANG_DIR_BROWSER), GO_TO_FILEBROWSER, |
227 | NULL, bitmap_icons_6x8[Icon_file_view_menu]); | 227 | NULL, Icon_file_view_menu); |
228 | MENUITEM_RETURNVALUE(db_browser, ID2P(LANG_TAGCACHE), GO_TO_DBBROWSER, | 228 | MENUITEM_RETURNVALUE(db_browser, ID2P(LANG_TAGCACHE), GO_TO_DBBROWSER, |
229 | NULL, bitmap_icons_6x8[Icon_Audio]); | 229 | NULL, Icon_Audio); |
230 | MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS, | 230 | MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS, |
231 | NULL, bitmap_icons_6x8[Icon_Plugin]); | 231 | NULL, Icon_Plugin); |
232 | char *get_wps_item_name(int selected_item, void * data, char *buffer) | 232 | char *get_wps_item_name(int selected_item, void * data, char *buffer) |
233 | { | 233 | { |
234 | (void)selected_item; (void)data; (void)buffer; | 234 | (void)selected_item; (void)data; (void)buffer; |
@@ -237,30 +237,30 @@ char *get_wps_item_name(int selected_item, void * data, char *buffer) | |||
237 | return str(LANG_RESUME_PLAYBACK); | 237 | return str(LANG_RESUME_PLAYBACK); |
238 | } | 238 | } |
239 | MENUITEM_RETURNVALUE_DYNTEXT(wps_item, GO_TO_WPS, NULL, get_wps_item_name, | 239 | MENUITEM_RETURNVALUE_DYNTEXT(wps_item, GO_TO_WPS, NULL, get_wps_item_name, |
240 | NULL, bitmap_icons_6x8[Icon_Playback_menu]); | 240 | NULL, Icon_Playback_menu); |
241 | #ifdef HAVE_RECORDING | 241 | #ifdef HAVE_RECORDING |
242 | MENUITEM_RETURNVALUE(rec, ID2P(LANG_RECORDING_MENU), GO_TO_RECSCREEN, | 242 | MENUITEM_RETURNVALUE(rec, ID2P(LANG_RECORDING_MENU), GO_TO_RECSCREEN, |
243 | NULL, bitmap_icons_6x8[Icon_Recording]); | 243 | NULL, Icon_Recording); |
244 | #endif | 244 | #endif |
245 | #if CONFIG_TUNER | 245 | #if CONFIG_TUNER |
246 | MENUITEM_RETURNVALUE(fm, ID2P(LANG_FM_RADIO), GO_TO_FM, | 246 | MENUITEM_RETURNVALUE(fm, ID2P(LANG_FM_RADIO), GO_TO_FM, |
247 | item_callback, bitmap_icons_6x8[Icon_Radio_screen]); | 247 | item_callback, Icon_Radio_screen); |
248 | #endif | 248 | #endif |
249 | MENUITEM_RETURNVALUE(menu_, ID2P(LANG_SETTINGS_MENU), GO_TO_MAINMENU, | 249 | MENUITEM_RETURNVALUE(menu_, ID2P(LANG_SETTINGS_MENU), GO_TO_MAINMENU, |
250 | NULL, bitmap_icons_6x8[Icon_Submenu_Entered]); | 250 | NULL, Icon_Submenu_Entered); |
251 | MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), | 251 | MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS), |
252 | GO_TO_RECENTBMARKS, item_callback, | 252 | GO_TO_RECENTBMARKS, item_callback, |
253 | bitmap_icons_6x8[Icon_Bookmark]); | 253 | Icon_Bookmark); |
254 | #ifdef HAVE_LCD_CHARCELLS | 254 | #ifdef HAVE_LCD_CHARCELLS |
255 | static int do_shutdown(void) | 255 | static int do_shutdown(void) |
256 | { | 256 | { |
257 | sys_poweroff(); | 257 | sys_poweroff(); |
258 | return 0; | 258 | return 0; |
259 | } | 259 | } |
260 | MENUITEM_FUNCTION(do_shutdown_item, ID2P(LANG_SHUTDOWN), do_shutdown, NULL, NOICON); | 260 | MENUITEM_FUNCTION(do_shutdown_item, ID2P(LANG_SHUTDOWN), do_shutdown, NULL, Icon_NOICON); |
261 | #endif | 261 | #endif |
262 | MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE), | 262 | MAKE_MENU(root_menu_, ID2P(LANG_ROCKBOX_TITLE), |
263 | NULL, bitmap_icons_6x8[Icon_Rockbox], | 263 | NULL, Icon_Rockbox, |
264 | &bookmarks, &file_browser, &db_browser, | 264 | &bookmarks, &file_browser, &db_browser, |
265 | &wps_item, &menu_, | 265 | &wps_item, &menu_, |
266 | #ifdef HAVE_RECORDING | 266 | #ifdef HAVE_RECORDING |