diff options
-rw-r--r-- | apps/menus/display_menu.c | 7 | ||||
-rw-r--r-- | apps/settings_list.c | 15 |
2 files changed, 16 insertions, 6 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 1cd6f0e246..23915dcfef 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -378,6 +378,8 @@ int peakmeter_callback(int action,const struct menu_item_ex *this_item) | |||
378 | } | 378 | } |
379 | return action; | 379 | return action; |
380 | } | 380 | } |
381 | MENUITEM_SETTING(peak_meter_hold, | ||
382 | &global_settings.peak_meter_hold, peakmeter_callback); | ||
381 | MENUITEM_SETTING(peak_meter_clip_hold, | 383 | MENUITEM_SETTING(peak_meter_clip_hold, |
382 | &global_settings.peak_meter_clip_hold, peakmeter_callback); | 384 | &global_settings.peak_meter_clip_hold, peakmeter_callback); |
383 | 385 | ||
@@ -502,8 +504,9 @@ MENUITEM_FUNCTION(peak_meter_min_item, ID2P(LANG_PM_MIN), | |||
502 | peak_meter_min, NULL, Icon_NOICON); | 504 | peak_meter_min, NULL, Icon_NOICON); |
503 | MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), | 505 | MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), |
504 | peak_meter_max, NULL, Icon_NOICON); | 506 | peak_meter_max, NULL, Icon_NOICON); |
505 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, | 507 | MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, |
506 | &peak_meter_clip_hold, &peak_meter_release, | 508 | &peak_meter_release, &peak_meter_hold, |
509 | &peak_meter_clip_hold, | ||
507 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); | 510 | &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); |
508 | #endif /* HAVE_LCD_BITMAP */ | 511 | #endif /* HAVE_LCD_BITMAP */ |
509 | /* PEAK METER MENU */ | 512 | /* PEAK METER MENU */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index a7e588d48d..40a48ee042 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -659,9 +659,16 @@ const struct settings_list settings[] = { | |||
659 | TALK_ID(60, UNIT_SEC), TALK_ID(90, UNIT_SEC), TALK_ID(2, UNIT_MIN), | 659 | TALK_ID(60, UNIT_SEC), TALK_ID(90, UNIT_SEC), TALK_ID(2, UNIT_MIN), |
660 | TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN), | 660 | TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN), |
661 | TALK_ID(20, UNIT_MIN), TALK_ID(45, UNIT_MIN), TALK_ID(90, UNIT_MIN)), | 661 | TALK_ID(20, UNIT_MIN), TALK_ID(45, UNIT_MIN), TALK_ID(90, UNIT_MIN)), |
662 | {F_T_INT,&global_settings.peak_meter_hold, LANG_PM_PEAK_HOLD, | 662 | STRINGCHOICE_SETTING(0, peak_meter_hold, LANG_PM_PEAK_HOLD, 3, |
663 | INT(3),"peak meter hold", | 663 | "peak meter hold", |
664 | "off,200ms,300ms,500ms,1,2,3,4,5,6,7,8,9,10,15,20,30,1min",UNUSED}, | 664 | "off,200ms,300ms,500ms,1,2,3,4,5,6,7,8,9,10,15,20,30,1min", |
665 | NULL, 18, LANG_OFF, | ||
666 | TALK_ID(200, UNIT_MS), TALK_ID(300, UNIT_MS), TALK_ID(500, UNIT_MS), | ||
667 | TALK_ID(1, UNIT_SEC), TALK_ID(2, UNIT_SEC), TALK_ID(3, UNIT_SEC), | ||
668 | TALK_ID(4, UNIT_SEC), TALK_ID(5, UNIT_SEC), TALK_ID(6, UNIT_SEC), | ||
669 | TALK_ID(7, UNIT_SEC), TALK_ID(8, UNIT_SEC), TALK_ID(9, UNIT_SEC), | ||
670 | TALK_ID(10, UNIT_SEC), TALK_ID(15, UNIT_SEC), TALK_ID(20, UNIT_SEC), | ||
671 | TALK_ID(30, UNIT_SEC), TALK_ID(60, UNIT_SEC)), | ||
665 | INT_SETTING(0, peak_meter_release, LANG_PM_RELEASE, 8, "peak meter release", | 672 | INT_SETTING(0, peak_meter_release, LANG_PM_RELEASE, 8, "peak meter release", |
666 | LANG_PM_UNITS_PER_READ, 1, 0x7e1, 1, NULL, NULL,NULL), | 673 | LANG_PM_UNITS_PER_READ, 1, 0x7e1, 1, NULL, NULL,NULL), |
667 | OFFON_SETTING(0,peak_meter_dbfs,LANG_PM_DBFS,true,"peak meter dbfs",NULL), | 674 | OFFON_SETTING(0,peak_meter_dbfs,LANG_PM_DBFS,true,"peak meter dbfs",NULL), |
@@ -808,7 +815,7 @@ const struct settings_list settings[] = { | |||
808 | UNIT_DB, -120, 120, 5, replaygain_preamp_format, NULL, NULL), | 815 | UNIT_DB, -120, 120, 5, replaygain_preamp_format, NULL, NULL), |
809 | 816 | ||
810 | CHOICE_SETTING(0, beep, LANG_BEEP, 0, | 817 | CHOICE_SETTING(0, beep, LANG_BEEP, 0, |
811 | "beep", "off,weak,moderate,strong", NULL, 3, | 818 | "beep", "off,weak,moderate,strong", NULL, 4, |
812 | ID2P(LANG_OFF), ID2P(LANG_WEAK), ID2P(LANG_MODERATE), ID2P(LANG_STRONG)), | 819 | ID2P(LANG_OFF), ID2P(LANG_WEAK), ID2P(LANG_MODERATE), ID2P(LANG_STRONG)), |
813 | 820 | ||
814 | /* crossfade */ | 821 | /* crossfade */ |