Merge branch 'master' into 0.11

[platform/upstream/gst-plugins-base.git] / gst-libs / gst / audio / mixer.c

diff --git a/gst-libs/gst/audio/mixer.c b/gst-libs/gst/audio/mixer.c
index 0fca9a8..4c52b25 100644 (file)
--- a/gst-libs/gst/audio/mixer.c
+++ b/gst-libs/gst/audio/mixer.c
@@ -83,9 +83,8 @@ gst_mixer_get_type (void)
 static void
 gst_mixer_class_init (GstMixerInterface * iface)
 {
-  iface->mixer_type = GST_MIXER_SOFTWARE;
-
   /* default virtual functions */
+  iface->get_mixer_type = NULL;
   iface->list_tracks = NULL;
   iface->set_volume = NULL;
   iface->get_volume = NULL;
@@ -304,7 +303,8 @@ gst_mixer_get_mixer_type (GstMixer * mixer)
 {
   GstMixerInterface *iface = GST_MIXER_GET_INTERFACE (mixer);
 
-  return iface->mixer_type;
+  g_return_val_if_fail (iface->get_mixer_type != NULL, GST_MIXER_SOFTWARE);
+  return iface->get_mixer_type (mixer);
 }
 
 /**