diff options
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 23915dcfef..3714950223 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -149,7 +149,6 @@ static int set_bg_color(void) | |||
149 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); | 149 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); |
150 | return res; | 150 | return res; |
151 | } | 151 | } |
152 | |||
153 | static int reset_color(void) | 152 | static int reset_color(void) |
154 | { | 153 | { |
155 | global_settings.fg_color = LCD_DEFAULT_FG; | 154 | global_settings.fg_color = LCD_DEFAULT_FG; |
@@ -159,14 +158,14 @@ static int reset_color(void) | |||
159 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); | 158 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); |
160 | return 0; | 159 | return 0; |
161 | } | 160 | } |
162 | MENUITEM_FUNCTION(clear_main_bd, ID2P(LANG_CLEAR_BACKDROP), | 161 | MENUITEM_FUNCTION(clear_main_bd, 0, ID2P(LANG_CLEAR_BACKDROP), |
163 | clear_main_backdrop, NULL, Icon_NOICON); | 162 | clear_main_backdrop, NULL, 0, NULL, Icon_NOICON); |
164 | MENUITEM_FUNCTION(set_bg_col, ID2P(LANG_BACKGROUND_COLOR), | 163 | MENUITEM_FUNCTION(set_bg_col, 0, ID2P(LANG_BACKGROUND_COLOR), |
165 | set_bg_color, NULL, Icon_NOICON); | 164 | set_bg_color, NULL, 0, NULL, Icon_NOICON); |
166 | MENUITEM_FUNCTION(set_fg_col, ID2P(LANG_FOREGROUND_COLOR), | 165 | MENUITEM_FUNCTION(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), |
167 | set_fg_color, NULL, Icon_NOICON); | 166 | set_fg_color, NULL, 0, NULL, Icon_NOICON); |
168 | MENUITEM_FUNCTION(reset_colors, ID2P(LANG_RESET_COLORS), | 167 | MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), |
169 | reset_color, NULL, Icon_NOICON); | 168 | reset_color, NULL, 0, NULL, Icon_NOICON); |
170 | #endif | 169 | #endif |
171 | 170 | ||
172 | /* now the actual menu */ | 171 | /* now the actual menu */ |
@@ -498,12 +497,12 @@ static int peak_meter_max(void) { | |||
498 | settings_apply_pm_range(); | 497 | settings_apply_pm_range(); |
499 | return retval; | 498 | return retval; |
500 | } | 499 | } |
501 | MENUITEM_FUNCTION(peak_meter_scale_item, ID2P(LANG_PM_SCALE), | 500 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), |
502 | peak_meter_scale, NULL, Icon_NOICON); | 501 | peak_meter_scale, NULL, 0, NULL, Icon_NOICON); |
503 | MENUITEM_FUNCTION(peak_meter_min_item, ID2P(LANG_PM_MIN), | 502 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), |
504 | peak_meter_min, NULL, Icon_NOICON); | 503 | peak_meter_min, NULL, 0, NULL, Icon_NOICON); |
505 | MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), | 504 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), |
506 | peak_meter_max, NULL, Icon_NOICON); | 505 | peak_meter_max, NULL, 0, NULL, Icon_NOICON); |
507 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | 506 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, |
508 | &peak_meter_release, &peak_meter_hold, | 507 | &peak_meter_release, &peak_meter_hold, |
509 | &peak_meter_clip_hold, | 508 | &peak_meter_clip_hold, |
@@ -534,14 +533,17 @@ static int browse_folder(void *param) | |||
534 | } | 533 | } |
535 | 534 | ||
536 | #ifdef HAVE_LCD_BITMAP | 535 | #ifdef HAVE_LCD_BITMAP |
537 | MENUITEM_FUNCTION_WPARAM(browse_fonts, ID2P(LANG_CUSTOM_FONT), | 536 | MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, |
538 | browse_folder, (void*)&fonts, NULL, Icon_NOICON); | 537 | ID2P(LANG_CUSTOM_FONT), |
538 | browse_folder, (void*)&fonts, 0, NULL, Icon_NOICON); | ||
539 | #endif | 539 | #endif |
540 | MENUITEM_FUNCTION_WPARAM(browse_wps, ID2P(LANG_WHILE_PLAYING), | 540 | MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, |
541 | browse_folder, (void*)&wps, NULL, Icon_NOICON); | 541 | ID2P(LANG_WHILE_PLAYING), |
542 | browse_folder, (void*)&wps, 0, NULL, Icon_NOICON); | ||
542 | #ifdef HAVE_REMOTE_LCD | 543 | #ifdef HAVE_REMOTE_LCD |
543 | MENUITEM_FUNCTION_WPARAM(browse_rwps, ID2P(LANG_REMOTE_WHILE_PLAYING), | 544 | MENUITEM_FUNCTION(browse_rwps, MENU_FUNC_USEPARAM, |
544 | browse_folder, (void*)&rwps, NULL, Icon_NOICON); | 545 | ID2P(LANG_REMOTE_WHILE_PLAYING), |
546 | browse_folder, (void*)&rwps, 0, NULL, Icon_NOICON); | ||
545 | #endif | 547 | #endif |
546 | 548 | ||
547 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); | 549 | MENUITEM_SETTING(show_icons, &global_settings.show_icons, NULL); |