basecamerabinsrc: don't use private GMutex implementation details
authorTim-Philipp Müller <tim@centricular.com>
Tue, 17 Feb 2015 00:34:55 +0000 (00:34 +0000)
committerTim-Philipp Müller <tim@centricular.com>
Tue, 17 Feb 2015 09:56:55 +0000 (09:56 +0000)
Don't use private GMutex implementation details to check
whether it has been freed already or not. Just clear mutex
and GCond unconditionally in free function, they are always
inited anyway, and the free function can't be called multiple
times either.

gst-libs/gst/basecamerabinsrc/gstcamerabinpreview.c

index 06af5b2..cfdc074 100644 (file)
@@ -231,14 +231,9 @@ gst_camerabin_destroy_preview_pipeline (GstCameraBinPreviewPipelineData *
 {
   g_return_if_fail (preview != NULL);
 
-  if (preview->processing_lock.p) {
-    g_mutex_clear (&preview->processing_lock);
-    preview->processing_lock.p = NULL;
-  }
-  if (preview->processing_cond.p) {
-    g_cond_clear (&preview->processing_cond);
-    preview->processing_cond.p = NULL;
-  }
+  g_mutex_clear (&preview->processing_lock);
+  g_cond_clear (&preview->processing_cond);
+
   if (preview->pipeline) {
     gst_element_set_state (preview->pipeline, GST_STATE_NULL);
     gst_object_unref (preview->pipeline);