diff options
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index d7993fdbda..e70c4ee98a 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -168,8 +168,8 @@ MENUITEM_SETTING(bl_selective_actions, | |||
168 | selectivebacklight_callback); | 168 | selectivebacklight_callback); |
169 | 169 | ||
170 | MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), | 170 | MENUITEM_FUNCTION(sel_backlight_mask, 0, ID2P(LANG_SETTINGS), |
171 | selectivebacklight_set_mask, NULL, | 171 | selectivebacklight_set_mask, selectivebacklight_callback, |
172 | selectivebacklight_callback, Icon_Menu_setting); | 172 | Icon_Menu_setting); |
173 | 173 | ||
174 | MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), | 174 | MAKE_MENU(sel_backlight, ID2P(LANG_BACKLIGHT_SELECTIVE), |
175 | NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); | 175 | NULL, Icon_Menu_setting, &bl_selective_actions, &sel_backlight_mask); |
@@ -520,18 +520,17 @@ static bool history_interval(void) | |||
520 | INT, names, 4, NULL ); | 520 | INT, names, 4, NULL ); |
521 | } | 521 | } |
522 | 522 | ||
523 | MENUITEM_FUNCTION(histogram, 0, | 523 | MENUITEM_FUNCTION(histogram, 0, ID2P(LANG_HISTOGRAM_INTERVAL), |
524 | ID2P(LANG_HISTOGRAM_INTERVAL), | 524 | history_interval, NULL, Icon_Menu_setting); |
525 | history_interval, NULL, NULL, Icon_Menu_setting); | ||
526 | 525 | ||
527 | #endif | 526 | #endif |
528 | 527 | ||
529 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), | 528 | MENUITEM_FUNCTION(peak_meter_scale_item, 0, ID2P(LANG_PM_SCALE), |
530 | peak_meter_scale, NULL, NULL, Icon_NOICON); | 529 | peak_meter_scale, NULL, Icon_NOICON); |
531 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), | 530 | MENUITEM_FUNCTION(peak_meter_min_item, 0, ID2P(LANG_PM_MIN), |
532 | peak_meter_min, NULL, NULL, Icon_NOICON); | 531 | peak_meter_min, NULL, Icon_NOICON); |
533 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), | 532 | MENUITEM_FUNCTION(peak_meter_max_item, 0, ID2P(LANG_PM_MAX), |
534 | peak_meter_max, NULL, NULL, Icon_NOICON); | 533 | peak_meter_max, NULL, Icon_NOICON); |
535 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | 534 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, |
536 | &peak_meter_release, &peak_meter_hold, | 535 | &peak_meter_release, &peak_meter_hold, |
537 | &peak_meter_clip_hold, | 536 | &peak_meter_clip_hold, |
@@ -575,10 +574,11 @@ static int line_padding_callback(int action, | |||
575 | 574 | ||
576 | MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); | 575 | MENUITEM_SETTING(touch_mode, &global_settings.touch_mode, touch_mode_callback); |
577 | 576 | ||
578 | MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, | 577 | MENUITEM_FUNCTION(touchscreen_menu_calibrate, 0, |
579 | NULL, NULL, Icon_NOICON); | 578 | ID2P(LANG_TOUCHSCREEN_CALIBRATE), calibrate, NULL, Icon_NOICON); |
580 | MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), reset_mapping, | 579 | MENUITEM_FUNCTION(touchscreen_menu_reset_calibration, 0, |
581 | NULL, NULL, Icon_NOICON); | 580 | ID2P(LANG_TOUCHSCREEN_RESET_CALIBRATION), |
581 | reset_mapping, NULL, Icon_NOICON); | ||
582 | MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); | 582 | MENUITEM_SETTING(list_line_padding, &global_settings.list_line_padding, line_padding_callback); |
583 | 583 | ||
584 | MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode, | 584 | MAKE_MENU(touchscreen_menu, ID2P(LANG_TOUCHSCREEN_SETTINGS), NULL, Icon_NOICON, &list_line_padding, &touch_mode, |