diff options
author | Matthew Waters <ystreet00@gmail.com> | 2014-06-26 11:15:56 +1000 |
---|---|---|
committer | Matthew Waters <ystreet00@gmail.com> | 2014-06-26 11:15:56 +1000 |
commit | a03dbd11e46a7ce2918f0a558d6cb4bb86499c96 (patch) | |
tree | 7b1110aa710ed312206c32a31734c5331fcf5d0d /gst-libs | |
parent | de05daec80c20787368dbef956ec1ae45bfe1f74 (diff) | |
download | gstreamer-plugins-bad-a03dbd11e46a7ce2918f0a558d6cb4bb86499c96.tar.gz |
glmixer: remove redundant/unused lock
Use the GstObject lock instead
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/gl/gstglmixer.c | 13 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglmixer.h | 3 |
2 files changed, 0 insertions, 16 deletions
diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c index a3e5ec5ec..626eb967c 100644 --- a/gst-libs/gst/gl/gstglmixer.c +++ b/gst-libs/gst/gl/gstglmixer.c @@ -45,13 +45,6 @@ static gboolean gst_gl_mixer_do_bufferpool (GstGLMixer * mix, #define GST_CAT_DEFAULT gst_gl_mixer_debug GST_DEBUG_CATEGORY (gst_gl_mixer_debug); -#define GST_GL_MIXER_GET_LOCK(mix) \ - (GST_GL_MIXER(mix)->lock) -#define GST_GL_MIXER_LOCK(mix) \ - (g_mutex_lock(&GST_GL_MIXER_GET_LOCK (mix))) -#define GST_GL_MIXER_UNLOCK(mix) \ - (g_mutex_unlock(&GST_GL_MIXER_GET_LOCK (mix))) - static void gst_gl_mixer_pad_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_gl_mixer_pad_set_property (GObject * object, guint prop_id, @@ -429,7 +422,6 @@ static void gst_gl_mixer_init (GstGLMixer * mix) { mix->priv = GST_GL_MIXER_GET_PRIVATE (mix); - g_mutex_init (&mix->lock); mix->array_buffers = 0; mix->display = NULL; mix->fbo = 0; @@ -442,14 +434,9 @@ gst_gl_mixer_init (GstGLMixer * mix) static void gst_gl_mixer_finalize (GObject * object) { - GstGLMixer *mix = GST_GL_MIXER (object); - - g_mutex_clear (&mix->lock); - G_OBJECT_CLASS (parent_class)->finalize (object); } - static void gst_gl_mixer_set_context (GstElement * element, GstContext * context) { diff --git a/gst-libs/gst/gl/gstglmixer.h b/gst-libs/gst/gl/gstglmixer.h index c056e6a86..7e66acc06 100644 --- a/gst-libs/gst/gl/gstglmixer.h +++ b/gst-libs/gst/gl/gstglmixer.h @@ -59,9 +59,6 @@ struct _GstGLMixer GstGLMixerPrivate *priv; - /* Lock to prevent the state to change while blending */ - GMutex lock; - GPtrArray *array_buffers; GPtrArray *frames; |