gst/equalizer/: Add presets for equalizer. Fixes #522183.

Original commit message from CVS:
* gst/equalizer/GstIirEqualizer10Bands.prs:
* gst/equalizer/GstIirEqualizer3Bands.prs:
* gst/equalizer/Makefile.am:
* gst/equalizer/gstiirequalizer10bands.c:
* gst/equalizer/gstiirequalizer3bands.c:
Add presets for equalizer. Fixes #522183.

diff --git a/ChangeLog b/ChangeLog
index 5038c28b7417c68f08306a41fb32c584cb7e415a..ffcd24382f0b05e5304367a0938d26a7357b0c9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-13  Stefan Kost  <ensonic@users.sf.net>
+
+       * gst/equalizer/GstIirEqualizer10Bands.prs:
+       * gst/equalizer/GstIirEqualizer3Bands.prs:
+       * gst/equalizer/Makefile.am:
+       * gst/equalizer/gstiirequalizer10bands.c:
+       * gst/equalizer/gstiirequalizer3bands.c:
+         Add presets for equalizer. Fixes #522183.
+
 2008-11-13  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * gst/rtsp/Makefile.am:

diff --git a/gst/equalizer/GstIirEqualizer10Bands.prs b/gst/equalizer/GstIirEqualizer10Bands.prs
new file mode 100644 (file)
index 0000000..9b261b8
--- /dev/null
+++ b/gst/equalizer/GstIirEqualizer10Bands.prs
@@ -0,0 +1,174 @@
+[_presets_]
+version=0.10
+element-name=GstIirEqualizer10Bands
+
+[ballad]
+band0=4
+band1=3.75
+band2=2.5
+band3=0
+band4=-4
+band5=-6
+band6=-3
+band7=0
+band8=2.5
+band9=9
+
+[classic]
+band0=0
+band1=0
+band2=0
+band3=0
+band4=0
+band5=0
+band6=-6
+band7=-7
+band8=-7
+band9=-9.5
+
+[club]
+band0=0
+band1=0
+band2=8
+band3=6
+band4=5.5
+band5=5
+band6=3
+band7=0
+band8=0
+band9=0
+
+[dance]
+band0=9.6
+band1=7
+band2=2.5
+band3=0
+band4=0
+band5=-5.6
+band6=-7
+band7=-7
+band8=0
+band9=0
+
+[pop]
+band0=-1.6
+band1=4.5
+band2=7
+band3=8
+band4=5.6
+band5=0
+band6=-2.5
+band7=-2
+band8=-1.6
+band9=-1.5
+
+[reggae]
+band0=0
+band1=0
+band2=0
+band3=-5.5
+band4=0
+band5=6.5
+band6=6.5
+band7=0
+band8=0
+band9=0
+
+[rock]
+band0=8
+band1=5
+band2=-5.5
+band3=-8
+band4=-3
+band5=4
+band6=8
+band7=11
+band8=11
+band9=11.5
+
+[ska]
+band0=-2.5
+band1=-5
+band2=-4
+band3=0
+band4=4
+band5=5.5
+band6=8
+band7=9
+band8=11
+band9=9
+
+[soft]
+band0=5
+band1=1.5
+band2=0
+band3=-2.5
+band4=0
+band5=4
+band6=8
+band7=9
+band8=11
+band9=12
+
+[techno]
+band0=8
+band1=5.5
+band2=0
+band3=-5.5
+band4=-5
+band5=0
+band6=8
+band7=10
+band8=10
+band9=9
+
+
+[party]
+band0=7
+band1=7
+band2=0
+band3=0
+band4=0
+band5=0
+band6=0
+band7=0
+band8=7
+band9=7
+
+
+[more bass]
+band0=-8
+band1=10
+band2=10
+band3=5.5
+band4=1.5
+band5=-4
+band6=-8
+band7=-10
+band8=-11
+band9=-11
+
+[more bass and treble]
+band0=8
+band1=5.5
+band2=0
+band3=-7
+band4=-5
+band5=1.5
+band6=8
+band7=11.2
+band8=12
+band9=12
+
+[more treble]
+band0=-10
+band1=-10
+band2=-10
+band3=-4
+band4=2.5
+band5=11
+band6=16
+band7=16
+band8=16
+band9=18
+

diff --git a/gst/equalizer/GstIirEqualizer3Bands.prs b/gst/equalizer/GstIirEqualizer3Bands.prs
new file mode 100644 (file)
index 0000000..fb8ef5a
--- /dev/null
+++ b/gst/equalizer/GstIirEqualizer3Bands.prs
@@ -0,0 +1,14 @@
+[_presets_]
+version=0.10
+element-name=GstIirEqualizer3Bands
+
+[more bass]
+band0=7.75
+band1=0
+band2=0
+
+[more trebble]
+band0=0
+band1=0
+band2=6.0
+

diff --git a/gst/equalizer/Makefile.am b/gst/equalizer/Makefile.am
index a5dbbe673a39269a3e57d507f8c21ca9bde216b7..0ab49050356a63475021d96a5abf063b2ee05890 100644 (file)
--- a/gst/equalizer/Makefile.am
+++ b/gst/equalizer/Makefile.am
@@ -16,3 +16,8 @@ libgstequalizer_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstiirequalizer.h
 
+presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets
+preset_DATA = GstIirEqualizer3Bands.prs GstIirEqualizer10Bands.prs
+
+EXTRA_DIST = $(preset_DATA)
+

diff --git a/gst/equalizer/gstiirequalizer10bands.c b/gst/equalizer/gstiirequalizer10bands.c
index e951077d6005bfe461ab03141abfdd1b7285ef5e..833c80699e040987041136984d13d673197200ff 100644 (file)
--- a/gst/equalizer/gstiirequalizer10bands.c
+++ b/gst/equalizer/gstiirequalizer10bands.c
@@ -66,8 +66,22 @@ static void gst_iir_equalizer_10bands_get_property (GObject * object,
 GST_DEBUG_CATEGORY_EXTERN (equalizer_debug);
 #define GST_CAT_DEFAULT equalizer_debug
 
-GST_BOILERPLATE (GstIirEqualizer10Bands, gst_iir_equalizer_10bands,
-    GstIirEqualizer, GST_TYPE_IIR_EQUALIZER);
+
+static void
+_do_init (GType object_type)
+{
+  const GInterfaceInfo preset_interface_info = {
+    NULL,                       /* interface_init */
+    NULL,                       /* interface_finalize */
+    NULL                        /* interface_data */
+  };
+
+  g_type_add_interface_static (object_type, GST_TYPE_PRESET,
+      &preset_interface_info);
+}
+
+GST_BOILERPLATE_FULL (GstIirEqualizer10Bands, gst_iir_equalizer_10bands,
+    GstIirEqualizer, GST_TYPE_IIR_EQUALIZER, _do_init);
 
 /* equalizer implementation */
 

diff --git a/gst/equalizer/gstiirequalizer3bands.c b/gst/equalizer/gstiirequalizer3bands.c
index f1e11d508e36fe0aadf1372223bb5b4eb4460624..c550f786885779398918e57e07b08b1731183037 100644 (file)
--- a/gst/equalizer/gstiirequalizer3bands.c
+++ b/gst/equalizer/gstiirequalizer3bands.c
@@ -58,8 +58,22 @@ static void gst_iir_equalizer_3bands_get_property (GObject * object,
 GST_DEBUG_CATEGORY_EXTERN (equalizer_debug);
 #define GST_CAT_DEFAULT equalizer_debug
 
-GST_BOILERPLATE (GstIirEqualizer3Bands, gst_iir_equalizer_3bands,
-    GstIirEqualizer, GST_TYPE_IIR_EQUALIZER);
+
+static void
+_do_init (GType object_type)
+{
+  const GInterfaceInfo preset_interface_info = {
+    NULL,                       /* interface_init */
+    NULL,                       /* interface_finalize */
+    NULL                        /* interface_data */
+  };
+
+  g_type_add_interface_static (object_type, GST_TYPE_PRESET,
+      &preset_interface_info);
+}
+
+GST_BOILERPLATE_FULL (GstIirEqualizer3Bands, gst_iir_equalizer_3bands,
+    GstIirEqualizer, GST_TYPE_IIR_EQUALIZER, _do_init);
 
 /* equalizer implementation */