From eb1b7236f3a6b67c039dfb8215a8cf752b0db38c Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Sat, 16 Sep 2006 21:57:29 +0000 Subject: [PATCH] More G_OBJECT macro fixing. Original commit message from CVS: * ext/flac/gstflactag.c: * gst/alpha/gstalpha.c: * gst/debug/breakmydata.c: * gst/debug/negotiation.c: * gst/debug/testplugin.c: * gst/effectv/gstaging.c: * gst/effectv/gstdice.c: * gst/effectv/gstedge.c: * gst/effectv/gstquark.c: * gst/effectv/gstrev.c: * gst/effectv/gstshagadelic.c: * gst/effectv/gstvertigo.c: * gst/effectv/gstwarp.c: * gst/multipart/multipartdemux.c: * gst/multipart/multipartmux.c: * gst/videobox/gstvideobox.c: * gst/videofilter/gstgamma.c: * gst/videofilter/gstvideotemplate.c: * gst/videomixer/videomixer.c: * sys/sunaudio/gstsunaudiosrc.h: More G_OBJECT macro fixing. --- ChangeLog | 24 ++++++++++++++++++++++++ ext/flac/gstflactag.c | 2 +- gst/alpha/gstalpha.c | 2 +- gst/debug/breakmydata.c | 2 +- gst/debug/negotiation.c | 2 +- gst/debug/testplugin.c | 2 +- gst/effectv/gstaging.c | 2 +- gst/effectv/gstdice.c | 2 +- gst/effectv/gstedge.c | 2 +- gst/effectv/gstquark.c | 2 +- gst/effectv/gstrev.c | 2 +- gst/effectv/gstshagadelic.c | 2 +- gst/effectv/gstvertigo.c | 2 +- gst/effectv/gstwarp.c | 2 +- gst/multipart/multipartdemux.c | 2 +- gst/multipart/multipartmux.c | 2 +- gst/videobox/gstvideobox.c | 2 +- gst/videofilter/gstgamma.c | 2 +- gst/videofilter/gstvideotemplate.c | 2 +- gst/videomixer/videomixer.c | 4 ++-- sys/sunaudio/gstsunaudiosrc.h | 2 +- 21 files changed, 45 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 531c509780..4be3db1d94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2006-09-17 Stefan Kost + + * ext/flac/gstflactag.c: + * gst/alpha/gstalpha.c: + * gst/debug/breakmydata.c: + * gst/debug/negotiation.c: + * gst/debug/testplugin.c: + * gst/effectv/gstaging.c: + * gst/effectv/gstdice.c: + * gst/effectv/gstedge.c: + * gst/effectv/gstquark.c: + * gst/effectv/gstrev.c: + * gst/effectv/gstshagadelic.c: + * gst/effectv/gstvertigo.c: + * gst/effectv/gstwarp.c: + * gst/multipart/multipartdemux.c: + * gst/multipart/multipartmux.c: + * gst/videobox/gstvideobox.c: + * gst/videofilter/gstgamma.c: + * gst/videofilter/gstvideotemplate.c: + * gst/videomixer/videomixer.c: + * sys/sunaudio/gstsunaudiosrc.h: + More G_OBJECT macro fixing. + 2006-09-16 Wim Taymans Patch by: Yves Lefebvre diff --git a/ext/flac/gstflactag.c b/ext/flac/gstflactag.c index 246efbefb2..db0fa2a496 100644 --- a/ext/flac/gstflactag.c +++ b/ext/flac/gstflactag.c @@ -31,7 +31,7 @@ #define GST_FLAC_TAG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FLAC_TAG, GstFlacTag)) #define GST_FLAC_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FLAC_TAG, GstFlacTag)) #define GST_IS_FLAC_TAG(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FLAC_TAG)) -#define GST_IS_FLAC_TAG_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FLAC_TAG)) +#define GST_IS_FLAC_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FLAC_TAG)) typedef struct _GstFlacTag GstFlacTag; typedef struct _GstFlacTagClass GstFlacTagClass; diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c index 95be384966..0b5ffb7e22 100644 --- a/gst/alpha/gstalpha.c +++ b/gst/alpha/gstalpha.c @@ -38,7 +38,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALPHA,GstAlphaClass)) #define GST_IS_ALPHA(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALPHA)) -#define GST_IS_ALPHA_CLASS(obj) \ +#define GST_IS_ALPHA_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALPHA)) typedef struct _GstAlpha GstAlpha; diff --git a/gst/debug/breakmydata.c b/gst/debug/breakmydata.c index 542863c3e4..252ee39ab5 100644 --- a/gst/debug/breakmydata.c +++ b/gst/debug/breakmydata.c @@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_break_my_data_debug); (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BREAK_MY_DATA,GstBreakMyDataClass)) #define GST_IS_BREAK_MY_DATA(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BREAK_MY_DATA)) -#define GST_IS_BREAK_MY_DATA_CLASS(obj) \ +#define GST_IS_BREAK_MY_DATA_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BREAK_MY_DATA)) enum diff --git a/gst/debug/negotiation.c b/gst/debug/negotiation.c index e90cb4c5f0..8206a85e2d 100644 --- a/gst/debug/negotiation.c +++ b/gst/debug/negotiation.c @@ -37,7 +37,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NEGOTIATION,GstNegotiation)) #define GST_IS_NEGOTIATION(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NEGOTIATION)) -#define GST_IS_NEGOTIATION_CLASS(obj) \ +#define GST_IS_NEGOTIATION_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NEGOTIATION)) typedef struct _GstNegotiation GstNegotiation; diff --git a/gst/debug/testplugin.c b/gst/debug/testplugin.c index 8fbf66ea95..5d1dba531a 100644 --- a/gst/debug/testplugin.c +++ b/gst/debug/testplugin.c @@ -41,7 +41,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_test_debug); (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_TEST,GstTestClass)) #define GST_IS_TEST(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TEST)) -#define GST_IS_TEST_CLASS(obj) \ +#define GST_IS_TEST_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TEST)) typedef struct _GstTest GstTest; diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c index 639d1ea765..9ffb2f9bc2 100644 --- a/gst/effectv/gstaging.c +++ b/gst/effectv/gstaging.c @@ -52,7 +52,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AGINGTV,GstAgingTVClass)) #define GST_IS_AGINGTV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AGINGTV)) -#define GST_IS_AGINGTV_CLASS(obj) \ +#define GST_IS_AGINGTV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AGINGTV)) #define SCRATCH_MAX 20 diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c index 26f682bbc9..e89116bd70 100644 --- a/gst/effectv/gstdice.c +++ b/gst/effectv/gstdice.c @@ -29,7 +29,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DICETV,GstDiceTVClass)) #define GST_IS_DICETV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DICETV)) -#define GST_IS_DICETV_CLASS(obj) \ +#define GST_IS_DICETV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DICETV)) typedef struct _GstDiceTV GstDiceTV; diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c index 1ba04f03f4..7241e198ed 100644 --- a/gst/effectv/gstedge.c +++ b/gst/effectv/gstedge.c @@ -39,7 +39,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_EDGETV,GstEdgeTVClass)) #define GST_IS_EDGETV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_EDGETV)) -#define GST_IS_EDGETV_CLASS(obj) \ +#define GST_IS_EDGETV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_EDGETV)) typedef struct _GstEdgeTV GstEdgeTV; diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c index af59d6eda5..753b7ea07a 100644 --- a/gst/effectv/gstquark.c +++ b/gst/effectv/gstquark.c @@ -40,7 +40,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_QUARKTV,GstQuarkTVClass)) #define GST_IS_QUARKTV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_QUARKTV)) -#define GST_IS_QUARKTV_CLASS(obj) \ +#define GST_IS_QUARKTV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_QUARKTV)) /* number of frames of time-buffer. It should be as a configurable paramater */ diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c index 1089155760..532cc6e80e 100644 --- a/gst/effectv/gstrev.c +++ b/gst/effectv/gstrev.c @@ -59,7 +59,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_REVTV,GstRevTVClass)) #define GST_IS_REVTV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_REVTV)) -#define GST_IS_REVTV_CLASS(obj) \ +#define GST_IS_REVTV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_REVTV)) #define THE_COLOR 0xffffffff diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c index 3d09bdaf25..fb7d1ed853 100644 --- a/gst/effectv/gstshagadelic.c +++ b/gst/effectv/gstshagadelic.c @@ -45,7 +45,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SHAGADELICTV,GstShagadelicTVClass)) #define GST_IS_SHAGADELICTV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SHAGADELICTV)) -#define GST_IS_SHAGADELICTV_CLASS(obj) \ +#define GST_IS_SHAGADELICTV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SHAGADELICTV)) typedef struct _GstShagadelicTV GstShagadelicTV; diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c index 110e625e1a..d060f4d244 100644 --- a/gst/effectv/gstvertigo.c +++ b/gst/effectv/gstvertigo.c @@ -41,7 +41,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VERTIGOTV,GstVertigoTVClass)) #define GST_IS_VERTIGOTV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VERTIGOTV)) -#define GST_IS_VERTIGOTV_CLASS(obj) \ +#define GST_IS_VERTIGOTV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VERTIGOTV)) typedef struct _GstVertigoTV GstVertigoTV; diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c index d7af725091..564a03dda5 100644 --- a/gst/effectv/gstwarp.c +++ b/gst/effectv/gstwarp.c @@ -56,7 +56,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WARPTV,GstWarpTVClass)) #define GST_IS_WARPTV(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WARPTV)) -#define GST_IS_WARPTV_CLASS(obj) \ +#define GST_IS_WARPTV_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WARPTV)) typedef struct _GstWarpTV GstWarpTV; diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c index a1a82912f7..7e8fbb88cb 100644 --- a/gst/multipart/multipartdemux.c +++ b/gst/multipart/multipartdemux.c @@ -66,7 +66,7 @@ #define GST_MULTIPART_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTIPART_DEMUX, GstMultipartDemux)) #define GST_MULTIPART_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTIPART_DEMUX, GstMultipartDemux)) #define GST_IS_MULTIPART_DEMUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTIPART_DEMUX)) -#define GST_IS_MULTIPART_DEMUX_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_DEMUX)) +#define GST_IS_MULTIPART_DEMUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_DEMUX)) typedef struct _GstMultipartDemux GstMultipartDemux; typedef struct _GstMultipartDemuxClass GstMultipartDemuxClass; diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c index bc79fab51a..33460cdb6c 100644 --- a/gst/multipart/multipartmux.c +++ b/gst/multipart/multipartmux.c @@ -55,7 +55,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_multipart_mux_debug); #define GST_MULTIPART_MUX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MULTIPART_MUX, GstMultipartMux)) #define GST_MULTIPART_MUX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MULTIPART_MUX, GstMultipartMux)) #define GST_IS_MULTIPART_MUX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MULTIPART_MUX)) -#define GST_IS_MULTIPART_MUX_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_MUX)) +#define GST_IS_MULTIPART_MUX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MULTIPART_MUX)) typedef struct _GstMultipartMux GstMultipartMux; typedef struct _GstMultipartMuxClass GstMultipartMuxClass; diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c index f7f9b89f7c..f1aec2cae7 100644 --- a/gst/videobox/gstvideobox.c +++ b/gst/videobox/gstvideobox.c @@ -38,7 +38,7 @@ GST_DEBUG_CATEGORY_STATIC (videobox_debug); (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_BOX,GstVideoBoxClass)) #define GST_IS_VIDEO_BOX(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_BOX)) -#define GST_IS_VIDEO_BOX_CLASS(obj) \ +#define GST_IS_VIDEO_BOX_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_BOX)) typedef struct _GstVideoBox GstVideoBox; diff --git a/gst/videofilter/gstgamma.c b/gst/videofilter/gstgamma.c index 7590f6df15..7be7b8aa00 100644 --- a/gst/videofilter/gstgamma.c +++ b/gst/videofilter/gstgamma.c @@ -43,7 +43,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GAMMA,GstGammaClass)) #define GST_IS_GAMMA(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GAMMA)) -#define GST_IS_GAMMA_CLASS(obj) \ +#define GST_IS_GAMMA_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GAMMA)) typedef struct _GstGamma GstGamma; diff --git a/gst/videofilter/gstvideotemplate.c b/gst/videofilter/gstvideotemplate.c index df8aa7b494..d164224d46 100644 --- a/gst/videofilter/gstvideotemplate.c +++ b/gst/videofilter/gstvideotemplate.c @@ -41,7 +41,7 @@ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEOTEMPLATE,GstVideotemplateClass)) #define GST_IS_VIDEOTEMPLATE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEOTEMPLATE)) -#define GST_IS_VIDEOTEMPLATE_CLASS(obj) \ +#define GST_IS_VIDEOTEMPLATE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEOTEMPLATE)) typedef struct _GstVideotemplate GstVideotemplate; diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index a5b5a7b7cd..c12fbeb8bc 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -64,7 +64,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug); (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER_PAD, GstVideoMixerPadiClass)) #define GST_IS_VIDEO_MIXER_PAD(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER_PAD)) -#define GST_IS_VIDEO_MIXER_PAD_CLASS(obj) \ +#define GST_IS_VIDEO_MIXER_PAD_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER_PAD)) typedef struct _GstVideoMixerPad GstVideoMixerPad; @@ -78,7 +78,7 @@ typedef struct _GstVideoMixerCollect GstVideoMixerCollect; (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MIXER, GstVideoMixerClass)) #define GST_IS_VIDEO_MIXER(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MIXER)) -#define GST_IS_VIDEO_MIXER_CLASS(obj) \ +#define GST_IS_VIDEO_MIXER_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MIXER)) static GType gst_videomixer_get_type (void); diff --git a/sys/sunaudio/gstsunaudiosrc.h b/sys/sunaudio/gstsunaudiosrc.h index c369178163..905ec6757e 100644 --- a/sys/sunaudio/gstsunaudiosrc.h +++ b/sys/sunaudio/gstsunaudiosrc.h @@ -35,7 +35,7 @@ G_BEGIN_DECLS #define GST_SUNAUDIO_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SUNAUDIO_SRC,GstSunAudioSrc)) #define GST_SUNAUDIO_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SUNAUDIO_SRC,GstSunAudioSrcClass)) #define GST_IS_SUNAUDIO_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SUNAUDIO_SRC)) -#define GST_IS_SUNAUDIO_SRC_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SUNAUDIO_SRC)) +#define GST_IS_SUNAUDIO_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SUNAUDIO_SRC)) typedef struct _GstSunAudioSrc GstSunAudioSrc; typedef struct _GstSunAudioSrcClass GstSunAudioSrcClass;