From: Stefan Kost Date: Sat, 8 Apr 2006 18:25:55 +0000 (+0000) Subject: Fix broken GObject macros X-Git-Tag: RELEASE-0_10_3~110 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e777109e8f2b4c9b4c6561a4f800a3e94a9d4f9;p=platform%2Fupstream%2Fgst-plugins-good.git Fix broken GObject macros Original commit message from CVS: * ext/annodex/gstcmmldec.h: * ext/annodex/gstcmmlenc.h: * ext/annodex/gstcmmltag.h: * ext/cairo/gsttextoverlay.h: * ext/ladspa/gstsignalprocessor.h: * gst/matroska/ebml-read.h: * gst/matroska/ebml-write.h: * sys/osxaudio/gstosxaudioelement.h: Fix broken GObject macros --- diff --git a/ChangeLog b/ChangeLog index 104176b..657bcf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-04-08 Stefan Kost + + * ext/annodex/gstcmmldec.h: + * ext/annodex/gstcmmlenc.h: + * ext/annodex/gstcmmltag.h: + * ext/cairo/gsttextoverlay.h: + * ext/ladspa/gstsignalprocessor.h: + * gst/matroska/ebml-read.h: + * gst/matroska/ebml-write.h: + * sys/osxaudio/gstosxaudioelement.h: + Fix broken GObject macros + 2006-04-08 Tim-Philipp Müller * ext/flac/gstflacdec.c: (gst_flac_dec_handle_seek_event): diff --git a/ext/annodex/gstcmmldec.h b/ext/annodex/gstcmmldec.h index 089f912..5c8906c 100644 --- a/ext/annodex/gstcmmldec.h +++ b/ext/annodex/gstcmmldec.h @@ -35,10 +35,10 @@ #define GST_CMML_DEC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_CMML_DEC, GstCmmlDec)) #define GST_CMML_DEC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_DEC, GstCmmlDec)) + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_DEC, GstCmmlDecClass)) #define GST_IS_CMML_DEC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_CMML_DEC)) -#define GST_IS_CMML_DEC_CLASS(obj) \ +#define GST_IS_CMML_DEC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_CMML_DEC)) #define GST_CMML_DEC_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_CMML_DEC, GstCmmlDecClass)) diff --git a/ext/annodex/gstcmmlenc.h b/ext/annodex/gstcmmlenc.h index 5c072ba..d8e07ed 100644 --- a/ext/annodex/gstcmmlenc.h +++ b/ext/annodex/gstcmmlenc.h @@ -28,10 +28,10 @@ #define GST_CMML_ENC(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_CMML_ENC, GstCmmlEnc)) #define GST_CMML_ENC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_ENC, GstCmmlEnc)) + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_ENC, GstCmmlEncClass)) #define GST_IS_CMML_ENC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_CMML_ENC)) -#define GST_IS_CMML_ENC_CLASS(obj) \ +#define GST_IS_CMML_ENC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_CMML_ENC)) #define GST_CMML_ENC_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_CMML_ENC, GstCmmlEncClass)) diff --git a/ext/annodex/gstcmmltag.h b/ext/annodex/gstcmmltag.h index c8c0950..e8c9bbb 100644 --- a/ext/annodex/gstcmmltag.h +++ b/ext/annodex/gstcmmltag.h @@ -32,7 +32,8 @@ (G_TYPE_CHECK_INSTANCE_CAST((obj), \ GST_TYPE_CMML_TAG_STREAM, GstCmmlTagStream)) #define GST_CMML_TAG_STREAM_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_TAG_STREAM, GstCmmlTagStream)) + (G_TYPE_CHECK_CLASS_CAST((klass), \ + GST_TYPE_CMML_TAG_STREAM, GstCmmlTagStreamClass)) #define GST_CMML_TAG_STREAM_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS((obj), \ GST_TYPE_CMML_TAG_STREAM, GstCmmlTagStreamClass)) @@ -42,7 +43,7 @@ #define GST_CMML_TAG_HEAD(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_CMML_TAG_HEAD, GstCmmlTagHead)) #define GST_CMML_TAG_HEAD_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_TAG_HEAD, GstCmmlTagHead)) + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_TAG_HEAD, GstCmmlTagHeadClass)) #define GST_CMML_TAG_HEAD_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS((obj), \ GST_TYPE_CMML_TAG_HEAD, GstCmmlTagHeadClass)) @@ -51,10 +52,11 @@ #define GST_TYPE_CMML_TAG_CLIP (gst_cmml_tag_clip_get_type ()) #define GST_CMML_TAG_CLIP(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_CMML_TAG_CLIP, GstCmmlTagClip)) -#define GST_CMML_TAG_CLIP_CLASS(obj) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_TAG_CLIP, GstCmmlTagClip)) +#define GST_CMML_TAG_CLIP_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_CMML_TAG_CLIP, GstCmmlTagClipClass)) #define GST_CMML_TAG_CLIP_GET_CLASS(obj) \ -(G_TYPE_INSTANCE_GET_CLASS((obj), GST_TYPE_CMML_TAG_CLIP, GstCmmlTagClipClass)) + (G_TYPE_INSTANCE_GET_CLASS((obj), \ + GST_TYPE_CMML_TAG_CLIP, GstCmmlTagClipClass)) typedef struct _GstCmmlTagStream GstCmmlTagStream; typedef struct _GstCmmlTagStreamClass GstCmmlTagStreamClass; diff --git a/ext/cairo/gsttextoverlay.h b/ext/cairo/gsttextoverlay.h index 621bf9a..8af3155 100644 --- a/ext/cairo/gsttextoverlay.h +++ b/ext/cairo/gsttextoverlay.h @@ -11,12 +11,12 @@ G_BEGIN_DECLS #define GST_CAIRO_TEXT_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ GST_TYPE_CAIRO_TEXT_OVERLAY, GstCairoTextOverlay)) #define GST_CAIRO_TEXT_OVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ - GST_TYPE_ULAW, GstCairoTextOverlay)) + GST_TYPE_CAIRO_TEXT_OVERLAY, GstCairoTextOverlayClass)) #define GST_CAIRO_TEXT_OVERLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),\ GST_TYPE_CAIRO_TEXT_OVERLAY, GstCairoTextOverlayClass)) #define GST_IS_CAIRO_TEXT_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ GST_TYPE_CAIRO_TEXT_OVERLAY)) -#define GST_IS_CAIRO_TEXT_OVERLAY_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),\ +#define GST_IS_CAIRO_TEXT_OVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ GST_TYPE_CAIRO_TEXT_OVERLAY)) typedef struct _GstCairoTextOverlay GstCairoTextOverlay; diff --git a/ext/ladspa/gstsignalprocessor.h b/ext/ladspa/gstsignalprocessor.h index 2cb0c98..be99a50 100644 --- a/ext/ladspa/gstsignalprocessor.h +++ b/ext/ladspa/gstsignalprocessor.h @@ -29,13 +29,13 @@ G_BEGIN_DECLS -#define GST_TYPE_SIGNAL_PROCESSOR (gst_signal_processor_get_type()) -#define GST_SIGNAL_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessor)) -#define GST_SIGNAL_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessorClass)) +#define GST_TYPE_SIGNAL_PROCESSOR (gst_signal_processor_get_type()) +#define GST_SIGNAL_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessor)) +#define GST_SIGNAL_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessorClass)) #define GST_SIGNAL_PROCESSOR_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_SIGNAL_PROCESSOR,GstSignalProcessorClass)) -#define GST_IS_SIGNAL_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SIGNAL_PROCESSOR)) -#define GST_IS_SIGNAL_PROCESSOR_CLASS(obj)(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SIGNAL_PROCESSOR)) +#define GST_IS_SIGNAL_PROCESSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SIGNAL_PROCESSOR)) +#define GST_IS_SIGNAL_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SIGNAL_PROCESSOR)) typedef struct _GstSignalProcessor GstSignalProcessor; diff --git a/gst/matroska/ebml-read.h b/gst/matroska/ebml-read.h index 2bd7471..f990ee5 100644 --- a/gst/matroska/ebml-read.h +++ b/gst/matroska/ebml-read.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_EBML_READ, GstEbmlReadClass)) #define GST_IS_EBML_READ(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_EBML_READ)) -#define GST_IS_EBML_READ_CLASS(obj) \ +#define GST_IS_EBML_READ_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_EBML_READ)) #define GST_EBML_READ_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_EBML_READ, GstEbmlReadClass)) diff --git a/gst/matroska/ebml-write.h b/gst/matroska/ebml-write.h index 98286eb..53ed120 100644 --- a/gst/matroska/ebml-write.h +++ b/gst/matroska/ebml-write.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_EBML_WRITE, GstEbmlWriteClass)) #define GST_IS_EBML_WRITE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_EBML_WRITE)) -#define GST_IS_EBML_WRITE_CLASS(obj) \ +#define GST_IS_EBML_WRITE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_EBML_WRITE)) #define GST_EBML_WRITE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_EBML_WRITE, GstEbmlWriteClass)) diff --git a/sys/osxaudio/gstosxaudioelement.h b/sys/osxaudio/gstosxaudioelement.h index 031e0b4..83e9bb8 100644 --- a/sys/osxaudio/gstosxaudioelement.h +++ b/sys/osxaudio/gstosxaudioelement.h @@ -45,7 +45,7 @@ OSStatus inputAudioDeviceIOProc(AudioDeviceID inDevice, const AudioTimeStamp *in (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSXAUDIOELEMENT,GstOsxAudioElementClass)) #define GST_IS_OSXAUDIOELEMENT(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSXAUDIOELEMENT)) -#define GST_IS_OSXAUDIOELEMENT_CLASS(obj) \ +#define GST_IS_OSXAUDIOELEMENT_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSXAUDIOELEMENT)) #define GST_OSXAUDIOELEMENT_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_OSXAUDIOELEMENT, GstOsxAudioElementClass))