devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fix beep and peak meter settings

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12576 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-03-04 00:44:34 +00:00
parent 169ebdbda7
commit 94eef3fbee
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/menus/display_menu.c
View file

@ -378,6 +378,8 @@ int peakmeter_callback(int action,const struct menu_item_ex *this_item)
} }
return action; return action;
} }
MENUITEM_SETTING(peak_meter_hold,
&global_settings.peak_meter_hold, peakmeter_callback);
MENUITEM_SETTING(peak_meter_clip_hold, MENUITEM_SETTING(peak_meter_clip_hold,
&global_settings.peak_meter_clip_hold, peakmeter_callback); &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); peak_meter_min, NULL, Icon_NOICON);
MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX), MENUITEM_FUNCTION(peak_meter_max_item, ID2P(LANG_PM_MAX),
peak_meter_max, NULL, Icon_NOICON); peak_meter_max, NULL, Icon_NOICON);
MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON,
&peak_meter_clip_hold, &peak_meter_release, &peak_meter_release, &peak_meter_hold,
&peak_meter_clip_hold,
&peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item);
#endif /* HAVE_LCD_BITMAP */ #endif /* HAVE_LCD_BITMAP */
/* PEAK METER MENU */ /* PEAK METER MENU */

15
apps/settings_list.c
View file

@ -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(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(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)), 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, STRINGCHOICE_SETTING(0, peak_meter_hold, LANG_PM_PEAK_HOLD, 3,
INT(3),"peak meter hold", "peak meter hold",
"off,200ms,300ms,500ms,1,2,3,4,5,6,7,8,9,10,15,20,30,1min",UNUSED}, "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", INT_SETTING(0, peak_meter_release, LANG_PM_RELEASE, 8, "peak meter release",
LANG_PM_UNITS_PER_READ, 1, 0x7e1, 1, NULL, NULL,NULL), 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), 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), UNIT_DB, -120, 120, 5, replaygain_preamp_format, NULL, NULL),
CHOICE_SETTING(0, beep, LANG_BEEP, 0, 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)), ID2P(LANG_OFF), ID2P(LANG_WEAK), ID2P(LANG_MODERATE), ID2P(LANG_STRONG)),
/* crossfade */ /* crossfade */