Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add class mutex instead of deprecated static mutex.

Browse Source
This commit is contained in:
John Maguire 2014-06-05 14:06:04 +02:00
parent c03c0def19
commit ea03a621a8
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gst/moodbar/gstfftwspectrum.c
View File

@ -164,6 +164,8 @@ gst_fftwspectrum_class_init (GstFFTWSpectrumClass * klass)
gstelement_class->change_state
= GST_DEBUG_FUNCPTR (gst_fftwspectrum_change_state);
g_mutex_init(&klass->mutex);
}
/* initialize the new element
@ -221,6 +223,8 @@ gst_fftwspectrum_init (GstFFTWSpectrum * conv,
conv->def_size = DEF_SIZE_DEFAULT;
conv->def_step = DEF_STEP_DEFAULT;
conv->hi_q = HIQUALITY_DEFAULT;
conv->mutex = &gclass->mutex;
}
static void
@ -303,13 +307,12 @@ alloc_fftw_data (GstFFTWSpectrum *conv)
* implementing filters.
*/
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
g_static_mutex_lock(&mutex);
g_mutex_lock(conv->mutex);
conv->fftw_plan
= fftw_plan_dft_r2c_1d(conv->size, conv->fftw_in,
(fftw_complex *) conv->fftw_out,
conv->hi_q ? FFTW_MEASURE : FFTW_ESTIMATE);
g_static_mutex_unlock(&mutex);
g_mutex_unlock(conv->mutex);
}

4
gst/moodbar/gstfftwspectrum.h
View File

@ -54,11 +54,15 @@ struct _GstFFTWSpectrum
/* Properties */
gint32 def_size, def_step;
gboolean hi_q;
GMutex* mutex;
};
struct _GstFFTWSpectrumClass
{
GstElementClass parent_class;
GMutex mutex;
};
GType gst_fftwspectrum_get_type (void);