EQ settings: Rework the settings to clean up the config file.

Instead of 3 cfg lines per eq band there is now a single line
for each:
<config name>: <cutoff/center freq>, <q>, <gain>

In addition, the config value names make a bit more sense.

The old settings are still readable but config.cfg and any new
settings files will be written with the new config values. (The
old settings will be removed completly sometime after the next
stable release).

Also a slight rework of the advanced EQ menu UI

Change-Id: I9008658d36ded442a5f2f825916df42a3934cbef
Reviewed-on: http://gerrit.rockbox.org/394
Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>

24 files changed, 231 insertions, 694 deletions

diff --git a/lib/rbcodec/dsp/eq.h b/lib/rbcodec/dsp/eq.h
index 9b670d748a..9bb5f91ca5 100644
--- a/lib/rbcodec/dsp/eq.h
+++ b/lib/rbcodec/dsp/eq.h
@@ -21,10 +21,7 @@
 #ifndef _EQ_H
 #define _EQ_H
 
-/* => support from 3 to 32 bands, inclusive
- * Menus and screens must be updated to support changing this from 5
- * without modifying other stuff (remove comment when this is no longer
- * true :-) */
+/* => support from 3 to 32 bands */
 #define EQ_NUM_BANDS 10
 
 struct eq_band_setting
diff --git a/lib/rbcodec/dsp/eqs/Acoustic.cfg b/lib/rbcodec/dsp/eqs/Acoustic.cfg
index fd30094119..72dbc48ae3 100644
--- a/lib/rbcodec/dsp/eqs/Acoustic.cfg
+++ b/lib/rbcodec/dsp/eqs/Acoustic.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 45
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 45
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 45
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 10
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 10
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 15
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 15
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 30
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 30
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 20
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 20
+eq low shelf filter: 32, 7, 45
+eq peak filter 1: 64, 10, 45
+eq peak filter 2: 125, 10, 10
+eq peak filter 3: 250, 10, 10
+eq peak filter 4: 500, 10, 15
+eq peak filter 5: 1000, 10, 15
+eq peak filter 6: 2000, 10, 30
+eq peak filter 7: 4000, 10, 30
+eq peak filter 8: 8000, 10, 20
+eq high shelf filter: 16000, 7, 20
diff --git a/lib/rbcodec/dsp/eqs/Bass.cfg b/lib/rbcodec/dsp/eqs/Bass.cfg
index 3f122f1343..162874ef94 100644
--- a/lib/rbcodec/dsp/eqs/Bass.cfg
+++ b/lib/rbcodec/dsp/eqs/Bass.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 50
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 50
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 50
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 35
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 35
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 15
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 15
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 5
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 5
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: -5
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: -5
+eq low shelf filter: 32, 7, 50
+eq peak filter 1: 64, 10, 50
+eq peak filter 2: 125, 10, 35
+eq peak filter 3: 250, 10, 35
+eq peak filter 4: 500, 10, 15
+eq peak filter 5: 1000, 10, 15
+eq peak filter 6: 2000, 10, 5
+eq peak filter 7: 4000, 10, 5
+eq peak filter 8: 8000, 10, -5
+eq high shelf filter: 16000, 7, -5
diff --git a/lib/rbcodec/dsp/eqs/Classical.cfg b/lib/rbcodec/dsp/eqs/Classical.cfg
index ba95adb4f8..956cb1ecd1 100644
--- a/lib/rbcodec/dsp/eqs/Classical.cfg
+++ b/lib/rbcodec/dsp/eqs/Classical.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 0
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 0
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 0
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 0
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 0
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 0
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 0
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 0
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: -70
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: -70
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: -70
+eq low shelf filter: 32, 7, 0
+eq peak filter 1: 64, 10, 0
+eq peak filter 2: 125, 10, 0
+eq peak filter 3: 250, 10, 0
+eq peak filter 4: 500, 10, 0
+eq peak filter 5: 1000, 10, 0
+eq peak filter 6: 2000, 10, 0
+eq peak filter 7: 4000, 10, -70
+eq peak filter 8: 8000, 10, -70
+eq high shelf filter: 16000, 7, -70
diff --git a/lib/rbcodec/dsp/eqs/Club.cfg b/lib/rbcodec/dsp/eqs/Club.cfg
index 5e20ca2fe7..f9c350298f 100644
--- a/lib/rbcodec/dsp/eqs/Club.cfg
+++ b/lib/rbcodec/dsp/eqs/Club.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 80
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 0
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 0
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 80
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 55
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 55
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 55
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 30
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 0
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 0
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 0
+eq low shelf filter: 32, 7, 0
+eq peak filter 1: 64, 10, 0
+eq peak filter 2: 125, 10, 80
+eq peak filter 3: 250, 10, 55
+eq peak filter 4: 500, 10, 55
+eq peak filter 5: 1000, 10, 55
+eq peak filter 6: 2000, 10, 30
+eq peak filter 7: 4000, 10, 0
+eq peak filter 8: 8000, 10, 0
+eq high shelf filter: 16000, 7, 0
diff --git a/lib/rbcodec/dsp/eqs/Dance.cfg b/lib/rbcodec/dsp/eqs/Dance.cfg
index 6c262924f2..b387245aae 100644
--- a/lib/rbcodec/dsp/eqs/Dance.cfg
+++ b/lib/rbcodec/dsp/eqs/Dance.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 95
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 95
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 70
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 25
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 0
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 0
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: -55
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: -70
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: -70
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 0
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 0
+eq low shelf filter: 32, 7, 95
+eq peak filter 1: 64, 10, 70
+eq peak filter 2: 125, 10, 25
+eq peak filter 3: 250, 10, 0
+eq peak filter 4: 500, 10, 0
+eq peak filter 5: 1000, 10, -55
+eq peak filter 6: 2000, 10, -70
+eq peak filter 7: 4000, 10, -70
+eq peak filter 8: 8000, 10, 0
+eq high shelf filter: 16000, 7, 0
diff --git a/lib/rbcodec/dsp/eqs/Default.cfg b/lib/rbcodec/dsp/eqs/Default.cfg
index c6579c7513..baf3c59069 100644
--- a/lib/rbcodec/dsp/eqs/Default.cfg
+++ b/lib/rbcodec/dsp/eqs/Default.cfg
@@ -1,32 +1,12 @@
 eq enabled: off
 eq precut: 0
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 0
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 0
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 0
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 0
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 0
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 0
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 0
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 0
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 0
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 0
+eq low shelf filter: 32, 7, 0
+eq peak filter 1: 64, 10, 0
+eq peak filter 2: 125, 10, 0
+eq peak filter 3: 250, 10, 0
+eq peak filter 4: 500, 10, 0
+eq peak filter 5: 1000, 10, 0
+eq peak filter 6: 2000, 10, 0
+eq peak filter 7: 4000, 10, 0
+eq peak filter 8: 8000, 10, 0
+eq high shelf filter: 16000, 7, 0
diff --git a/lib/rbcodec/dsp/eqs/Disco.cfg b/lib/rbcodec/dsp/eqs/Disco.cfg
index 12f4b36af5..c43a29e798 100644
--- a/lib/rbcodec/dsp/eqs/Disco.cfg
+++ b/lib/rbcodec/dsp/eqs/Disco.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 45
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 30
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 30
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 10
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 10
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 45
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 45
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 25
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 25
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 10
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 10
+eq low shelf filter: 32, 7, 30
+eq peak filter 1: 64, 10, 30
+eq peak filter 2: 125, 10, 10
+eq peak filter 3: 250, 10, 10
+eq peak filter 4: 500, 10, 45
+eq peak filter 5: 1000, 10, 45
+eq peak filter 6: 2000, 10, 25
+eq peak filter 7: 4000, 10, 25
+eq peak filter 8: 8000, 10, 10
+eq high shelf filter: 16000, 7, 10
diff --git a/lib/rbcodec/dsp/eqs/Electronic.cfg b/lib/rbcodec/dsp/eqs/Electronic.cfg
index e710706607..545a2161de 100644
--- a/lib/rbcodec/dsp/eqs/Electronic.cfg
+++ b/lib/rbcodec/dsp/eqs/Electronic.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 55
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 45
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 45
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 5
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 5
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 25
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 25
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 15
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 15
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 0
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 55
+eq low shelf filter: 32, 7, 45
+eq peak filter 1: 64, 10, 45
+eq peak filter 2: 125, 10, 5
+eq peak filter 3: 250, 10, 5
+eq peak filter 4: 500, 10, 25
+eq peak filter 5: 1000, 10, 25
+eq peak filter 6: 2000, 10, 15
+eq peak filter 7: 4000, 10, 15
+eq peak filter 8: 8000, 10, 0
+eq high shelf filter: 16000, 7, 55
diff --git a/lib/rbcodec/dsp/eqs/Flat.cfg b/lib/rbcodec/dsp/eqs/Flat.cfg
index 9e52cb86e6..7e2cc32bdd 100644
--- a/lib/rbcodec/dsp/eqs/Flat.cfg
+++ b/lib/rbcodec/dsp/eqs/Flat.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 0
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 0
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 0
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 0
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 0
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 0
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 0
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 0
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 0
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 0
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 0
+eq low shelf filter: 32, 7, 0
+eq peak filter 1: 64, 10, 0
+eq peak filter 2: 125, 10, 0
+eq peak filter 3: 250, 10, 0
+eq peak filter 4: 500, 10, 0
+eq peak filter 5: 1000, 10, 0
+eq peak filter 6: 2000, 10, 0
+eq peak filter 7: 4000, 10, 0
+eq peak filter 8: 8000, 10, 0
+eq high shelf filter: 16000, 7, 0
diff --git a/lib/rbcodec/dsp/eqs/Headphones.cfg b/lib/rbcodec/dsp/eqs/Headphones.cfg
index 0720a599d1..27d038cce6 100644
--- a/lib/rbcodec/dsp/eqs/Headphones.cfg
+++ b/lib/rbcodec/dsp/eqs/Headphones.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 145
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 50
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 110
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 55
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: -30
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: -25
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 15
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 50
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 95
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 130
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 145
+eq low shelf filter: 32, 7, 50
+eq peak filter 1: 64, 10, 110
+eq peak filter 2: 125, 10, 55
+eq peak filter 3: 250, 10, -30
+eq peak filter 4: 500, 10, -25
+eq peak filter 5: 1000, 10, 15
+eq peak filter 6: 2000, 10, 50
+eq peak filter 7: 4000, 10, 95
+eq peak filter 8: 8000, 10, 130
+eq high shelf filter: 16000, 7, 145
diff --git a/lib/rbcodec/dsp/eqs/Hip-Hop.cfg b/lib/rbcodec/dsp/eqs/Hip-Hop.cfg
index 54f11fb364..fac476d3a0 100644
--- a/lib/rbcodec/dsp/eqs/Hip-Hop.cfg
+++ b/lib/rbcodec/dsp/eqs/Hip-Hop.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 65
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 65
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 65
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 25
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 25
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: -10
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: -10
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 15
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 15
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 35
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 35
+eq low shelf filter: 32, 7, 65
+eq peak filter 1: 64, 10, 65
+eq peak filter 2: 125, 10, 25
+eq peak filter 3: 250, 10, 25
+eq peak filter 4: 500, 10, -10
+eq peak filter 5: 1000, 10, -10
+eq peak filter 6: 2000, 10, 15
+eq peak filter 7: 4000, 10, 15
+eq peak filter 8: 8000, 10, 35
+eq high shelf filter: 16000, 7, 35
diff --git a/lib/rbcodec/dsp/eqs/Jazz.cfg b/lib/rbcodec/dsp/eqs/Jazz.cfg
index 04c1e346cd..c57f1be9f5 100644
--- a/lib/rbcodec/dsp/eqs/Jazz.cfg
+++ b/lib/rbcodec/dsp/eqs/Jazz.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 60
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 40
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 40
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 15
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 15
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: -25
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: -25
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 5
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 5
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 60
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 60
+eq low shelf filter: 32, 7, 40
+eq peak filter 1: 64, 10, 40
+eq peak filter 2: 125, 10, 15
+eq peak filter 3: 250, 10, 15
+eq peak filter 4: 500, 10, -25
+eq peak filter 5: 1000, 10, -25
+eq peak filter 6: 2000, 10, 5
+eq peak filter 7: 4000, 10, 5
+eq peak filter 8: 8000, 10, 60
+eq high shelf filter: 16000, 7, 60
diff --git a/lib/rbcodec/dsp/eqs/Live.cfg b/lib/rbcodec/dsp/eqs/Live.cfg
index 67585421f2..b4377a6ca1 100644
--- a/lib/rbcodec/dsp/eqs/Live.cfg
+++ b/lib/rbcodec/dsp/eqs/Live.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 55
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: -50
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 0
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 40
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 55
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 55
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 55
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 40
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 25
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 25
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 25
+eq low shelf filter: 32, 7, -50
+eq peak filter 1: 64, 10, 0
+eq peak filter 2: 125, 10, 40
+eq peak filter 3: 250, 10, 55
+eq peak filter 4: 500, 10, 55
+eq peak filter 5: 1000, 10, 55
+eq peak filter 6: 2000, 10, 40
+eq peak filter 7: 4000, 10, 25
+eq peak filter 8: 8000, 10, 25
+eq high shelf filter: 16000, 7, 25
diff --git a/lib/rbcodec/dsp/eqs/Lounge.cfg b/lib/rbcodec/dsp/eqs/Lounge.cfg
index cac40eb907..90510e16f6 100644
--- a/lib/rbcodec/dsp/eqs/Lounge.cfg
+++ b/lib/rbcodec/dsp/eqs/Lounge.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 20
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: -25
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: -25
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 5
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 5
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 20
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 20
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: -15
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: -15
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 15
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 15
+eq low shelf filter: 32, 7, -25
+eq peak filter 1: 64, 10, -25
+eq peak filter 2: 125, 10, 5
+eq peak filter 3: 250, 10, 5
+eq peak filter 4: 500, 10, 20
+eq peak filter 5: 1000, 10, 20
+eq peak filter 6: 2000, 10, -15
+eq peak filter 7: 4000, 10, -15
+eq peak filter 8: 8000, 10, 15
+eq high shelf filter: 16000, 7, 15
diff --git a/lib/rbcodec/dsp/eqs/Party.cfg b/lib/rbcodec/dsp/eqs/Party.cfg
index 6f6001afc8..c97ae8d085 100644
--- a/lib/rbcodec/dsp/eqs/Party.cfg
+++ b/lib/rbcodec/dsp/eqs/Party.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 70
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 70
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 70
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 0
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 0
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 0
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 0
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 0
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 0
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 70
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 70
+eq low shelf filter: 32, 7, 70
+eq peak filter 1: 64, 10, 70
+eq peak filter 2: 125, 10, 0
+eq peak filter 3: 250, 10, 0
+eq peak filter 4: 500, 10, 0
+eq peak filter 5: 1000, 10, 0
+eq peak filter 6: 2000, 10, 0
+eq peak filter 7: 4000, 10, 0
+eq peak filter 8: 8000, 10, 70
+eq high shelf filter: 16000, 7, 70
diff --git a/lib/rbcodec/dsp/eqs/Pop.cfg b/lib/rbcodec/dsp/eqs/Pop.cfg
index 2584065f06..cab887fb9f 100644
--- a/lib/rbcodec/dsp/eqs/Pop.cfg
+++ b/lib/rbcodec/dsp/eqs/Pop.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 80
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: -15
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 50
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 70
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 80
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 55
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 0
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: -25
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: -25
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 15
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 15
+eq low shelf filter: 32, 7, -15
+eq peak filter 1: 64, 10, 50
+eq peak filter 2: 125, 10, 70
+eq peak filter 3: 250, 10, 80
+eq peak filter 4: 500, 10, 55
+eq peak filter 5: 1000, 10, 0
+eq peak filter 6: 2000, 10, -25
+eq peak filter 7: 4000, 10, -25
+eq peak filter 8: 8000, 10, 15
+eq high shelf filter: 16000, 7, 15
diff --git a/lib/rbcodec/dsp/eqs/R&B.cfg b/lib/rbcodec/dsp/eqs/R&B.cfg
index 283e02ac9e..c521af9bcf 100644
--- a/lib/rbcodec/dsp/eqs/R&B.cfg
+++ b/lib/rbcodec/dsp/eqs/R&B.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 45
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 35
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 35
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 45
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 45
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 5
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 5
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 25
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 25
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 30
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 30
+eq low shelf filter: 32, 7, 35
+eq peak filter 1: 64, 10, 35
+eq peak filter 2: 125, 10, 45
+eq peak filter 3: 250, 10, 45
+eq peak filter 4: 500, 10, 5
+eq peak filter 5: 1000, 10, 5
+eq peak filter 6: 2000, 10, 25
+eq peak filter 7: 4000, 10, 25
+eq peak filter 8: 8000, 10, 30
+eq high shelf filter: 16000, 7, 30
diff --git a/lib/rbcodec/dsp/eqs/Reggae.cfg b/lib/rbcodec/dsp/eqs/Reggae.cfg
index 11def53612..9137b60491 100644
--- a/lib/rbcodec/dsp/eqs/Reggae.cfg
+++ b/lib/rbcodec/dsp/eqs/Reggae.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 65
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 0
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 0
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 0
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: -55
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 0
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 65
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 65
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 0
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 0
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 0
+eq low shelf filter: 32, 7, 0
+eq peak filter 1: 64, 10, 0
+eq peak filter 2: 125, 10, 0
+eq peak filter 3: 250, 10, -55
+eq peak filter 4: 500, 10, 0
+eq peak filter 5: 1000, 10, 65
+eq peak filter 6: 2000, 10, 65
+eq peak filter 7: 4000, 10, 0
+eq peak filter 8: 8000, 10, 0
+eq high shelf filter: 16000, 7, 0
diff --git a/lib/rbcodec/dsp/eqs/Rock.cfg b/lib/rbcodec/dsp/eqs/Rock.cfg
index 788c8b89af..5e3e9918d2 100644
--- a/lib/rbcodec/dsp/eqs/Rock.cfg
+++ b/lib/rbcodec/dsp/eqs/Rock.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 110
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 80
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 50
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: -55
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: -80
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: -30
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 40
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 90
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 110
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 110
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 110
+eq low shelf filter: 32, 7, 80
+eq peak filter 1: 64, 10, 50
+eq peak filter 2: 125, 10, -55
+eq peak filter 3: 250, 10, -80
+eq peak filter 4: 500, 10, -30
+eq peak filter 5: 1000, 10, 40
+eq peak filter 6: 2000, 10, 90
+eq peak filter 7: 4000, 10, 110
+eq peak filter 8: 8000, 10, 110
+eq high shelf filter: 16000, 7, 110
diff --git a/lib/rbcodec/dsp/eqs/Ska.cfg b/lib/rbcodec/dsp/eqs/Ska.cfg
index b0848ad78f..542f011438 100644
--- a/lib/rbcodec/dsp/eqs/Ska.cfg
+++ b/lib/rbcodec/dsp/eqs/Ska.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 110
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: -25
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: -50
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: -40
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 0
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 40
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 55
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 90
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 95
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 110
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 95
+eq low shelf filter: 32, 7, -25
+eq peak filter 1: 64, 10, -50
+eq peak filter 2: 125, 10, -40
+eq peak filter 3: 250, 10, 0
+eq peak filter 4: 500, 10, 40
+eq peak filter 5: 1000, 10, 55
+eq peak filter 6: 2000, 10, 90
+eq peak filter 7: 4000, 10, 95
+eq peak filter 8: 8000, 10, 110
+eq high shelf filter: 16000, 7, 95
diff --git a/lib/rbcodec/dsp/eqs/Soft.cfg b/lib/rbcodec/dsp/eqs/Soft.cfg
index e9f0f03f51..a2b5ede3d0 100644
--- a/lib/rbcodec/dsp/eqs/Soft.cfg
+++ b/lib/rbcodec/dsp/eqs/Soft.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 120
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 50
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 15
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 0
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: -25
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 0
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 40
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 80
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 95
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 110
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 120
+eq low shelf filter: 32, 7, 50
+eq peak filter 1: 64, 10, 15
+eq peak filter 2: 125, 10, 0
+eq peak filter 3: 250, 10, -25
+eq peak filter 4: 500, 10, 0
+eq peak filter 5: 1000, 10, 40
+eq peak filter 6: 2000, 10, 80
+eq peak filter 7: 4000, 10, 95
+eq peak filter 8: 8000, 10, 110
+eq high shelf filter: 16000, 7, 120
diff --git a/lib/rbcodec/dsp/eqs/Techno.cfg b/lib/rbcodec/dsp/eqs/Techno.cfg
index 1125d49914..96ef79e2c7 100644
--- a/lib/rbcodec/dsp/eqs/Techno.cfg
+++ b/lib/rbcodec/dsp/eqs/Techno.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 95
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: 80
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: 55
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 0
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: -55
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: -50
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 0
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 80
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 95
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 95
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 90
+eq low shelf filter: 32, 7, 80
+eq peak filter 1: 64, 10, 55
+eq peak filter 2: 125, 10, 0
+eq peak filter 3: 250, 10, -55
+eq peak filter 4: 500, 10, -50
+eq peak filter 5: 1000, 10, 0
+eq peak filter 6: 2000, 10, 80
+eq peak filter 7: 4000, 10, 95
+eq peak filter 8: 8000, 10, 95
+eq high shelf filter: 16000, 7, 90
diff --git a/lib/rbcodec/dsp/eqs/Vocal.cfg b/lib/rbcodec/dsp/eqs/Vocal.cfg
index fa8fd89a19..80b1139ffa 100644
--- a/lib/rbcodec/dsp/eqs/Vocal.cfg
+++ b/lib/rbcodec/dsp/eqs/Vocal.cfg
@@ -1,32 +1,12 @@
 eq enabled: on
 eq precut: 45
-eq band 0 cutoff: 32
-eq band 0 q: 7
-eq band 0 gain: -45
-eq band 1 cutoff: 64
-eq band 1 q: 10
-eq band 1 gain: -45
-eq band 2 cutoff: 125
-eq band 2 q: 10
-eq band 2 gain: 5
-eq band 3 cutoff: 250
-eq band 3 q: 10
-eq band 3 gain: 5
-eq band 4 cutoff: 500
-eq band 4 q: 10
-eq band 4 gain: 45
-eq band 5 cutoff: 1000
-eq band 5 q: 10
-eq band 5 gain: 45
-eq band 6 cutoff: 2000
-eq band 6 q: 10
-eq band 6 gain: 20
-eq band 7 cutoff: 4000
-eq band 7 q: 10
-eq band 7 gain: 20
-eq band 8 cutoff: 8000
-eq band 8 q: 10
-eq band 8 gain: 0
-eq band 9 cutoff: 16000
-eq band 9 q: 7
-eq band 9 gain: 0
+eq low shelf filter: 32, 7, -45
+eq peak filter 1: 64, 10, -45
+eq peak filter 2: 125, 10, 5
+eq peak filter 3: 250, 10, 5
+eq peak filter 4: 500, 10, 45
+eq peak filter 5: 1000, 10, 45
+eq peak filter 6: 2000, 10, 20
+eq peak filter 7: 4000, 10, 20
+eq peak filter 8: 8000, 10, 0
+eq high shelf filter: 16000, 7, 0