Make the histogram code usable for playback as well. Move the recording histogram code to peakmeter, rename it to remove the recording reference, and rename anything referring to it as well. Change the drawing code so there are more options to position them. This may change your histogram settings, so check after upgrading.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29969 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 0 insertions, 23 deletions

diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 8eaeab699c..ae237b1b4a 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -392,26 +392,6 @@ MENUITEM_FUNCTION(agc_cliptime, 0, ID2P(LANG_RECORDING_AGC_CLIPTIME),
                     agc_cliptime_func, NULL, NULL, Icon_Menu_setting);
 #endif /* HAVE_AGC */
 
-#if defined(HAVE_RECORDING_HISTOGRAM)
-static bool history_interval(void)
-{
-    static const struct opt_items names[] = {
-        { "0s", TALK_ID(0, UNIT_SEC) },
-        { "1s", TALK_ID(1, UNIT_SEC) },
-        { "2s", TALK_ID(2, UNIT_SEC) },
-        { "4s", TALK_ID(4, UNIT_SEC) }
-    };
-    return set_option(str(LANG_RECORDING_HISTOGRAM_INTERVAL),
-                          &global_settings.rec_histogram_interval,
-                          INT, names, 4, NULL );
-}
-
-MENUITEM_FUNCTION(recording_histogram, 0,
-                  ID2P(LANG_RECORDING_HISTOGRAM_INTERVAL),
-                  history_interval, NULL, NULL, Icon_Menu_setting);
-
-#endif
-
 /** Rec trigger **/
 enum trigger_menu_option
 {
@@ -666,9 +646,6 @@ MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS),
 #ifdef HAVE_AGC
             &agc_preset, &agc_cliptime,
 #endif
-#if defined(HAVE_RECORDING_HISTOGRAM)
-            &recording_histogram,
-#endif
 #ifdef HAVE_LCD_BITMAP
             &peak_meter_menu,
 #endif