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

1 files changed, 0 insertions, 33 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 9f72596..bbbeca3 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -318,16 +318,6 @@ static bool volume_type(void)
                        INT, names, 2, NULL);
 }
 
-#ifdef PM_DEBUG
-static bool peak_meter_fps_menu(void) {
-    bool retval = false;
-    retval = set_int( "Refresh rate", "/s", UNIT_PER_SEC,
-             &peak_meter_fps,
-             NULL, 1, 5, 40, NULL);
-    return retval;
-}
-#endif /* PM_DEBUG */
-
 /**
  * Menu to set the hold time of normal peaks.
  */
@@ -545,25 +535,6 @@ static bool peak_meter_max(void) {
 }
 
 /**
- * Menu to select wether the meter is in
- * precision or in energy saver mode
- */
-static bool peak_meter_performance(void) {
-    bool retval = false;
-    retval = set_bool_options(str(LANG_PM_PERFORMANCE), 
-        &global_settings.peak_meter_performance, 
-        STR(LANG_PM_HIGH_PERFORMANCE), STR(LANG_PM_ENERGY_SAVER),
-        NULL);
-
-    if (global_settings.peak_meter_performance) {
-        peak_meter_fps = 25;
-    } else {
-        peak_meter_fps = 20;
-    }
-    return retval;
-}
-
-/**
  * Menu to configure the peak meter
  */
 static bool peak_meter_menu(void) 
@@ -575,10 +546,6 @@ static bool peak_meter_menu(void)
         { ID2P(LANG_PM_RELEASE)  , peak_meter_release   },  
         { ID2P(LANG_PM_PEAK_HOLD), peak_meter_hold      },  
         { ID2P(LANG_PM_CLIP_HOLD), peak_meter_clip_hold },
-        { ID2P(LANG_PM_PERFORMANCE), peak_meter_performance },
-#ifdef PM_DEBUG
-        { "Refresh rate" , -1    , peak_meter_fps_menu  },
-#endif
         { ID2P(LANG_PM_SCALE)    , peak_meter_scale     },
         { ID2P(LANG_PM_MIN)      , peak_meter_min       },
         { ID2P(LANG_PM_MAX)      , peak_meter_max       },