diff options
author | Stefan Kost <ensonic@users.sourceforge.net> | 2007-05-22 11:14:13 +0000 |
---|---|---|
committer | Stefan Kost <ensonic@users.sourceforge.net> | 2007-05-22 11:14:13 +0000 |
commit | b2a310f5c0b6cdc9741c871c447b1d16de459a2e (patch) | |
tree | 7eaf3c466518dbf6d0f48808942b930de67d2d1d /gst/equalizer | |
parent | 8a718ff68654de11a0c22969b15804d3ff6b2b25 (diff) | |
download | gst-plugins-bad-b2a310f5c0b6cdc9741c871c447b1d16de459a2e.tar.gz gst-plugins-bad-b2a310f5c0b6cdc9741c871c447b1d16de459a2e.tar.bz2 gst-plugins-bad-b2a310f5c0b6cdc9741c871c447b1d16de459a2e.zip |
configure.ac: Depend on gstreamer-0.10.12.1. gst/equalizer/gstiirequalizer.c (ARG_BAND_WIDTH, _do_init, ARG_GAIN, _Gs...
Original commit message from CVS:
* configure.ac:
Depend on gstreamer-0.10.12.1.
* gst/equalizer/gstiirequalizer.c (ARG_BAND_WIDTH, _do_init, ARG_GAIN,
_GstIirEqualizerBand, object, _GstIirEqualizerBandClass,
parent_class, gst_iir_equalizer_band_set_property,
gst_iir_equalizer_band_class_init, gst_iir_equalizer_band_get_type,
gst_iir_equalizer_child_proxy_get_child_by_index,
gst_iir_equalizer_child_proxy_get_children_count,
gst_iir_equalizer_child_proxy_interface_init, setup_filter,
gst_iir_equalizer_compute_frequencies,
gst_iir_equalizer_set_property, gst_iir_equalizer_get_property,
plugin_init):
* gst/equalizer/gstiirequalizer.h (audiofilter):
* gst/equalizer/gstiirequalizernbands.c (ARG_NUM_BANDS,
gst_iir_equalizer_nbands_base_init, gst_iir_equalizer_nbands_init,
gst_iir_equalizer_nbands_set_property):
Use new locking macros.
* gst/filter/gstbpwsinc.c (bpwsinc_set_caps):
Add fixme.
* gst/spectrum/gstspectrum.c (SPECTRUM_WINDOW_BASE,
SPECTRUM_WINDOW_LEN, gst_spectrum_init, gst_spectrum_set_property,
gst_spectrum_event, gst_spectrum_transform_ip):
Use new locking macros. Turn two fixed values into #defines.
Diffstat (limited to 'gst/equalizer')
-rw-r--r-- | gst/equalizer/gstiirequalizer.c | 9 | ||||
-rw-r--r-- | gst/equalizer/gstiirequalizer.h | 10 | ||||
-rw-r--r-- | gst/equalizer/gstiirequalizernbands.c | 4 |
3 files changed, 8 insertions, 15 deletions
diff --git a/gst/equalizer/gstiirequalizer.c b/gst/equalizer/gstiirequalizer.c index db29adec..926b1e0a 100644 --- a/gst/equalizer/gstiirequalizer.c +++ b/gst/equalizer/gstiirequalizer.c @@ -433,7 +433,8 @@ gst_iir_equalizer_set_property (GObject * object, guint prop_id, { GstIirEqualizer *equ = GST_IIR_EQUALIZER (object); - GST_EQUALIZER_TRANSFORM_LOCK (equ); + g_mutex_lock (((GstBaseTransform *) (equ))->transform_lock); + //GST_BASE_TRANSFORM_LOCK (equ); GST_OBJECT_LOCK (equ); switch (prop_id) { case ARG_BAND_WIDTH: @@ -453,7 +454,7 @@ gst_iir_equalizer_set_property (GObject * object, guint prop_id, break; } GST_OBJECT_UNLOCK (equ); - GST_EQUALIZER_TRANSFORM_UNLOCK (equ); + GST_BASE_TRANSFORM_UNLOCK (equ); } static void @@ -462,7 +463,7 @@ gst_iir_equalizer_get_property (GObject * object, guint prop_id, { GstIirEqualizer *equ = GST_IIR_EQUALIZER (object); - GST_EQUALIZER_TRANSFORM_LOCK (equ); + GST_BASE_TRANSFORM_LOCK (equ); GST_OBJECT_LOCK (equ); switch (prop_id) { case ARG_BAND_WIDTH: @@ -473,7 +474,7 @@ gst_iir_equalizer_get_property (GObject * object, guint prop_id, break; } GST_OBJECT_UNLOCK (equ); - GST_EQUALIZER_TRANSFORM_UNLOCK (equ); + GST_BASE_TRANSFORM_UNLOCK (equ); } /* start of code that is type specific */ diff --git a/gst/equalizer/gstiirequalizer.h b/gst/equalizer/gstiirequalizer.h index 03fe6a72..558959c8 100644 --- a/gst/equalizer/gstiirequalizer.h +++ b/gst/equalizer/gstiirequalizer.h @@ -25,14 +25,6 @@ #include <gst/audio/gstringbuffer.h> #include <gst/controller/gstcontroller.h> - -#define GST_EQUALIZER_TRANSFORM_LOCK(eq) \ - g_mutex_lock (GST_BASE_TRANSFORM(eq)->transform_lock) - -#define GST_EQUALIZER_TRANSFORM_UNLOCK(eq) \ - g_mutex_unlock (GST_BASE_TRANSFORM(eq)->transform_lock) - - typedef struct _GstIirEqualizer GstIirEqualizer; typedef struct _GstIirEqualizerClass GstIirEqualizerClass; typedef struct _GstIirEqualizerBand GstIirEqualizerBand; @@ -59,7 +51,7 @@ struct _GstIirEqualizer GstAudioFilter audiofilter; /*< private >*/ - + GstIirEqualizerBand **bands; /* properties */ diff --git a/gst/equalizer/gstiirequalizernbands.c b/gst/equalizer/gstiirequalizernbands.c index 939085bb..c03ca01f 100644 --- a/gst/equalizer/gstiirequalizernbands.c +++ b/gst/equalizer/gstiirequalizernbands.c @@ -103,7 +103,7 @@ gst_iir_equalizer_nbands_set_property (GObject * object, guint prop_id, { GstIirEqualizer *equ = GST_IIR_EQUALIZER (object); - GST_EQUALIZER_TRANSFORM_LOCK (equ); + GST_BASE_TRANSFORM_LOCK (equ); GST_OBJECT_LOCK (equ); switch (prop_id) { case ARG_NUM_BANDS: @@ -114,7 +114,7 @@ gst_iir_equalizer_nbands_set_property (GObject * object, guint prop_id, break; } GST_OBJECT_UNLOCK (equ); - GST_EQUALIZER_TRANSFORM_UNLOCK (equ); + GST_BASE_TRANSFORM_UNLOCK (equ); } static void |