Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst-libs / gst / audio / mixerutils.c

diff --git a/gst-libs/gst/audio/mixerutils.c b/gst-libs/gst/audio/mixerutils.c
index f500497..ff29ea3 100644 (file)
--- a/gst-libs/gst/audio/mixerutils.c
+++ b/gst-libs/gst/audio/mixerutils.c
@@ -41,8 +41,6 @@
 
 #include "mixerutils.h"
 
-#include <gst/interfaces/propertyprobe.h>
-
 #include <string.h>
 
 static void
@@ -121,6 +119,7 @@ gst_audio_mixer_filter_probe_feature (GstAudioMixerFilterFunc filter_func,
 
   GST_DEBUG ("created element %s (%p)", GST_ELEMENT_NAME (element), element);
 
+#if 0
   if (GST_IS_PROPERTY_PROBE (element)) {
     GstPropertyProbe *probe;
     const GParamSpec *devspec;
@@ -159,7 +158,9 @@ gst_audio_mixer_filter_probe_feature (GstAudioMixerFilterFunc filter_func,
         g_value_array_free (array);
       }
     }
-  } else {
+  } else
+#endif
+  {
     GST_DEBUG ("element does not support the property probe interface");
 
     if (gst_audio_mixer_filter_check_element (element)) {
@@ -182,8 +183,8 @@ element_factory_rank_compare_func (gconstpointer a, gconstpointer b)
 
   /* make order chosen in the end more determinable */
   if (rank_a == rank_b) {
-    const gchar *name_a = GST_PLUGIN_FEATURE_NAME (GST_PLUGIN_FEATURE (a));
-    const gchar *name_b = GST_PLUGIN_FEATURE_NAME (GST_PLUGIN_FEATURE (b));
+    const gchar *name_a = GST_OBJECT_NAME (GST_PLUGIN_FEATURE (a));
+    const gchar *name_b = GST_OBJECT_NAME (GST_PLUGIN_FEATURE (b));
 
     return g_ascii_strcasecmp (name_a, name_b);
   }
@@ -220,7 +221,7 @@ gst_audio_default_registry_mixer_filter (GstAudioMixerFilterFunc filter_func,
 
   /* go through all elements of a certain class and check whether
    * they implement a mixer. If so, add it to the list. */
-  feature_list = gst_registry_get_feature_list (gst_registry_get_default (),
+  feature_list = gst_registry_get_feature_list (gst_registry_get (),
       GST_TYPE_ELEMENT_FACTORY);
 
   feature_list = g_list_sort (feature_list, element_factory_rank_compare_func);