diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-04 00:44:34 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-04 00:44:34 +0000 |
| commit | 94eef3fbee4aa178015d22f271acb343e2533acd (patch) | |
| tree | a8db2fe9719d28825b47958db3c9c0cd8d120435 /apps | |
| parent | 169ebdbda7d805e83de06cd013759e6281d5db34 (diff) | |
fix beep and peak meter settings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12576 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -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) } return action; } +MENUITEM_SETTING(peak_meter_hold, + &global_settings.peak_meter_hold, peakmeter_callback); MENUITEM_SETTING(peak_meter_clip_hold, &global_settings.peak_meter_clip_hold, peakmeter_callback); @@ -502,8 +504,9 @@ MENUITEM_FUNCTION(peak_meter_min_item, ID2P(LANG_PM_MIN), peak_meter_min, NULL, Icon_NOICON); MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), peak_meter_max, NULL, Icon_NOICON); -MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, - &peak_meter_clip_hold, &peak_meter_release, +MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, + &peak_meter_release, &peak_meter_hold, + &peak_meter_clip_hold, &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); #endif /* HAVE_LCD_BITMAP */ /* 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[] = { TALK_ID(60, UNIT_SEC), TALK_ID(90, UNIT_SEC), TALK_ID(2, UNIT_MIN), TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN), TALK_ID(20, UNIT_MIN), TALK_ID(45, UNIT_MIN), TALK_ID(90, UNIT_MIN)), - {F_T_INT,&global_settings.peak_meter_hold, LANG_PM_PEAK_HOLD, - INT(3),"peak meter hold", - "off,200ms,300ms,500ms,1,2,3,4,5,6,7,8,9,10,15,20,30,1min",UNUSED}, + STRINGCHOICE_SETTING(0, peak_meter_hold, LANG_PM_PEAK_HOLD, 3, + "peak meter hold", + "off,200ms,300ms,500ms,1,2,3,4,5,6,7,8,9,10,15,20,30,1min", + NULL, 18, LANG_OFF, + TALK_ID(200, UNIT_MS), TALK_ID(300, UNIT_MS), TALK_ID(500, UNIT_MS), + TALK_ID(1, UNIT_SEC), TALK_ID(2, UNIT_SEC), TALK_ID(3, UNIT_SEC), + TALK_ID(4, UNIT_SEC), TALK_ID(5, UNIT_SEC), TALK_ID(6, UNIT_SEC), + TALK_ID(7, UNIT_SEC), TALK_ID(8, UNIT_SEC), TALK_ID(9, UNIT_SEC), + TALK_ID(10, UNIT_SEC), TALK_ID(15, UNIT_SEC), TALK_ID(20, UNIT_SEC), + TALK_ID(30, UNIT_SEC), TALK_ID(60, UNIT_SEC)), INT_SETTING(0, peak_meter_release, LANG_PM_RELEASE, 8, "peak meter release", LANG_PM_UNITS_PER_READ, 1, 0x7e1, 1, NULL, NULL,NULL), OFFON_SETTING(0,peak_meter_dbfs,LANG_PM_DBFS,true,"peak meter dbfs",NULL), @@ -808,7 +815,7 @@ const struct settings_list settings[] = { UNIT_DB, -120, 120, 5, replaygain_preamp_format, NULL, NULL), CHOICE_SETTING(0, beep, LANG_BEEP, 0, - "beep", "off,weak,moderate,strong", NULL, 3, + "beep", "off,weak,moderate,strong", NULL, 4, ID2P(LANG_OFF), ID2P(LANG_WEAK), ID2P(LANG_MODERATE), ID2P(LANG_STRONG)), /* crossfade */ |