--- a/gst_plugins_base/gst/audioconvert/audioconvert.h	Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/gst/audioconvert/audioconvert.h	Wed Sep 01 12:16:41 2010 +0100
@@ -25,33 +25,14 @@
 #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
-} GstAudioConvertDithering;
+} DitherType;
 
-/**
- * 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,
@@ -59,7 +40,7 @@
   NOISE_SHAPING_SIMPLE,
   NOISE_SHAPING_MEDIUM,
   NOISE_SHAPING_HIGH
-} GstAudioConvertNoiseShaping;
+} NoiseShapingType;
 
 typedef struct _AudioConvertCtx AudioConvertCtx;
 typedef struct _AudioConvertFmt AudioConvertFmt;
@@ -73,7 +54,6 @@
   gint rate;
   gint channels;
   GstAudioChannelPosition *pos;
-  gboolean unpositioned_layout;
 
   /* int audio caps */
   gboolean sign;
@@ -118,9 +98,10 @@
   AudioConvertMix channel_mix;
 
   AudioConvertQuantize quantize;
-
-  GstAudioConvertDithering dither;
-  GstAudioConvertNoiseShaping ns;
+  DitherType dither;
+  NoiseShapingType ns;
+  /* random number generate for dither noise */
+  GRand *dither_random;
   /* last random number generated per channel for hifreq TPDF dither */
   gpointer last_random;
   /* contains the past quantization errors, error[out_channels][count] */
@@ -138,8 +119,8 @@
 
 
 gboolean audio_convert_prepare_context (AudioConvertCtx * ctx,
-    AudioConvertFmt * in, AudioConvertFmt * out,
-    GstAudioConvertDithering dither, GstAudioConvertNoiseShaping ns);
+    AudioConvertFmt * in, AudioConvertFmt * out, DitherType dither,
+    NoiseShapingType ns);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif