Fix more gobject macros: obj<->klass, GstXXX<->GstXXXClass

Original commit message from CVS: * ext/alsaspdif/alsaspdifsink.h: * ext/amrwb/gstamrwbdec.h: * ext/amrwb/gstamrwbenc.h: * ext/amrwb/gstamrwbparse.h: * ext/arts/gst_arts.h: * ext/artsd/gstartsdsink.h: * ext/audiofile/gstafparse.h: * ext/audiofile/gstafsink.h: * ext/audiofile/gstafsrc.h: * ext/audioresample/gstaudioresample.h: * ext/bz2/gstbz2dec.h: * ext/bz2/gstbz2enc.h: * ext/dirac/gstdiracdec.h: * ext/directfb/dfbvideosink.h: * ext/divx/gstdivxdec.h: * ext/divx/gstdivxenc.h: * ext/dts/gstdtsdec.h: * ext/faac/gstfaac.h: * ext/gsm/gstgsmdec.h: * ext/gsm/gstgsmenc.h: * ext/ivorbis/vorbisenc.h: * ext/libfame/gstlibfame.h: * ext/nas/nassink.h: * ext/neon/gstneonhttpsrc.h: * ext/polyp/polypsink.h: * ext/sdl/sdlaudiosink.h: * ext/sdl/sdlvideosink.h: * ext/shout/gstshout.h: * ext/snapshot/gstsnapshot.h: * ext/sndfile/gstsf.h: * ext/swfdec/gstswfdec.h: * ext/tarkin/gsttarkindec.h: * ext/tarkin/gsttarkinenc.h: * ext/theora/theoradec.h: * ext/wavpack/gstwavpackdec.h: * ext/wavpack/gstwavpackparse.h: * ext/xine/gstxine.h: * ext/xvid/gstxviddec.h: * ext/xvid/gstxvidenc.h: * gst/cdxaparse/gstcdxaparse.h: * gst/cdxaparse/gstcdxastrip.h: * gst/colorspace/gstcolorspace.h: * gst/festival/gstfestival.h: * gst/freeze/gstfreeze.h: * gst/gdp/gstgdpdepay.h: * gst/gdp/gstgdppay.h: * gst/modplug/gstmodplug.h: * gst/mpeg1sys/gstmpeg1systemencode.h: * gst/mpeg1videoparse/gstmp1videoparse.h: * gst/mpeg2sub/gstmpeg2subt.h: * gst/mpegaudioparse/gstmpegaudioparse.h: * gst/multifilesink/gstmultifilesink.h: * gst/overlay/gstoverlay.h: * gst/playondemand/gstplayondemand.h: * gst/qtdemux/qtdemux.h: * gst/rtjpeg/gstrtjpegdec.h: * gst/rtjpeg/gstrtjpegenc.h: * gst/smooth/gstsmooth.h: * gst/smoothwave/gstsmoothwave.h: * gst/spectrum/gstspectrum.h: * gst/speed/gstspeed.h: * gst/stereo/gststereo.h: * gst/switch/gstswitch.h: * gst/tta/gstttadec.h: * gst/tta/gstttaparse.h: * gst/videodrop/gstvideodrop.h: * gst/xingheader/gstxingmux.h: * sys/directdraw/gstdirectdrawsink.h: * sys/directsound/gstdirectsoundsink.h: * sys/dxr3/dxr3audiosink.h: * sys/dxr3/dxr3spusink.h: * sys/dxr3/dxr3videosink.h: * sys/qcam/gstqcamsrc.h: * sys/vcd/vcdsrc.h: Fix more gobject macros: obj<->klass, GstXXX<->GstXXXClass
2024-11-23 10:11:08 +00:00 · 2006-06-01 22:00:26 +00:00 · 2006-06-01 22:00:26 +00:00 · fd1273d9bb
commit fd1273d9bb
parent 3f813d64b2
76 changed files with 215 additions and 137 deletions
--- a/78
+++ b/78
@ -1,3 +1,81 @@
+2006-06-02  Stefan Kost  <ensonic@users.sf.net>
+
+	* ext/alsaspdif/alsaspdifsink.h:
+	* ext/amrwb/gstamrwbdec.h:
+	* ext/amrwb/gstamrwbenc.h:
+	* ext/amrwb/gstamrwbparse.h:
+	* ext/arts/gst_arts.h:
+	* ext/artsd/gstartsdsink.h:
+	* ext/audiofile/gstafparse.h:
+	* ext/audiofile/gstafsink.h:
+	* ext/audiofile/gstafsrc.h:
+	* ext/audioresample/gstaudioresample.h:
+	* ext/bz2/gstbz2dec.h:
+	* ext/bz2/gstbz2enc.h:
+	* ext/dirac/gstdiracdec.h:
+	* ext/directfb/dfbvideosink.h:
+	* ext/divx/gstdivxdec.h:
+	* ext/divx/gstdivxenc.h:
+	* ext/dts/gstdtsdec.h:
+	* ext/faac/gstfaac.h:
+	* ext/gsm/gstgsmdec.h:
+	* ext/gsm/gstgsmenc.h:
+	* ext/ivorbis/vorbisenc.h:
+	* ext/libfame/gstlibfame.h:
+	* ext/nas/nassink.h:
+	* ext/neon/gstneonhttpsrc.h:
+	* ext/polyp/polypsink.h:
+	* ext/sdl/sdlaudiosink.h:
+	* ext/sdl/sdlvideosink.h:
+	* ext/shout/gstshout.h:
+	* ext/snapshot/gstsnapshot.h:
+	* ext/sndfile/gstsf.h:
+	* ext/swfdec/gstswfdec.h:
+	* ext/tarkin/gsttarkindec.h:
+	* ext/tarkin/gsttarkinenc.h:
+	* ext/theora/theoradec.h:
+	* ext/wavpack/gstwavpackdec.h:
+	* ext/wavpack/gstwavpackparse.h:
+	* ext/xine/gstxine.h:
+	* ext/xvid/gstxviddec.h:
+	* ext/xvid/gstxvidenc.h:
+	* gst/cdxaparse/gstcdxaparse.h:
+	* gst/cdxaparse/gstcdxastrip.h:
+	* gst/colorspace/gstcolorspace.h:
+	* gst/festival/gstfestival.h:
+	* gst/freeze/gstfreeze.h:
+	* gst/gdp/gstgdpdepay.h:
+	* gst/gdp/gstgdppay.h:
+	* gst/modplug/gstmodplug.h:
+	* gst/mpeg1sys/gstmpeg1systemencode.h:
+	* gst/mpeg1videoparse/gstmp1videoparse.h:
+	* gst/mpeg2sub/gstmpeg2subt.h:
+	* gst/mpegaudioparse/gstmpegaudioparse.h:
+	* gst/multifilesink/gstmultifilesink.h:
+	* gst/overlay/gstoverlay.h:
+	* gst/playondemand/gstplayondemand.h:
+	* gst/qtdemux/qtdemux.h:
+	* gst/rtjpeg/gstrtjpegdec.h:
+	* gst/rtjpeg/gstrtjpegenc.h:
+	* gst/smooth/gstsmooth.h:
+	* gst/smoothwave/gstsmoothwave.h:
+	* gst/spectrum/gstspectrum.h:
+	* gst/speed/gstspeed.h:
+	* gst/stereo/gststereo.h:
+	* gst/switch/gstswitch.h:
+	* gst/tta/gstttadec.h:
+	* gst/tta/gstttaparse.h:
+	* gst/videodrop/gstvideodrop.h:
+	* gst/xingheader/gstxingmux.h:
+	* sys/directdraw/gstdirectdrawsink.h:
+	* sys/directsound/gstdirectsoundsink.h:
+	* sys/dxr3/dxr3audiosink.h:
+	* sys/dxr3/dxr3spusink.h:
+	* sys/dxr3/dxr3videosink.h:
+	* sys/qcam/gstqcamsrc.h:
+	* sys/vcd/vcdsrc.h:
+	Fix more gobject macros: obj<->klass, GstXXX<->GstXXXClass
+
 2006-05-31  Edward Hervey  <edward@fluendo.com>

 	* ext/faad/gstfaad.h:
--- a/ext/alsaspdif/alsaspdifsink.h
+++ b/ext/alsaspdif/alsaspdifsink.h
@ -37,7 +37,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALSASPDIFSINK,AlsaSPDIFSinkClass))
 #define GST_IS_ALSASPDIFSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALSASPDIFSINK))
-#define GST_IS_ALSASPDIFSINK_CLASS(obj) \
+#define GST_IS_ALSASPDIFSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALSASPDIFSINK))
 #define GST_TYPE_ALSASPDIFSINK (alsaspdifsink_get_type())

--- a/ext/amrwb/gstamrwbdec.h
+++ b/ext/amrwb/gstamrwbdec.h
@ -32,10 +32,10 @@ G_BEGIN_DECLS
 #define GST_AMRWBDEC(obj)						\
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRWBDEC, GstAmrwbDec))
 #define GST_AMRWBDEC_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBDEC, GstAmrwbDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBDEC, GstAmrwbDecClass))
 #define GST_IS_AMRWBDEC(obj)					\
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRWBDEC))
-#define GST_IS_AMRWBDEC_CLASS(obj)			\
+#define GST_IS_AMRWBDEC_CLASS(klass)			\
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRWBDEC))

 typedef struct _GstAmrwbDec GstAmrwbDec;
--- a/ext/amrwb/gstamrwbenc.h
+++ b/ext/amrwb/gstamrwbenc.h
@ -33,10 +33,10 @@ G_BEGIN_DECLS
 #define GST_AMRWBENC(obj)						\
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRWBENC, GstAmrwbEnc))
 #define GST_AMRWBENC_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBENC, GstAmrwbEnc))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBENC, GstAmrwbEncClass))
 #define GST_IS_AMRWBENC(obj)					\
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRWBENC))
-#define GST_IS_AMRWBENC_CLASS(obj)			\
+#define GST_IS_AMRWBENC_CLASS(klass)			\
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRWBENC))

 typedef struct _GstAmrwbEnc GstAmrwbEnc;
--- a/ext/amrwb/gstamrwbparse.h
+++ b/ext/amrwb/gstamrwbparse.h
@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #define GST_AMRWBPARSE(obj)						\
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRWBPARSE, GstAmrwbParse))
 #define GST_AMRWBPARSE_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBPARSE, GstAmrwbParse))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRWBPARSE, GstAmrwbParseClass))
 #define GST_IS_AMRWBPARSE(obj)					\
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRWBPARSE))
-#define GST_IS_AMRWBPARSE_CLASS(obj)				\
+#define GST_IS_AMRWBPARSE_CLASS(klass)				\
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRWBPARSE))

 typedef struct _GstAmrwbParse GstAmrwbParse;
--- a/ext/arts/gst_arts.h
+++ b/ext/arts/gst_arts.h
@ -36,10 +36,10 @@ extern "C" {
 #define GST_ARTS(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ARTS,GstARTS))
 #define GST_ARTS_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARTS,GstARTS))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARTS,GstARTSClass))
 #define GST_IS_ARTS(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ARTS))
-#define GST_IS_ARTS_CLASS(obj) \
+#define GST_IS_ARTS_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARTS))

 typedef struct _GstARTS GstARTS;
--- a/ext/artsd/gstartsdsink.h
+++ b/ext/artsd/gstartsdsink.h
@ -34,10 +34,10 @@ extern "C" {
 #define GST_ARTSDSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ARTSDSINK,GstArtsdsink))
 #define GST_ARTSDSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARTSDSINK,GstArtsdsink))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARTSDSINK,GstArtsdsinkClass))
 #define GST_IS_ARTSDSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ARTSDSINK))
-#define GST_IS_ARTSDSINK_CLASS(obj) \
+#define GST_IS_ARTSDSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARTSDSINK))

 typedef enum {
--- a/ext/audiofile/gstafparse.h
+++ b/ext/audiofile/gstafparse.h
@ -47,7 +47,7 @@ extern "C" {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AFPARSE,GstAFParseClass))
 #define GST_IS_AFPARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AFPARSE))
-#define GST_IS_AFPARSE_CLASS(obj) \
+#define GST_IS_AFPARSE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AFPARSE))

 typedef struct _GstAFParse GstAFParse;
--- a/ext/audiofile/gstafsink.h
+++ b/ext/audiofile/gstafsink.h
@ -45,7 +45,7 @@ extern "C" {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AFSINK,GstAFSinkClass))
 #define GST_IS_AFSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AFSINK))
-#define GST_IS_AFSINK_CLASS(obj) \
+#define GST_IS_AFSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AFSINK))

 typedef struct _GstAFSink GstAFSink;
--- a/ext/audiofile/gstafsrc.h
+++ b/ext/audiofile/gstafsrc.h
@ -45,7 +45,7 @@ extern "C" {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AFSRC,GstAFSrcClass))
 #define GST_IS_AFSRC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AFSRC))
-#define GST_IS_AFSRC_CLASS(obj) \
+#define GST_IS_AFSRC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AFSRC))

 typedef struct _GstAFSrc GstAFSrc;
--- a/ext/audioresample/gstaudioresample.h
+++ b/ext/audioresample/gstaudioresample.h
@ -35,10 +35,10 @@ G_BEGIN_DECLS
 #define GST_AUDIORESAMPLE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIORESAMPLE,Audioresample))
 #define GST_AUDIORESAMPLE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIORESAMPLE,Audioresample))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIORESAMPLE,AudioresampleClass))
 #define GST_IS_AUDIORESAMPLE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIORESAMPLE))
-#define GST_IS_AUDIORESAMPLE_CLASS(obj) \
+#define GST_IS_AUDIORESAMPLE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIORESAMPLE))

 typedef struct _Audioresample Audioresample;
--- a/ext/bz2/gstbz2dec.h
+++ b/ext/bz2/gstbz2dec.h
@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 #define GST_TYPE_BZ2DEC            (gst_bz2dec_get_type())
 #define GST_BZ2DEC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BZ2DEC,GstBz2dec))
-#define GST_BZ2DEC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BZ2DEC,GstBz2dec))
+#define GST_BZ2DEC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BZ2DEC,GstBz2decClass))
 #define GST_IS_BZ2DEC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BZ2DEC))
 #define GST_IS_BZ2DEC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BZ2DEC))
 typedef struct _GstBz2dec GstBz2dec;
--- a/ext/bz2/gstbz2enc.h
+++ b/ext/bz2/gstbz2enc.h
@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 #define GST_TYPE_BZ2ENC            (gst_bz2enc_get_type())
 #define GST_BZ2ENC(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BZ2ENC,GstBz2enc))
-#define GST_BZ2ENC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BZ2ENC,GstBz2enc))
+#define GST_BZ2ENC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BZ2ENC,GstBz2encClass))
 #define GST_IS_BZ2ENC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BZ2ENC))
 #define GST_IS_BZ2ENC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BZ2ENC))
 typedef struct _GstBz2enc GstBz2enc;
--- a/ext/dirac/gstdiracdec.h
+++ b/ext/dirac/gstdiracdec.h
@ -33,10 +33,10 @@ G_BEGIN_DECLS
 #define GST_DIRACDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DIRACDEC,GstDiracDec))
 #define GST_DIRACDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DIRACDEC,GstDiracDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DIRACDEC,GstDiracDecClass))
 #define GST_IS_DIRACDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DIRACDEC))
-#define GST_IS_DIRACDEC_CLASS(obj) \
+#define GST_IS_DIRACDEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRACDEC))

 typedef struct _GstDiracDec GstDiracDec;
--- a/ext/directfb/dfbvideosink.h
+++ b/ext/directfb/dfbvideosink.h
@ -28,9 +28,9 @@ G_BEGIN_DECLS

 #define GST_TYPE_DFBVIDEOSINK              (gst_dfbvideosink_get_type())
 #define GST_DFBVIDEOSINK(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_DFBVIDEOSINK, GstDfbVideoSink))
-#define GST_DFBVIDEOSINK_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_DFBVIDEOSINK, GstDfbVideoSink))
+#define GST_DFBVIDEOSINK_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_DFBVIDEOSINK, GstDfbVideoSinkClass))
 #define GST_IS_DFBVIDEOSINK(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_DFBVIDEOSINK))
-#define GST_IS_DFBVIDEOSINK_CLASS(obj)     (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_DFBVIDEOSINK))
+#define GST_IS_DFBVIDEOSINK_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_DFBVIDEOSINK))

 typedef struct _GstDfbVideoSink GstDfbVideoSink;
 typedef struct _GstDfbVideoSinkClass GstDfbVideoSinkClass;
--- a/ext/divx/gstdivxdec.h
+++ b/ext/divx/gstdivxdec.h
@ -33,10 +33,10 @@ extern "C" {
 #define GST_DIVXDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_DIVXDEC, GstDivxDec))
 #define GST_DIVXDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_DIVXDEC, GstDivxDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_DIVXDEC, GstDivxDecClass))
 #define GST_IS_DIVXDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_DIVXDEC))
-#define GST_IS_DIVXDEC_CLASS(obj) \
+#define GST_IS_DIVXDEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_DIVXDEC))

 typedef struct _GstDivxDec GstDivxDec;
--- a/ext/divx/gstdivxenc.h
+++ b/ext/divx/gstdivxenc.h
@ -32,10 +32,10 @@ extern "C" {
 #define GST_DIVXENC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_DIVXENC, GstDivxEnc))
 #define GST_DIVXENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_DIVXENC, GstDivxEnc))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_DIVXENC, GstDivxEncClass))
 #define GST_IS_DIVXENC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_DIVXENC))
-#define GST_IS_DIVXENC_CLASS(obj) \
+#define GST_IS_DIVXENC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_DIVXENC))

 typedef struct _GstDivxEnc GstDivxEnc;
--- a/ext/dts/gstdtsdec.h
+++ b/ext/dts/gstdtsdec.h
@ -33,7 +33,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DTSDEC,GstDtsDecClass))
 #define GST_IS_DTSDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DTSDEC))
-#define GST_IS_DTSDEC_CLASS(obj) \
+#define GST_IS_DTSDEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DTSDEC))

 typedef struct _GstDtsDec GstDtsDec;
--- a/ext/faac/gstfaac.h
+++ b/ext/faac/gstfaac.h
@ -33,7 +33,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_FAAC, GstFaacClass))
 #define GST_IS_FAAC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_FAAC))
-#define GST_IS_FAAC_CLASS(obj) \
+#define GST_IS_FAAC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_FAAC))

 typedef struct _GstFaac {
--- a/ext/gsm/gstgsmdec.h
+++ b/ext/gsm/gstgsmdec.h
@ -36,10 +36,10 @@ G_BEGIN_DECLS
 #define GST_GSMDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GSMDEC,GstGSMDec))
 #define GST_GSMDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GSMDEC,GstGSMDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GSMDEC,GstGSMDecClass))
 #define GST_IS_GSMDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GSMDEC))
-#define GST_IS_GSMDEC_CLASS(obj) \
+#define GST_IS_GSMDEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GSMDEC))

 typedef struct _GstGSMDec GstGSMDec;
--- a/ext/gsm/gstgsmenc.h
+++ b/ext/gsm/gstgsmenc.h
@ -36,10 +36,10 @@ G_BEGIN_DECLS
 #define GST_GSMENC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GSMENC,GstGSMEnc))
 #define GST_GSMENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GSMENC,GstGSMEnc))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GSMENC,GstGSMEncClass))
 #define GST_IS_GSMENC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GSMENC))
-#define GST_IS_GSMENC_CLASS(obj) \
+#define GST_IS_GSMENC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GSMENC))

 typedef struct _GstGSMEnc GstGSMEnc;
--- a/ext/ivorbis/vorbisenc.h
+++ b/ext/ivorbis/vorbisenc.h
@ -38,7 +38,7 @@ extern "C" {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass))
 #define GST_IS_VORBISENC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC))
-#define GST_IS_VORBISENC_CLASS(obj) \
+#define GST_IS_VORBISENC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC))

 typedef struct _VorbisEnc VorbisEnc;
--- a/ext/libfame/gstlibfame.h
+++ b/ext/libfame/gstlibfame.h
@ -34,10 +34,10 @@ extern "C" {
 #define GST_FAMEENC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FAMEENC,GstFameEnc))
 #define GST_FAMEENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FAMEENC,GstFameEnc))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FAMEENC,GstFameEncClass))
 #define GST_IS_FAMEENC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FAMEENC))
-#define GST_IS_FAMEENC_CLASS(obj) \
+#define GST_IS_FAMEENC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FAMEENC))

 typedef struct _GstFameEnc GstFameEnc;
--- a/ext/nas/nassink.h
+++ b/ext/nas/nassink.h
@ -33,10 +33,10 @@ extern "C" {
 #define GST_NASSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NASSINK,GstNassink))
 #define GST_NASSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NASSINK,GstNassink))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NASSINK,GstNassinkClass))
 #define GST_IS_NASSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NASSINK))
-#define GST_IS_NASSINK_CLASS(obj) \
+#define GST_IS_NASSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NASSINK))

 typedef enum {
--- a/ext/neon/gstneonhttpsrc.h
+++ b/ext/neon/gstneonhttpsrc.h
@ -31,10 +31,10 @@ G_BEGIN_DECLS
 #define GST_NEONHTTP_SRC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NEONHTTP_SRC,GstNeonhttpSrc))
 #define GST_NEONHTTP_SRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NEONHTTP_SRC,GstNeonhttpSrc))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NEONHTTP_SRC,GstNeonhttpSrcClass))
 #define GST_IS_NEONHTTP_SRC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NEONHTTP_SRC))
-#define GST_IS_NEONHTTP_SRC_CLASS(obj) \
+#define GST_IS_NEONHTTP_SRC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NEONHTTP_SRC))

 typedef struct _GstNeonhttpSrc GstNeonhttpSrc;
--- a/ext/polyp/polypsink.h
+++ b/ext/polyp/polypsink.h
@ -16,7 +16,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_POLYPSINK,GstPolypSinkClass))
 #define GST_IS_POLYPSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_POLYPSINK))
-#define GST_IS_POLYPSINK_CLASS(obj) \
+#define GST_IS_POLYPSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_POLYPSINK))

 typedef struct _GstPolypSink GstPolypSink;
--- a/ext/sdl/sdlaudiosink.h
+++ b/ext/sdl/sdlaudiosink.h
@ -28,7 +28,7 @@ G_BEGIN_DECLS
 #define GST_SDLAUDIOSINK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SDLAUDIOSINK,GstSDLAudioSink))
 #define GST_SDLAUDIOSINK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SDLAUDIOSINK,GstSDLAudioSinkClass))
 #define GST_IS_SDLAUDIOSINK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SDLAUDIOSINK))
-#define GST_IS_SDLAUDIOSINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SDLAUDIOSINK))
+#define GST_IS_SDLAUDIOSINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SDLAUDIOSINK))

 typedef struct _GstSDLAudioSink GstSDLAudioSink;
 typedef struct _GstSDLAudioSinkClass GstSDLAudioSinkClass;
--- a/ext/sdl/sdlvideosink.h
+++ b/ext/sdl/sdlvideosink.h
@ -31,10 +31,10 @@ G_BEGIN_DECLS
 #define GST_SDLVIDEOSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SDLVIDEOSINK,GstSDLVideoSink))
 #define GST_SDLVIDEOSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SDLVIDEOSINK,GstSDLVideoSink))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SDLVIDEOSINK,GstSDLVideoSinkClass))
 #define GST_IS_SDLVIDEOSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SDLVIDEOSINK))
-#define GST_IS_SDLVIDEOSINK_CLASS(obj) \
+#define GST_IS_SDLVIDEOSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SDLVIDEOSINK))

 typedef enum {
--- a/ext/shout/gstshout.h
+++ b/ext/shout/gstshout.h
@ -66,10 +66,10 @@ struct _GstIcecastSendClass {
 #define GST_ICECASTSEND(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ICECASTSEND,GstIcecastSend))
 #define GST_ICECASTSEND_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ICECASTSEND,GstIcecastSend))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ICECASTSEND,GstIcecastSendClass))
 #define GST_IS_ICECASTSEND(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ICECASTSEND))
-#define GST_IS_ICECASTSEND_CLASS(obj) \
+#define GST_IS_ICECASTSEND_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ICECASTSEND))

 /* Standard function returning type information. */
--- a/ext/snapshot/gstsnapshot.h
+++ b/ext/snapshot/gstsnapshot.h
@ -35,10 +35,10 @@ extern "C" {
 #define GST_SNAPSHOT(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SNAPSHOT,GstSnapshot))
 #define GST_SNAPSHOT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SNAPSHOT,GstSnapshot))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SNAPSHOT,GstSnapshotClass))
 #define GST_IS_SNAPSHOT(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SNAPSHOT))
-#define GST_IS_SNAPSHOT_CLASS(obj) \
+#define GST_IS_SNAPSHOT_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SNAPSHOT))

 typedef struct _GstSnapshot GstSnapshot;
--- a/ext/sndfile/gstsf.h
+++ b/ext/sndfile/gstsf.h
@ -37,7 +37,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SF,GstSFClass))
 #define GST_IS_SF(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SF))
-#define GST_IS_SF_CLASS(obj) \
+#define GST_IS_SF_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SF))

 #define GST_TYPE_SFSRC \
@ -48,7 +48,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SFSRC,GstSFClass))
 #define GST_IS_SFSRC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SFSRC))
-#define GST_IS_SFSRC_CLASS(obj) \
+#define GST_IS_SFSRC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SFSRC))

 #define GST_TYPE_SFSINK \
@ -59,7 +59,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SFSINK,GstSFClass))
 #define GST_IS_SFSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SFSINK))
-#define GST_IS_SFSINK_CLASS(obj) \
+#define GST_IS_SFSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SFSINK))

 typedef struct _GstSF GstSF;
--- a/ext/swfdec/gstswfdec.h
+++ b/ext/swfdec/gstswfdec.h
@ -34,10 +34,10 @@ G_BEGIN_DECLS
 #define GST_SWFDEC(obj)						\
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SWFDEC,GstSwfdec))
 #define GST_SWFDEC_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SWFDEC,GstSwfdec))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SWFDEC,GstSwfdecClass))
 #define GST_IS_SWFDEC(obj)				\
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SWFDEC))
-#define GST_IS_SWFDEC_CLASS(obj)			\
+#define GST_IS_SWFDEC_CLASS(klass)			\
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SWFDEC))

 typedef struct _GstSwfdec GstSwfdec;
--- a/ext/tarkin/gsttarkindec.h
+++ b/ext/tarkin/gsttarkindec.h
@ -38,7 +38,7 @@ extern "C" {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TARKINDEC,TarkinDecClass))
 #define GST_IS_TARKINDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TARKINDEC))
-#define GST_IS_TARKINDEC_CLASS(obj) \
+#define GST_IS_TARKINDEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TARKINDEC))

 typedef struct _TarkinDec TarkinDec;
--- a/ext/tarkin/gsttarkinenc.h
+++ b/ext/tarkin/gsttarkinenc.h
@ -38,7 +38,7 @@ extern "C" {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TARKINENC,TarkinEncClass))
 #define GST_IS_TARKINENC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TARKINENC))
-#define GST_IS_TARKINENC_CLASS(obj) \
+#define GST_IS_TARKINENC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TARKINENC))

 typedef struct _TarkinEnc TarkinEnc;
--- a/ext/theora/theoradec.h
+++ b/ext/theora/theoradec.h
@ -36,10 +36,10 @@ G_BEGIN_DECLS
 #define GST_THEORA_DEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_THEORA_DEC,GstTheoraExpDec))
 #define GST_THEORA_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_THEORA_DEC,GstTheoraExpDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_THEORA_DEC,GstTheoraExpDecClass))
 #define GST_IS_THEORA_DEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_THEORA_DEC))
-#define GST_IS_THEORA_DEC_CLASS(obj) \
+#define GST_IS_THEORA_DEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_THEORA_DEC))

 typedef struct _GstTheoraExpDec GstTheoraExpDec;
--- a/ext/wavpack/gstwavpackdec.h
+++ b/ext/wavpack/gstwavpackdec.h
@ -34,10 +34,10 @@ G_BEGIN_DECLS
 #define GST_WAVPACK_DEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_WAVPACK_DEC,GstWavpackDec))
 #define GST_WAVPACK_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WAVPACK_DEC,GstWavpackDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WAVPACK_DEC,GstWavpackDecClass))
 #define GST_IS_WAVPACK_DEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_DEC))
-#define GST_IS_WAVPACK_DEC_CLASS(obj) \
+#define GST_IS_WAVPACK_DEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_DEC))

 typedef struct _GstWavpackDec      GstWavpackDec;
--- a/ext/wavpack/gstwavpackparse.h
+++ b/ext/wavpack/gstwavpackparse.h
@ -32,10 +32,10 @@ G_BEGIN_DECLS
 #define GST_WAVPACK_PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_WAVPACK_PARSE,GstWavpackParse))
 #define GST_WAVPACK_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WAVPACK_PARSE,GstWavpackParse))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WAVPACK_PARSE,GstWavpackParseClass))
 #define GST_IS_WAVPACK_PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_PARSE))
-#define GST_IS_WAVPACK_PARSE_CLASS(obj) \
+#define GST_IS_WAVPACK_PARSE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_PARSE))

 typedef struct _GstWavpackParse           GstWavpackParse;
--- a/ext/xine/gstxine.h
+++ b/ext/xine/gstxine.h
@ -30,7 +30,7 @@ G_BEGIN_DECLS
  (gst_xine_get_type())
 #define GST_XINE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_XINE,GstXine))
-#define GST_XINE_GET_CLASS(obj) \
+#define GST_XINE_GET_CLASS(klass) \
  (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_XINE, GstXineClass))
 #define GST_XINE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_XINE,GstXineClass))
--- a/ext/xvid/gstxviddec.h
+++ b/ext/xvid/gstxviddec.h
@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #define GST_XVIDDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_XVIDDEC, GstXvidDec))
 #define GST_XVIDDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_XVIDDEC, GstXvidDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_XVIDDEC, GstXvidDecClass))
 #define GST_IS_XVIDDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_XVIDDEC))
-#define GST_IS_XVIDDEC_CLASS(obj) \
+#define GST_IS_XVIDDEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_XVIDDEC))

 typedef struct _GstXvidDec GstXvidDec;
--- a/ext/xvid/gstxvidenc.h
+++ b/ext/xvid/gstxvidenc.h
@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #define GST_XVIDENC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_XVIDENC, GstXvidEnc))
 #define GST_XVIDENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_XVIDENC, GstXvidEnc))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_XVIDENC, GstXvidEncClass))
 #define GST_IS_XVIDENC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_XVIDENC))
-#define GST_IS_XVIDENC_CLASS(obj) \
+#define GST_IS_XVIDENC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_XVIDENC))

 typedef struct _GstXvidEnc GstXvidEnc;
--- a/gst/cdxaparse/gstcdxaparse.h
+++ b/gst/cdxaparse/gstcdxaparse.h
@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #define GST_CDXA_PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CDXA_PARSE,GstCDXAParse))
 #define GST_CDXA_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CDXA_PARSE,GstCDXAParse))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CDXA_PARSE,GstCDXAParseClass))
 #define GST_IS_CDXA_PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CDXA_PARSE))
-#define GST_IS_CDXA_PARSE_CLASS(obj) \
+#define GST_IS_CDXA_PARSE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CDXA_PARSE))

 typedef enum {
--- a/gst/cdxaparse/gstcdxastrip.h
+++ b/gst/cdxaparse/gstcdxastrip.h
@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #define GST_CDXASTRIP(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CDXASTRIP,GstCDXAStrip))
 #define GST_CDXASTRIP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CDXASTRIP,GstCDXAStrip))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CDXASTRIP,GstCDXAStripClass))
 #define GST_IS_CDXASTRIP(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CDXASTRIP))
-#define GST_IS_CDXASTRIP_CLASS(obj) \
+#define GST_IS_CDXASTRIP_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CDXASTRIP))

 #define GST_CDXA_SECTOR_SIZE    2352
--- a/gst/cdxaparse/gstvcdparse.h
+++ b/gst/cdxaparse/gstvcdparse.h
@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #define GST_CDXASTRIP(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CDXASTRIP,GstCDXAStrip))
 #define GST_CDXASTRIP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CDXASTRIP,GstCDXAStrip))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CDXASTRIP,GstCDXAStripClass))
 #define GST_IS_CDXASTRIP(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CDXASTRIP))
-#define GST_IS_CDXASTRIP_CLASS(obj) \
+#define GST_IS_CDXASTRIP_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CDXASTRIP))

 #define GST_CDXA_SECTOR_SIZE    2352
--- a/gst/colorspace/gstcolorspace.h
+++ b/gst/colorspace/gstcolorspace.h
@ -34,7 +34,7 @@ G_BEGIN_DECLS
  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_COLORSPACE,GstColorspaceClass))
 #define GST_IS_COLORSPACE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COLORSPACE))
-#define GST_IS_COLORSPACE_CLASS(obj) \
+#define GST_IS_COLORSPACE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COLORSPACE))

 typedef struct _GstColorspace GstColorspace;
--- a/gst/festival/gstfestival.h
+++ b/gst/festival/gstfestival.h
@ -87,10 +87,10 @@ typedef struct FT_Info
 #define GST_FESTIVAL(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FESTIVAL,GstFestival))
 #define GST_FESTIVAL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FESTIVAL,GstFestival))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FESTIVAL,GstFestivalClass))
 #define GST_IS_FESTIVAL(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FESTIVAL))
-#define GST_IS_FESTIVAL_CLASS(obj) \
+#define GST_IS_FESTIVAL_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FESTIVAL))

 typedef enum {
--- a/gst/freeze/gstfreeze.h
+++ b/gst/freeze/gstfreeze.h
@ -25,7 +25,7 @@ G_BEGIN_DECLS
 #define GST_FREEZE(obj)							\
  (G_TYPE_CHECK_INSTANCE_CAST (obj, GST_TYPE_FREEZE, GstFreeze))
 #define GST_FREEZE_CLASS(klass)					\
-  (G_TYPE_CHECK_CLASS_CAST (klass, GST_TYPE_FREEZE, GstFreeze))
+  (G_TYPE_CHECK_CLASS_CAST (klass, GST_TYPE_FREEZE, GstFreezeClass))
 #define GST_IS_FREEZE(obj)				\
  (G_TYPE_CHECK_INSTANCE_TYPE (obj, GST_TYPE_FREEZE))
 #define GST_IS_FREEZE_CLASS(klass)			\
--- a/gst/gdp/gstgdpdepay.h
+++ b/gst/gdp/gstgdpdepay.h
@ -30,10 +30,10 @@ G_BEGIN_DECLS
 #define GST_GDP_DEPAY(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDP_DEPAY,GstGDPDepay))
 #define GST_GDP_DEPAY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDP_DEPAY,GstGDPDepay))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDP_DEPAY,GstGDPDepayClass))
 #define GST_IS_GDP_DEPAY(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDP_DEPAY))
-#define GST_IS_GDP_DEPAY_CLASS(obj) \
+#define GST_IS_GDP_DEPAY_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDP_DEPAY))

 typedef enum {
--- a/gst/gdp/gstgdppay.h
+++ b/gst/gdp/gstgdppay.h
@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #define GST_GDP_PAY(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDP_PAY,GstGDPPay))
 #define GST_GDP_PAY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDP_PAY,GstGDPPay))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDP_PAY,GstGDPPayClass))
 #define GST_IS_GDP_PAY(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDP_PAY))
-#define GST_IS_GDP_PAY_CLASS(obj) \
+#define GST_IS_GDP_PAY_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDP_PAY))

 typedef struct _GstGDPPay GstGDPPay;
--- a/gst/modplug/gstmodplug.h
+++ b/gst/modplug/gstmodplug.h
@ -31,10 +31,10 @@ G_BEGIN_DECLS
 #define GST_MODPLUG(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MODPLUG,GstModPlug))
 #define GST_MODPLUG_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MODPLUG,GstModPlug))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MODPLUG,GstModPlugClass))
 #define GST_IS_MODPLUG(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MODPLUG))
-#define GST_IS_MODPLUG_CLASS(obj) \
+#define GST_IS_MODPLUG_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MODPLUG))
  
 struct _GstModPlug {
--- a/gst/mpeg1sys/gstmpeg1systemencode.h
+++ b/gst/mpeg1sys/gstmpeg1systemencode.h
@ -38,10 +38,10 @@ extern "C" {
 #define GST_SYSTEM_ENCODE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SYSTEM_ENCODE,GstMPEG1SystemEncode))
 #define GST_SYSTEM_ENCODE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SYSTEM_ENCODE,GstMPEG1SystemEncode))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SYSTEM_ENCODE,GstMPEG1SystemEncodeClass))
 #define GST_IS_SYSTEM_ENCODE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SYSTEM_ENCODE))
-#define GST_IS_SYSTEM_ENCODE_CLASS(obj) \
+#define GST_IS_SYSTEM_ENCODE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SYSTEM_ENCODE))

 typedef struct _GstMPEG1SystemEncode GstMPEG1SystemEncode;
--- a/gst/mpeg1videoparse/gstmp1videoparse.h
+++ b/gst/mpeg1videoparse/gstmp1videoparse.h
@ -35,10 +35,10 @@ extern "C" {
 #define GST_MP1VIDEOPARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MP1VIDEOPARSE,Mp1VideoParse))
 #define GST_MP1VIDEOPARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MP1VIDEOPARSE,Mp1VideoParse))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MP1VIDEOPARSE,Mp1VideoParseClass))
 #define GST_IS_MP1VIDEOPARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MP1VIDEOPARSE))
-#define GST_IS_MP1VIDEOPARSE_CLASS(obj) \
+#define GST_IS_MP1VIDEOPARSE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MP1VIDEOPARSE))

 typedef struct _Mp1VideoParse Mp1VideoParse;
--- a/gst/mpeg2sub/gstmpeg2subt.h
+++ b/gst/mpeg2sub/gstmpeg2subt.h
@ -35,10 +35,10 @@ extern "C" {
 #define GST_MPEG2SUBT(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MPEG2SUBT,GstMpeg2Subt))
 #define GST_MPEG2SUBT_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEG2SUBT,GstMpeg2Subt))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEG2SUBT,GstMpeg2SubtClass))
 #define GST_IS_MPEG2SUBT(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MPEG2SUBT))
-#define GST_IS_MPEG2SUBT_CLASS(obj) \
+#define GST_IS_MPEG2SUBT_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MPEG2SUBT))

 typedef struct _GstMpeg2Subt GstMpeg2Subt;
--- a/gst/mpegaudioparse/gstmpegaudioparse.h
+++ b/gst/mpegaudioparse/gstmpegaudioparse.h
@ -31,10 +31,10 @@ G_BEGIN_DECLS
 #define GST_MP3PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MP3PARSE,GstMPEGAudioParse))
 #define GST_MP3PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MP3PARSE,GstMPEGAudioParse))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MP3PARSE,GstMPEGAudioParseClass))
 #define GST_IS_MP3PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MP3PARSE))
-#define GST_IS_MP3PARSE_CLASS(obj) \
+#define GST_IS_MP3PARSE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MP3PARSE))

 typedef struct _GstMPEGAudioParse GstMPEGAudioParse;
--- a/gst/multifilesink/gstmultifilesink.h
+++ b/gst/multifilesink/gstmultifilesink.h
@ -37,7 +37,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTIFILESINK,GstMultiFileSinkClass))
 #define GST_IS_MULTIFILESINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTIFILESINK))
-#define GST_IS_MULTIFILESINK_CLASS(obj) \
+#define GST_IS_MULTIFILESINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIFILESINK))

 typedef struct _GstMultiFileSink GstMultiFileSink;
--- a/gst/overlay/gstoverlay.h
+++ b/gst/overlay/gstoverlay.h
@ -28,10 +28,10 @@
 #define GST_OVERLAY(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OVERLAY,GstOverlay))
 #define GST_OVERLAY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OVERLAY,GstOverlay))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OVERLAY,GstOverlayClass))
 #define GST_IS_OVERLAY(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OVERLAY))
-#define GST_IS_OVERLAY_CLASS(obj) \
+#define GST_IS_OVERLAY_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OVERLAY))

 typedef struct _GstOverlay GstOverlay;
--- a/gst/playondemand/gstplayondemand.h
+++ b/gst/playondemand/gstplayondemand.h
@ -35,10 +35,10 @@ G_BEGIN_DECLS
 #define GST_PLAYONDEMAND(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PLAYONDEMAND,GstPlayOnDemand))
 #define GST_PLAYONDEMAND_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PLAYONDEMAND,GstPlayOnDemand))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PLAYONDEMAND,GstPlayOnDemandClass))
 #define GST_IS_PLAYONDEMAND(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PLAYONDEMAND))
-#define GST_IS_PLAYONDEMAND_CLASS(obj) \
+#define GST_IS_PLAYONDEMAND_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAYONDEMAND))

 typedef struct _GstPlayOnDemand       GstPlayOnDemand;
--- a/gst/qtdemux/qtdemux.h
+++ b/gst/qtdemux/qtdemux.h
@ -31,10 +31,10 @@ G_BEGIN_DECLS
 #define GST_QTDEMUX(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_QTDEMUX,GstQTDemux))
 #define GST_QTDEMUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_QTDEMUX,GstQTDemux))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_QTDEMUX,GstQTDemuxClass))
 #define GST_IS_QTDEMUX(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_QTDEMUX))
-#define GST_IS_QTDEMUX_CLASS(obj) \
+#define GST_IS_QTDEMUX_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_QTDEMUX))

 #define GST_QTDEMUX_MAX_STREAMS         8
--- a/gst/rtjpeg/gstrtjpegdec.h
+++ b/gst/rtjpeg/gstrtjpegdec.h
@ -35,10 +35,10 @@ extern "C" {
 #define GST_RTJPEGDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTJPEGDEC,GstRTJpegDec))
 #define GST_RTJPEGDEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTJPEGDEC,GstRTJpegDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTJPEGDEC,GstRTJpegDecClass))
 #define GST_IS_RTJPEGDEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTJPEGDEC))
-#define GST_IS_RTJPEGDEC_CLASS(obj) \
+#define GST_IS_RTJPEGDEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTJPEGDEC)))

 typedef struct _GstRTJpegDec GstRTJpegDec;
--- a/gst/rtjpeg/gstrtjpegenc.h
+++ b/gst/rtjpeg/gstrtjpegenc.h
@ -37,10 +37,10 @@ extern "C" {
 #define GST_RTJPEGENC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTJPEGENC,GstRTJpegEnc))
 #define GST_RTJPEGENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTJPEGENC,GstRTJpegEnc))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTJPEGENC,GstRTJpegEncClass))
 #define GST_IS_RTJPEGENC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTJPEGENC))
-#define GST_IS_RTJPEGENC_CLASS(obj) \
+#define GST_IS_RTJPEGENC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTJPEGENC))

 typedef struct _GstRTJpegEnc GstRTJpegEnc;
--- a/gst/smooth/gstsmooth.h
+++ b/gst/smooth/gstsmooth.h
@ -34,10 +34,10 @@ extern "C" {
 #define GST_SMOOTH(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SMOOTH,GstSmooth))
 #define GST_SMOOTH_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SMOOTH,GstSmooth))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SMOOTH,GstSmoothClass))
 #define GST_IS_SMOOTH(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SMOOTH))
-#define GST_IS_SMOOTH_CLASS(obj) \
+#define GST_IS_SMOOTH_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SMOOTH))

 typedef struct _GstSmooth GstSmooth;
--- a/gst/smoothwave/gstsmoothwave.h
+++ b/gst/smoothwave/gstsmoothwave.h
@ -35,10 +35,10 @@ extern "C"
 #define GST_SMOOTHWAVE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SMOOTHWAVE,GstSmoothWave))
 #define GST_SMOOTHWAVE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SMOOTHWAVE,GstSmoothWave))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SMOOTHWAVE,GstSmoothWaveClass))
 #define GST_IS_SMOOTHWAVE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SMOOTHWAVE))
-#define GST_IS_SMOOTHWAVE_CLASS(obj) \
+#define GST_IS_SMOOTHWAVE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SMOOTHWAVE))

  typedef struct _GstSmoothWave GstSmoothWave;
--- a/gst/spectrum/gstspectrum.h
+++ b/gst/spectrum/gstspectrum.h
@ -33,7 +33,7 @@ extern "C" {
 #define GST_TYPE_SPECTRUM            (gst_spectrum_get_type())
 #define GST_SPECTRUM(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SPECTRUM,GstSpectrum))
 #define GST_IS_SPECTRUM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SPECTRUM))
-#define GST_SPECTRUM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_SPECTRUM,GstSpectrum))
+#define GST_SPECTRUM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_SPECTRUM,GstSpectrumClass))
 #define GST_IS_SPECTRUM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_SPECTRUM))

 typedef struct _GstSpectrum GstSpectrum;
--- a/gst/speed/gstspeed.h
+++ b/gst/speed/gstspeed.h
@ -31,10 +31,10 @@ G_BEGIN_DECLS
 #define GST_SPEED(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SPEED,GstSpeed))
 #define GST_SPEED_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SPEED,GstSpeed))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SPEED,GstSpeedClass))
 #define GST_IS_SPEED(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SPEED))
-#define GST_IS_SPEED_CLASS(obj) \
+#define GST_IS_SPEED_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPEED))

 typedef struct _GstSpeed GstSpeed;
--- a/gst/stereo/gststereo.h
+++ b/gst/stereo/gststereo.h
@ -35,10 +35,10 @@ extern "C" {
 #define GST_STEREO(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_STEREO,GstStereo))
 #define GST_STEREO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_STEREO,GstStereo))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_STEREO,GstStereoClass))
 #define GST_IS_STEREO(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_STEREO))
-#define GST_IS_STEREO_CLASS(obj) \
+#define GST_IS_STEREO_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_STEREO))

 typedef struct _GstStereo GstStereo;
--- a/gst/switch/gstswitch.h
+++ b/gst/switch/gstswitch.h
@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #define GST_SWITCH(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_SWITCH, GstSwitch))
 #define GST_SWITCH_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_SWITCH, GstSwitch))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_SWITCH, GstSwitchClass))
 #define GST_IS_SWITCH(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_SWITCH))
-#define GST_IS_SWITCH_CLASS(obj) \
+#define GST_IS_SWITCH_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_SWITCH))

 typedef struct _GstSwitchPad GstSwitchPad;
--- a/gst/tta/gstttadec.h
+++ b/gst/tta/gstttadec.h
@ -34,10 +34,10 @@ G_BEGIN_DECLS
 #define GST_TTA_DEC(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TTA_DEC,GstTtaDec))
 #define GST_TTA_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TTA_DEC,GstTtaDec))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TTA_DEC,GstTtaDecClass))
 #define GST_IS_TTA_DEC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TTA_DEC))
-#define GST_IS_TTA_DEC_CLASS(obj) \
+#define GST_IS_TTA_DEC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TTA_DEC))

 typedef struct _GstTtaDec      GstTtaDec;
--- a/gst/tta/gstttaparse.h
+++ b/gst/tta/gstttaparse.h
@ -32,10 +32,10 @@ G_BEGIN_DECLS
 #define GST_TTA_PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TTA_PARSE,GstTtaParse))
 #define GST_TTA_PARSE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TTA_PARSE,GstTtaParse))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TTA_PARSE,GstTtaParseClass))
 #define GST_IS_TTA_PARSE(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TTA_PARSE))
-#define GST_IS_TTA_PARSE_CLASS(obj) \
+#define GST_IS_TTA_PARSE_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TTA_PARSE))

 typedef struct _GstTtaParse      GstTtaParse;
--- a/gst/videodrop/gstvideodrop.h
+++ b/gst/videodrop/gstvideodrop.h
@ -29,10 +29,10 @@ G_BEGIN_DECLS
 #define GST_VIDEODROP(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEODROP,GstVideodrop))
 #define GST_VIDEODROP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEODROP,GstVideodrop))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEODROP,GstVideodropClass))
 #define GST_IS_VIDEODROP(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEODROP))
-#define GST_IS_VIDEODROP_CLASS(obj) \
+#define GST_IS_VIDEODROP_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEODROP))

 typedef struct _GstVideodrop GstVideodrop;
--- a/gst/xingheader/gstxingmux.h
+++ b/gst/xingheader/gstxingmux.h
@ -45,7 +45,7 @@ typedef struct _GstXingMuxClass {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_XING_MUX,GstXingMuxClass))
 #define GST_IS_XING_MUX(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_XING_MUX))
-#define GST_IS_XING_MUX_CLASS(obj) \
+#define GST_IS_XING_MUX_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_XING_MUX))

 /* Standard function returning type information. */
--- a/sys/directdraw/gstdirectdrawsink.h
+++ b/sys/directdraw/gstdirectdrawsink.h
@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define GST_DIRECTDRAW_SINK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DIRECTDRAW_SINK,GstDirectDrawSink))
 #define GST_DIRECTDRAW_SINK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DIRECTDRAW_SINK,GstDirectDrawSinkClass))
 #define GST_IS_DIRECTDRAW_SINK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DIRECTDRAW_SINK))
-#define GST_IS_DIRECTDRAW_SINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRECTDRAW_SINK))
+#define GST_IS_DIRECTDRAW_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRECTDRAW_SINK))
 typedef struct _GstDirectDrawSink GstDirectDrawSink;
 typedef struct _GstDirectDrawSinkClass GstDirectDrawSinkClass;

--- a/sys/directsound/gstdirectsoundsink.h
+++ b/sys/directsound/gstdirectsoundsink.h
@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define GST_DIRECTSOUND_SINK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DIRECTSOUND_SINK,GstDirectSoundSink))
 #define GST_DIRECTSOUND_SINK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DIRECTSOUND_SINK,GstDirectSoundSinkClass))
 #define GST_IS_DIRECTSOUND_SINK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DIRECTSOUND_SINK))
-#define GST_IS_DIRECTSOUND_SINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRECTSOUND_SINK))
+#define GST_IS_DIRECTSOUND_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRECTSOUND_SINK))
 typedef struct _GstDirectSoundSink GstDirectSoundSink;
 typedef struct _GstDirectSoundSinkClass GstDirectSoundSinkClass;

--- a/sys/dxr3/dxr3audiosink.h
+++ b/sys/dxr3/dxr3audiosink.h
@ -37,7 +37,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXR3AUDIOSINK,Dxr3AudioSinkClass))
 #define GST_IS_DXR3AUDIOSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXR3AUDIOSINK))
-#define GST_IS_DXR3AUDIOSINK_CLASS(obj) \
+#define GST_IS_DXR3AUDIOSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXR3AUDIOSINK))


--- a/sys/dxr3/dxr3spusink.h
+++ b/sys/dxr3/dxr3spusink.h
@ -35,7 +35,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXR3SPUSINK,Dxr3SpuSinkClass))
 #define GST_IS_DXR3SPUSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXR3SPUSINK))
-#define GST_IS_DXR3SPUSINK_CLASS(obj) \
+#define GST_IS_DXR3SPUSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXR3SPUSINK))


--- a/sys/dxr3/dxr3videosink.h
+++ b/sys/dxr3/dxr3videosink.h
@ -35,7 +35,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DXR3VIDEOSINK,Dxr3VideoSinkClass))
 #define GST_IS_DXR3VIDEOSINK(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DXR3VIDEOSINK))
-#define GST_IS_DXR3VIDEOSINK_CLASS(obj) \
+#define GST_IS_DXR3VIDEOSINK_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DXR3VIDEOSINK))


--- a/sys/qcam/gstqcamsrc.h
+++ b/sys/qcam/gstqcamsrc.h
@ -40,7 +40,7 @@ extern "C" {
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_QCAMSRC,GstQCamSrcClass))
 #define GST_IS_QCAMSRC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_QCAMSRC))
-#define GST_IS_QCAMSRC_CLASS(obj) \
+#define GST_IS_QCAMSRC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_QCAMSRC))

 /* NOTE: per-element flags start with 16 for now */
--- a/sys/vcd/vcdsrc.h
+++ b/sys/vcd/vcdsrc.h
@ -36,7 +36,7 @@ G_BEGIN_DECLS
  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VCDSRC,GstVCDSrcClass))
 #define GST_IS_VCDSRC(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VCDSRC))
-#define GST_IS_VCDSRC_CLASS(obj) \
+#define GST_IS_VCDSRC_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VCDSRC))

 /* NOTE: per-element flags start with 16 for now */