Merge branch 'master' into 0.11

[platform/upstream/gst-plugins-base.git] / ext / alsa / gstalsadeviceprobe.c

diff --git a/ext/alsa/gstalsadeviceprobe.c b/ext/alsa/gstalsadeviceprobe.c
index 337c21b..74c10e9 100644 (file)
--- a/ext/alsa/gstalsadeviceprobe.c
+++ b/ext/alsa/gstalsadeviceprobe.c
@@ -28,8 +28,8 @@
 #endif
 
 #include "gstalsadeviceprobe.h"
-#include "gst/interfaces/propertyprobe.h"
 
+#if 0
 G_LOCK_DEFINE_STATIC (probe_lock);
 
 static const GList *
@@ -38,8 +38,6 @@ gst_alsa_device_property_probe_get_properties (GstPropertyProbe * probe)
   GObjectClass *klass = G_OBJECT_GET_CLASS (probe);
   static GList *list = NULL;
 
-  /* well, not perfect, but better than no locking at all.
-   * In the worst case we leak a list node, so who cares? */
   G_LOCK (probe_lock);
 
   if (!list) {
@@ -214,3 +212,4 @@ gst_alsa_type_add_device_property_probe_interface (GType type)
   g_type_add_interface_static (type, GST_TYPE_PROPERTY_PROBE,
       &probe_iface_info);
 }
+#endif