glmixer: remove redundant/unused lock

Use the GstObject lock instead

diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c
index a3e5ec5ecf26132974b2770452f6fe0d69a12c01..626eb967c7a7b1004a3dd37e0df1e9dff8aa860f 100644 (file)
--- 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 c056e6a86c20450350ea4f8b41d0e6fa7e449033..7e66acc06cc639066af4ff0bde746c9d8c83a7f9 100644 (file)
--- 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;