1 files changed, 50 insertions, 21 deletions

diff --git a/apps/eq_menu.c b/apps/eq_menu.c
index 82639a54da..61d38f473c 100644
--- a/apps/eq_menu.c
+++ b/apps/eq_menu.c
@@ -97,14 +97,14 @@
 
 #endif
 
-
+/* Various user interface limits and sizes */
 #define EQ_CUTOFF_MIN        20
 #define EQ_CUTOFF_MAX     22040
 #define EQ_CUTOFF_STEP       10
 #define EQ_CUTOFF_FAST_STEP 100
 #define EQ_GAIN_MIN       (-240)
 #define EQ_GAIN_MAX         240
-#define EQ_GAIN_STEP          1
+#define EQ_GAIN_STEP          5
 #define EQ_GAIN_FAST_STEP    10
 #define EQ_Q_MIN              5
 #define EQ_Q_MAX             64
@@ -113,32 +113,59 @@
 
 #define EQ_USER_DIVISOR      10
 
+/*
+ * Utility functions
+ */
+
+static void eq_gain_format(char* buffer, int buffer_size, int value, const char* unit)
+{
+    int v = abs(value);
+
+    snprintf(buffer, buffer_size, "%s%d.%d %s", value < 0 ? "-" : "",
+        v / EQ_USER_DIVISOR, v % EQ_USER_DIVISOR, unit);
+}
+
+static void eq_q_format(char* buffer, int buffer_size, int value, const char* unit)
+{
+    snprintf(buffer, buffer_size, "%d.%d %s", value / EQ_USER_DIVISOR, value % EQ_USER_DIVISOR, unit);
+}
+
+static void eq_precut_format(char* buffer, int buffer_size, int value, const char* unit)
+{
+    snprintf(buffer, buffer_size, "%s%d.%d %s", value == 0 ? " " : "-",
+        value / EQ_USER_DIVISOR, value % EQ_USER_DIVISOR, unit);
+}
+
+/*
+ * Settings functions
+ */
+
 static bool eq_enabled(void)
 {
     int i;
-    
+
     bool result = set_bool(str(LANG_EQUALIZER_ENABLED),
         &global_settings.eq_enabled);
 
+    dsp_eq_set(global_settings.eq_enabled, global_settings.eq_precut); 
+
     /* Update all bands */
     for(i = 0; i < 5; i++) {
-        dsp_eq_update_data(global_settings.eq_enabled, i);
+        dsp_eq_update_filter_coefs(i);
     }
 
     return result;
 }
 
-static void eq_gain_format(char* buffer, int buffer_size, int value, const char* unit)
+static bool eq_precut(void)
 {
-    int v = abs(value);
+    bool result = set_int(str(LANG_EQUALIZER_PRECUT), str(LANG_UNIT_DB), 
+        UNIT_DB, &global_settings.eq_precut, NULL, 5, 0, 240, 
+        eq_precut_format);
 
-    snprintf(buffer, buffer_size, "%s%d.%d %s", value < 0 ? "-" : "",
-        v / EQ_USER_DIVISOR, v % EQ_USER_DIVISOR, unit);
-}
+    dsp_eq_set(global_settings.eq_enabled, global_settings.eq_precut);
 
-static void eq_q_format(char* buffer, int buffer_size, int value, const char* unit)
-{
-    snprintf(buffer, buffer_size, "%d.%d %s", value / EQ_USER_DIVISOR, value % EQ_USER_DIVISOR, unit);
+    return result;
 }
 
 /* Possibly dodgy way of simplifying the code a bit. */
@@ -148,20 +175,20 @@ static void eq_q_format(char* buffer, int buffer_size, int value, const char* un
 #define eq_set_center(band) \
 static bool eq_set_band ## band ## _center(void) \
 { \
-    bool result = set_int(str(LANG_EQUALIZER_BAND_CENTER), "Hertz", UNIT_HERTZ, \
-        &global_settings.eq_band ## band ## _cutoff, NULL, \
+    bool result = set_int(str(LANG_EQUALIZER_BAND_CENTER), "Hertz", \
+        UNIT_HERTZ, &global_settings.eq_band ## band ## _cutoff, NULL, \
         EQ_CUTOFF_STEP, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, NULL); \
-    dsp_eq_update_data(global_settings.eq_enabled, band); \
+    dsp_eq_update_filter_coefs(band); \
     return result; \
 }
     
 #define eq_set_cutoff(band) \
 static bool eq_set_band ## band ## _cutoff(void) \
 { \
-    bool result = set_int(str(LANG_EQUALIZER_BAND_CUTOFF), "Hertz", UNIT_HERTZ, \
-        &global_settings.eq_band ## band ## _cutoff, NULL, \
+    bool result = set_int(str(LANG_EQUALIZER_BAND_CUTOFF), "Hertz", \
+        UNIT_HERTZ, &global_settings.eq_band ## band ## _cutoff, NULL, \
         EQ_CUTOFF_STEP, EQ_CUTOFF_MIN, EQ_CUTOFF_MAX, NULL); \
-    dsp_eq_update_data(global_settings.eq_enabled, band); \
+    dsp_eq_update_filter_coefs(band); \
     return result; \
 }
 
@@ -171,7 +198,7 @@ static bool eq_set_band ## band ## _q(void) \
     bool result = set_int(str(LANG_EQUALIZER_BAND_Q), "Q", UNIT_INT, \
         &global_settings.eq_band ## band ## _q, NULL, \
         EQ_Q_STEP, EQ_Q_MIN, EQ_Q_MAX, eq_q_format); \
-    dsp_eq_update_data(global_settings.eq_enabled, band); \
+    dsp_eq_update_filter_coefs(band); \
     return result; \
 }
 
@@ -181,7 +208,7 @@ static bool eq_set_band ## band ## _gain(void) \
     bool result = set_int("Band " #band, str(LANG_UNIT_DB), UNIT_DB, \
         &global_settings.eq_band ## band ## _gain, NULL, \
         EQ_GAIN_STEP, EQ_GAIN_MIN, EQ_GAIN_MAX, eq_gain_format); \
-    dsp_eq_update_data(global_settings.eq_enabled, band); \
+    dsp_eq_update_filter_coefs(band); \
     return result; \
 }
 
@@ -666,7 +693,7 @@ bool eq_menu_graphical(void)
         
         /* Update the filter if the user changed something */
         if (has_changed) {
-            dsp_eq_update_data(global_settings.eq_enabled, current_band);
+            dsp_eq_update_filter_coefs(current_band);
             has_changed = false;
         }
     }
@@ -706,6 +733,7 @@ static bool eq_save_preset(void)
 
     /* TODO: Should we really do this? */
     fdprintf(fd, "eq enabled: on\r\n");
+    fdprintf(fd, "eq precut: %d\r\n", global_settings.eq_precut);
     
     setting = &global_settings.eq_band0_cutoff;
     
@@ -737,6 +765,7 @@ bool eq_menu(void)
     static const struct menu_item items[] = {
         { ID2P(LANG_EQUALIZER_ENABLED), eq_enabled },
         { ID2P(LANG_EQUALIZER_GRAPHICAL), eq_menu_graphical },
+        { ID2P(LANG_EQUALIZER_PRECUT), eq_precut },
         { ID2P(LANG_EQUALIZER_GAIN), eq_gain_menu },
         { ID2P(LANG_EQUALIZER_ADVANCED), eq_advanced_menu },
         { ID2P(LANG_EQUALIZER_SAVE), eq_save_preset },