--- a/gst_plugins_base/gst/audioconvert/audioconvert.h	Wed Mar 24 17:58:42 2010 -0500
+++ b/gst_plugins_base/gst/audioconvert/audioconvert.h	Wed Mar 24 18:04:17 2010 -0500
@@ -25,14 +25,33 @@
 #include <gst/gst.h>
 #include <gst/audio/multichannel.h>
 
+/**
+ * GstAudioConvertDithering:
+ * @DITHER_NONE: No dithering
+ * @DITHER_RPDF: Rectangular dithering
+ * @DITHER_TPDF: Triangular dithering (default)
+ * @DITHER_TPDF_HF: High frequency triangular dithering
+ *
+ * Set of available dithering methods when converting audio.
+ */
 typedef enum
 {
   DITHER_NONE = 0,
   DITHER_RPDF,
   DITHER_TPDF,
   DITHER_TPDF_HF
-} DitherType;
+} GstAudioConvertDithering;
 
+/**
+ * GstAudioConvertNoiseShaping:
+ * @NOISE_SHAPING_NONE: No noise shaping (default)
+ * @NOISE_SHAPING_ERROR_FEEDBACK: Error feedback
+ * @NOISE_SHAPING_SIMPLE: Simple 2-pole noise shaping
+ * @NOISE_SHAPING_MEDIUM: Medium 5-pole noise shaping
+ * @NOISE_SHAPING_HIGH: High 8-pole noise shaping
+ *
+ * Set of available noise shaping methods
+ */
 typedef enum
 {
   NOISE_SHAPING_NONE = 0,
@@ -40,7 +59,7 @@
   NOISE_SHAPING_SIMPLE,
   NOISE_SHAPING_MEDIUM,
   NOISE_SHAPING_HIGH
-} NoiseShapingType;
+} GstAudioConvertNoiseShaping;
 
 typedef struct _AudioConvertCtx AudioConvertCtx;
 typedef struct _AudioConvertFmt AudioConvertFmt;
@@ -54,6 +73,7 @@
   gint rate;
   gint channels;
   GstAudioChannelPosition *pos;
+  gboolean unpositioned_layout;
 
   /* int audio caps */
   gboolean sign;
@@ -98,10 +118,9 @@
   AudioConvertMix channel_mix;
 
   AudioConvertQuantize quantize;
-  DitherType dither;
-  NoiseShapingType ns;
-  /* random number generate for dither noise */
-  GRand *dither_random;
+
+  GstAudioConvertDithering dither;
+  GstAudioConvertNoiseShaping ns;
   /* last random number generated per channel for hifreq TPDF dither */
   gpointer last_random;
   /* contains the past quantization errors, error[out_channels][count] */
@@ -119,8 +138,8 @@
 
 
 gboolean audio_convert_prepare_context (AudioConvertCtx * ctx,
-    AudioConvertFmt * in, AudioConvertFmt * out, DitherType dither,
-    NoiseShapingType ns);
+    AudioConvertFmt * in, AudioConvertFmt * out,
+    GstAudioConvertDithering dither, GstAudioConvertNoiseShaping ns);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif