--- a/gst_plugins_base/gst-libs/gst/interfaces/mixer.h	Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/gst-libs/gst/interfaces/mixer.h	Wed Sep 01 12:16:41 2010 +0100
@@ -85,26 +85,18 @@
 /**
  * GstMixerFlags:
  * @GST_MIXER_FLAG_NONE: No flags
- * @GST_MIXER_FLAG_AUTO_NOTIFICATIONS: The mixer implementation automatically
- *    sends notification messages.
- * @GST_MIXER_FLAG_HAS_WHITELIST: The mixer implementation flags tracks that
- *    should be displayed by default (whitelisted). Since: 0.10.23
- * @GST_MIXER_FLAG_GROUPING: The mixer implementation will leave some controls
- *    marked without either input or output.  Controls marked as input or
- *    output should be grouped with input & output sliders, even if they
- *    are options or bare switches. Since: 0.10.23
+ * @GST_MIXER_FLAG_AUTO_NOTIFICATIONS: The mixer implementation automatically sends
+ *    notification messages.
  * 
- * Flags indicating which optional features are supported by a mixer
- * implementation.
+ * Flags for supported features. Whether the element automatically sends 
+ * notifications on the bus is the only one for now. 
  *
  * Since: 0.10.14
  */
 typedef enum
 {
   GST_MIXER_FLAG_NONE                = 0,
-  GST_MIXER_FLAG_AUTO_NOTIFICATIONS  = (1<<0),
-  GST_MIXER_FLAG_HAS_WHITELIST       = (1<<1),
-  GST_MIXER_FLAG_GROUPING            = (1<<2),
+  GST_MIXER_FLAG_AUTO_NOTIFICATIONS  = (1<<0)
 } GstMixerFlags;
 
 struct _GstMixerClass {
@@ -258,15 +250,11 @@
 
 
 void            gst_mixer_options_list_changed (GstMixer        *mixer,
+                                                GstMixerOptions *opts);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
-                                                GstMixerOptions *opts);
 
-GstMixerType    gst_mixer_get_mixer_type  (GstMixer *mixer);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
 
 
 GstMixerFlags   gst_mixer_get_mixer_flags (GstMixer *mixer);