diff --git a/ChangeLog b/ChangeLog index 84a4e68a0f..d14a2ad756 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2006-06-02 Stefan Kost + + * ext/a52dec/gsta52dec.h: + * ext/amrnb/amrnbdec.h: + * ext/amrnb/amrnbenc.h: + * ext/amrnb/amrnbparse.h: + * ext/mpeg2dec/gstmpeg2dec.h: + * ext/sidplay/gstsiddec.h: + * gst/ac3parse/gstac3parse.h: + * gst/asfdemux/gstasfdemux.h: + * gst/asfdemux/gstasfmux.h: + * gst/dvdlpcmdec/gstdvdlpcmdec.h: + * gst/iec958/ac3iec.h: + * gst/mpegaudioparse/gstmpegaudioparse.h: + * gst/mpegstream/gstdvddemux.h: + * gst/mpegstream/gstmpegclock.h: + * gst/mpegstream/gstmpegdemux.h: + * gst/mpegstream/gstmpegparse.h: + Fix more gobject macros: obj<->klass, GstXXX<->GstXXXClass + 2006-05-27 Tim-Philipp Müller * README: diff --git a/common b/common index 764c5f2510..80b4e2c087 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 764c5f25101d20da7f26942c36ba840ba65c63d7 +Subproject commit 80b4e2c08717159760ebaa40715f8919b3f77ba9 diff --git a/ext/a52dec/gsta52dec.h b/ext/a52dec/gsta52dec.h index 51aa6078e4..2370de4cd9 100644 --- a/ext/a52dec/gsta52dec.h +++ b/ext/a52dec/gsta52dec.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_A52DEC,GstA52DecClass)) #define GST_IS_A52DEC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_A52DEC)) -#define GST_IS_A52DEC_CLASS(obj) \ +#define GST_IS_A52DEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_A52DEC)) typedef struct _GstA52Dec GstA52Dec; diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h index 8f89a95e1c..9cf94dcee8 100644 --- a/ext/amrnb/amrnbdec.h +++ b/ext/amrnb/amrnbdec.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define GST_AMRNBDEC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRNBDEC, GstAmrnbDec)) #define GST_AMRNBDEC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRNBDEC, GstAmrnbDec)) + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRNBDEC, GstAmrnbDecClass)) #define GST_IS_AMRNBDEC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRNBDEC)) -#define GST_IS_AMRNBDEC_CLASS(obj) \ +#define GST_IS_AMRNBDEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRNBDEC)) typedef struct _GstAmrnbDec GstAmrnbDec; diff --git a/ext/amrnb/amrnbenc.h b/ext/amrnb/amrnbenc.h index be602a205f..b441dca3da 100644 --- a/ext/amrnb/amrnbenc.h +++ b/ext/amrnb/amrnbenc.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define GST_AMRNBENC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRNBENC, GstAmrnbEnc)) #define GST_AMRNBENC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRNBENC, GstAmrnbEnc)) + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRNBENC, GstAmrnbEncClass)) #define GST_IS_AMRNBENC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRNBENC)) -#define GST_IS_AMRNBENC_CLASS(obj) \ +#define GST_IS_AMRNBENC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRNBENC)) typedef struct _GstAmrnbEnc GstAmrnbEnc; diff --git a/ext/amrnb/amrnbparse.h b/ext/amrnb/amrnbparse.h index 21f752b4ff..9b609a4d41 100644 --- a/ext/amrnb/amrnbparse.h +++ b/ext/amrnb/amrnbparse.h @@ -30,10 +30,10 @@ G_BEGIN_DECLS #define GST_AMRNBPARSE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_AMRNBPARSE, GstAmrnbParse)) #define GST_AMRNBPARSE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRNBPARSE, GstAmrnbParse)) + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_AMRNBPARSE, GstAmrnbParseClass)) #define GST_IS_AMRNBPARSE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_AMRNBPARSE)) -#define GST_IS_AMRNBPARSE_CLASS(obj) \ +#define GST_IS_AMRNBPARSE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_AMRNBPARSE)) typedef struct _GstAmrnbParse GstAmrnbParse; diff --git a/ext/mpeg2dec/gstmpeg2dec.h b/ext/mpeg2dec/gstmpeg2dec.h index d4959669a7..0fdc8c2b75 100644 --- a/ext/mpeg2dec/gstmpeg2dec.h +++ b/ext/mpeg2dec/gstmpeg2dec.h @@ -32,10 +32,10 @@ G_BEGIN_DECLS #define GST_MPEG2DEC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MPEG2DEC,GstMpeg2dec)) #define GST_MPEG2DEC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEG2DEC,GstMpeg2dec)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEG2DEC,GstMpeg2decClass)) #define GST_IS_MPEG2DEC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MPEG2DEC)) -#define GST_IS_MPEG2DEC_CLASS(obj) \ +#define GST_IS_MPEG2DEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MPEG2DEC)) #define MPEG_TIME_TO_GST_TIME(time) (((time) * (GST_MSECOND/10)) / 9LL) diff --git a/ext/sidplay/gstsiddec.h b/ext/sidplay/gstsiddec.h index 2cc47788e1..e3437510a7 100644 --- a/ext/sidplay/gstsiddec.h +++ b/ext/sidplay/gstsiddec.h @@ -34,10 +34,10 @@ G_BEGIN_DECLS #define GST_SIDDEC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SIDDEC,GstSidDec)) #define GST_SIDDEC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SIDDEC,GstSidDec)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SIDDEC,GstSidDecClass)) #define GST_IS_SIDDEC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SIDDEC)) -#define GST_IS_SIDDEC_CLASS(obj) \ +#define GST_IS_SIDDEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SIDDEC)) typedef struct _GstSidDec GstSidDec; diff --git a/gst/ac3parse/gstac3parse.h b/gst/ac3parse/gstac3parse.h index 8bd78c66a0..9e876425f3 100644 --- a/gst/ac3parse/gstac3parse.h +++ b/gst/ac3parse/gstac3parse.h @@ -35,10 +35,10 @@ extern "C" { #define GST_AC3PARSE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AC3PARSE,GstAc3Parse)) #define GST_AC3PARSE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AC3PARSE,GstAc3Parse)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AC3PARSE,GstAc3ParseClass)) #define GST_IS_AC3PARSE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AC3PARSE)) -#define GST_IS_AC3PARSE_CLASS(obj) \ +#define GST_IS_AC3PARSE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AC3PARSE))) typedef struct _GstAc3Parse GstAc3Parse; diff --git a/gst/asfdemux/gstasfdemux.h b/gst/asfdemux/gstasfdemux.h index b9eeca9d3c..ec29ccd53d 100644 --- a/gst/asfdemux/gstasfdemux.h +++ b/gst/asfdemux/gstasfdemux.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS #define GST_ASF_DEMUX(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ASF_DEMUX,GstASFDemux)) #define GST_ASF_DEMUX_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ASF_DEMUX,GstASFDemux)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ASF_DEMUX,GstASFDemuxClass)) #define GST_IS_ASF_DEMUX(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ASF_DEMUX)) #define GST_IS_ASF_DEMUX_CLASS(klass) \ diff --git a/gst/asfdemux/gstasfmux.h b/gst/asfdemux/gstasfmux.h index 9c1d8a7eca..0ae6b4e0bf 100644 --- a/gst/asfdemux/gstasfmux.h +++ b/gst/asfdemux/gstasfmux.h @@ -33,10 +33,10 @@ extern "C" { #define GST_ASFMUX(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ASFMUX,GstAsfMux)) #define GST_ASFMUX_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ASFMUX,GstAsfMux)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ASFMUX,GstAsfMuxClass)) #define GST_IS_ASFMUX(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ASFMUX)) -#define GST_IS_ASFMUX_CLASS(obj) \ +#define GST_IS_ASFMUX_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ASFMUX)) #define MAX_ASF_OUTPUTS 16 diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.h b/gst/dvdlpcmdec/gstdvdlpcmdec.h index 36c44e3885..e3002d7579 100644 --- a/gst/dvdlpcmdec/gstdvdlpcmdec.h +++ b/gst/dvdlpcmdec/gstdvdlpcmdec.h @@ -30,10 +30,10 @@ G_BEGIN_DECLS #define GST_DVDLPCMDEC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DVDLPCMDEC,GstDvdLpcmDec)) #define GST_DVDLPCMDEC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVDLPCMDEC,GstDvdLpcmDec)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVDLPCMDEC,GstDvdLpcmDecClass)) #define GST_IS_DVDLPCMDEC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVDLPCMDEC)) -#define GST_IS_DVDLPCMDEC_CLASS(obj) \ +#define GST_IS_DVDLPCMDEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVDLPCMDEC)) typedef struct _GstDvdLpcmDec GstDvdLpcmDec; diff --git a/gst/iec958/ac3iec.h b/gst/iec958/ac3iec.h index ac0f335b64..45c9a72de8 100644 --- a/gst/iec958/ac3iec.h +++ b/gst/iec958/ac3iec.h @@ -37,7 +37,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AC3IEC,AC3IECClass)) #define GST_IS_AC3IEC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AC3IEC)) -#define GST_IS_AC3IEC_CLASS(obj) \ +#define GST_IS_AC3IEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AC3IEC)) diff --git a/gst/mpegaudioparse/gstmpegaudioparse.h b/gst/mpegaudioparse/gstmpegaudioparse.h index 813a32c95f..d2ca67ebe9 100644 --- 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; diff --git a/gst/mpegstream/gstdvddemux.h b/gst/mpegstream/gstdvddemux.h index 5b96e89a7b..5f283e6a34 100644 --- a/gst/mpegstream/gstdvddemux.h +++ b/gst/mpegstream/gstdvddemux.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DVD_DEMUX,GstDVDDemuxClass)) #define GST_IS_DVD_DEMUX(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DVD_DEMUX)) -#define GST_IS_DVD_DEMUX_CLASS(obj) \ +#define GST_IS_DVD_DEMUX_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVD_DEMUX)) diff --git a/gst/mpegstream/gstmpegclock.h b/gst/mpegstream/gstmpegclock.h index b708b57c9c..c0025fd2b8 100644 --- a/gst/mpegstream/gstmpegclock.h +++ b/gst/mpegstream/gstmpegclock.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEG_CLOCK,GstMPEGClockClass)) #define GST_IS_MPEG_CLOCK(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MPEG_CLOCK)) -#define GST_IS_MPEG_CLOCK_CLASS(obj) \ +#define GST_IS_MPEG_CLOCK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MPEG_CLOCK)) typedef struct _GstMPEGClock GstMPEGClock; diff --git a/gst/mpegstream/gstmpegdemux.h b/gst/mpegstream/gstmpegdemux.h index b8d3ac9f7d..c98c145668 100644 --- a/gst/mpegstream/gstmpegdemux.h +++ b/gst/mpegstream/gstmpegdemux.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEG_DEMUX,GstMPEGDemuxClass)) #define GST_IS_MPEG_DEMUX(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MPEG_DEMUX)) -#define GST_IS_MPEG_DEMUX_CLASS(obj) \ +#define GST_IS_MPEG_DEMUX_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MPEG_DEMUX)) /* Supported kinds of streams. */ diff --git a/gst/mpegstream/gstmpegparse.h b/gst/mpegstream/gstmpegparse.h index ae1ac2187b..cfeaa2bcff 100644 --- a/gst/mpegstream/gstmpegparse.h +++ b/gst/mpegstream/gstmpegparse.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MPEG_PARSE,GstMPEGParseClass)) #define GST_IS_MPEG_PARSE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MPEG_PARSE)) -#define GST_IS_MPEG_PARSE_CLASS(obj) \ +#define GST_IS_MPEG_PARSE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MPEG_PARSE)) #define GST_MPEG_PARSE_IS_MPEG2(parse) (GST_MPEG_PACKETIZE_IS_MPEG2 (GST_MPEG_PARSE (parse)->packetize))