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

39 files changed, 69 insertions, 69 deletions

diff --git a/ext/alsaspdif/alsaspdifsink.h b/ext/alsaspdif/alsaspdifsink.h
index 020a1581..925b1f77 100644
--- 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())
 
diff --git a/ext/amrwb/gstamrwbdec.h b/ext/amrwb/gstamrwbdec.h
index 854c741f..dd8c36ed 100644
--- 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;
diff --git a/ext/amrwb/gstamrwbenc.h b/ext/amrwb/gstamrwbenc.h
index e1788102..90e46d18 100644
--- 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;
diff --git a/ext/amrwb/gstamrwbparse.h b/ext/amrwb/gstamrwbparse.h
index d2da5741..27009732 100644
--- 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;
diff --git a/ext/arts/gst_arts.h b/ext/arts/gst_arts.h
index cf0ead06..fad6d7d1 100644
--- 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;
diff --git a/ext/artsd/gstartsdsink.h b/ext/artsd/gstartsdsink.h
index 64b3a2a2..3f330982 100644
--- 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 {
diff --git a/ext/audiofile/gstafparse.h b/ext/audiofile/gstafparse.h
index 08539f1e..bece5126 100644
--- 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;
diff --git a/ext/audiofile/gstafsink.h b/ext/audiofile/gstafsink.h
index 6e5379a9..150e81d1 100644
--- 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;
diff --git a/ext/audiofile/gstafsrc.h b/ext/audiofile/gstafsrc.h
index ae55bb8d..785a0a68 100644
--- 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;
diff --git a/ext/audioresample/gstaudioresample.h b/ext/audioresample/gstaudioresample.h
index fc5115da..86fe048e 100644
--- 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;
diff --git a/ext/bz2/gstbz2dec.h b/ext/bz2/gstbz2dec.h
index ce6cda36..478721ca 100644
--- 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;
diff --git a/ext/bz2/gstbz2enc.h b/ext/bz2/gstbz2enc.h
index aa520056..2b264e65 100644
--- 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;
diff --git a/ext/dirac/gstdiracdec.h b/ext/dirac/gstdiracdec.h
index 88adc513..45c29807 100644
--- 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;
diff --git a/ext/directfb/dfbvideosink.h b/ext/directfb/dfbvideosink.h
index 9bdfbf48..b83df381 100644
--- 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;
diff --git a/ext/divx/gstdivxdec.h b/ext/divx/gstdivxdec.h
index 90c47037..24819ebc 100644
--- 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;
diff --git a/ext/divx/gstdivxenc.h b/ext/divx/gstdivxenc.h
index 0d5cad05..b7bc1691 100644
--- 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;
diff --git a/ext/dts/gstdtsdec.h b/ext/dts/gstdtsdec.h
index 48283b05..f89017d9 100644
--- 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;
diff --git a/ext/faac/gstfaac.h b/ext/faac/gstfaac.h
index 4a17e108..d69d4d4c 100644
--- 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 {
diff --git a/ext/gsm/gstgsmdec.h b/ext/gsm/gstgsmdec.h
index 7e73cccf..eb790ced 100644
--- 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;
diff --git a/ext/gsm/gstgsmenc.h b/ext/gsm/gstgsmenc.h
index af30c80c..ba3b089b 100644
--- 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;
diff --git a/ext/ivorbis/vorbisenc.h b/ext/ivorbis/vorbisenc.h
index fe44be34..21908275 100644
--- 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;
diff --git a/ext/libfame/gstlibfame.h b/ext/libfame/gstlibfame.h
index 15affdaf..27c97617 100644
--- 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;
diff --git a/ext/nas/nassink.h b/ext/nas/nassink.h
index e94a6e68..c05ec28a 100644
--- 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 {
diff --git a/ext/neon/gstneonhttpsrc.h b/ext/neon/gstneonhttpsrc.h
index 4f20e0ef..6cdcf550 100644
--- 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;
diff --git a/ext/polyp/polypsink.h b/ext/polyp/polypsink.h
index 3bcb454d..d67da870 100644
--- 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;
diff --git a/ext/sdl/sdlaudiosink.h b/ext/sdl/sdlaudiosink.h
index 646a7747..8532f3ff 100644
--- a/ext/sdl/sdlaudiosink.h
+++ b/ext/sdl/sdlaudiosink.h
@@ -24,11 +24,11 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_SDLAUDIOSINK          (gst_sdlaudio_sink_get_type())
-#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_TYPE_SDLAUDIOSINK            (gst_sdlaudio_sink_get_type())
+#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(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SDLAUDIOSINK))
 
 typedef struct _GstSDLAudioSink GstSDLAudioSink;
 typedef struct _GstSDLAudioSinkClass GstSDLAudioSinkClass;
diff --git a/ext/sdl/sdlvideosink.h b/ext/sdl/sdlvideosink.h
index 2d52fed2..b7e13c0b 100644
--- 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 {
diff --git a/ext/shout/gstshout.h b/ext/shout/gstshout.h
index 129fcba8..3656f33d 100644
--- 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. */
diff --git a/ext/snapshot/gstsnapshot.h b/ext/snapshot/gstsnapshot.h
index 0ca1fb93..93e29308 100644
--- 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;
diff --git a/ext/sndfile/gstsf.h b/ext/sndfile/gstsf.h
index c415ff85..8af46a7e 100644
--- 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;
diff --git a/ext/swfdec/gstswfdec.h b/ext/swfdec/gstswfdec.h
index 66e68eff..40c074be 100644
--- 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;
diff --git a/ext/tarkin/gsttarkindec.h b/ext/tarkin/gsttarkindec.h
index 8651da16..41e55a1b 100644
--- 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;
diff --git a/ext/tarkin/gsttarkinenc.h b/ext/tarkin/gsttarkinenc.h
index 61b02e9a..3c733b0e 100644
--- 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;
diff --git a/ext/theora/theoradec.h b/ext/theora/theoradec.h
index 07cae5ae..423c9131 100644
--- 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;
diff --git a/ext/wavpack/gstwavpackdec.h b/ext/wavpack/gstwavpackdec.h
index 1f4a3835..0d8459e7 100644
--- 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;
diff --git a/ext/wavpack/gstwavpackparse.h b/ext/wavpack/gstwavpackparse.h
index 99f3a89a..9e6c334d 100644
--- 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;
diff --git a/ext/xine/gstxine.h b/ext/xine/gstxine.h
index 5c320872..9269d14f 100644
--- 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))
diff --git a/ext/xvid/gstxviddec.h b/ext/xvid/gstxviddec.h
index fb128354..4b465d26 100644
--- 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;
diff --git a/ext/xvid/gstxvidenc.h b/ext/xvid/gstxvidenc.h
index 9bdac5cb..963c16ab 100644
--- 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;