diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 20:07:17 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 20:07:17 +0000 |
commit | 99a0598c284471342fcda1fdcba90d4b666bfbb3 (patch) | |
tree | 83cc502095e87277de770456498d2de6cf8f473b /apps/settings_menu.c | |
parent | 89a8ca4408c3ea34464898b0ce52a0d8351fa323 (diff) | |
download | rockbox-99a0598c284471342fcda1fdcba90d4b666bfbb3.tar.gz rockbox-99a0598c284471342fcda1fdcba90d4b666bfbb3.zip |
Major peakmeter rework: * Changed set/get functions for dbfs mode to bool type. * Removed performance setting, leaving (slightly adapted) high performance mode only. * Refresh rate is always 20 Hz now. * Readout doesn't do an extra (hidden) peek, should allow for slightly better clip detection. * Brought back high performance peakmeter for recording. Peakmeter stops hogging the CPU when the disk is spinning; this is enough to avoid the performance problem when saving data. * Optimisations, code cleanup and code policeing. * (iriver) Reduced CPU load of peakmeter by not calculating excessive overlaps. ** Bumped config block version, so save your settings before upgrading.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7415 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r-- | apps/settings_menu.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 9f7259620e..bbbeca3683 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -318,16 +318,6 @@ static bool volume_type(void) | |||
318 | INT, names, 2, NULL); | 318 | INT, names, 2, NULL); |
319 | } | 319 | } |
320 | 320 | ||
321 | #ifdef PM_DEBUG | ||
322 | static bool peak_meter_fps_menu(void) { | ||
323 | bool retval = false; | ||
324 | retval = set_int( "Refresh rate", "/s", UNIT_PER_SEC, | ||
325 | &peak_meter_fps, | ||
326 | NULL, 1, 5, 40, NULL); | ||
327 | return retval; | ||
328 | } | ||
329 | #endif /* PM_DEBUG */ | ||
330 | |||
331 | /** | 321 | /** |
332 | * Menu to set the hold time of normal peaks. | 322 | * Menu to set the hold time of normal peaks. |
333 | */ | 323 | */ |
@@ -545,25 +535,6 @@ static bool peak_meter_max(void) { | |||
545 | } | 535 | } |
546 | 536 | ||
547 | /** | 537 | /** |
548 | * Menu to select wether the meter is in | ||
549 | * precision or in energy saver mode | ||
550 | */ | ||
551 | static bool peak_meter_performance(void) { | ||
552 | bool retval = false; | ||
553 | retval = set_bool_options(str(LANG_PM_PERFORMANCE), | ||
554 | &global_settings.peak_meter_performance, | ||
555 | STR(LANG_PM_HIGH_PERFORMANCE), STR(LANG_PM_ENERGY_SAVER), | ||
556 | NULL); | ||
557 | |||
558 | if (global_settings.peak_meter_performance) { | ||
559 | peak_meter_fps = 25; | ||
560 | } else { | ||
561 | peak_meter_fps = 20; | ||
562 | } | ||
563 | return retval; | ||
564 | } | ||
565 | |||
566 | /** | ||
567 | * Menu to configure the peak meter | 538 | * Menu to configure the peak meter |
568 | */ | 539 | */ |
569 | static bool peak_meter_menu(void) | 540 | static bool peak_meter_menu(void) |
@@ -575,10 +546,6 @@ static bool peak_meter_menu(void) | |||
575 | { ID2P(LANG_PM_RELEASE) , peak_meter_release }, | 546 | { ID2P(LANG_PM_RELEASE) , peak_meter_release }, |
576 | { ID2P(LANG_PM_PEAK_HOLD), peak_meter_hold }, | 547 | { ID2P(LANG_PM_PEAK_HOLD), peak_meter_hold }, |
577 | { ID2P(LANG_PM_CLIP_HOLD), peak_meter_clip_hold }, | 548 | { ID2P(LANG_PM_CLIP_HOLD), peak_meter_clip_hold }, |
578 | { ID2P(LANG_PM_PERFORMANCE), peak_meter_performance }, | ||
579 | #ifdef PM_DEBUG | ||
580 | { "Refresh rate" , -1 , peak_meter_fps_menu }, | ||
581 | #endif | ||
582 | { ID2P(LANG_PM_SCALE) , peak_meter_scale }, | 549 | { ID2P(LANG_PM_SCALE) , peak_meter_scale }, |
583 | { ID2P(LANG_PM_MIN) , peak_meter_min }, | 550 | { ID2P(LANG_PM_MIN) , peak_meter_min }, |
584 | { ID2P(LANG_PM_MAX) , peak_meter_max }, | 551 | { ID2P(LANG_PM_MAX) , peak_meter_max }, |