From c745baedbba6fbf0c304ed83cc4ec5c4092aa84d Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Sat, 8 Apr 2006 19:04:01 +0000 Subject: gst/: Fix more broken GObject macros Original commit message from CVS: * gst/colorspace/gstcolorspace.h: * gst/deinterlace/gstdeinterlace.h: * gst/passthrough/gstpassthrough.h: * gst/y4m/gsty4mencode.h: Fix more broken GObject macros --- ChangeLog | 8 ++++++++ gst/colorspace/gstcolorspace.h | 4 +++- gst/deinterlace/gstdeinterlace.h | 6 ++++-- gst/passthrough/gstpassthrough.h | 6 ++++-- gst/y4m/gsty4mencode.h | 6 ++++-- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a6ea51b..54b1c7a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-08 Stefan Kost + + * gst/colorspace/gstcolorspace.h: + * gst/deinterlace/gstdeinterlace.h: + * gst/passthrough/gstpassthrough.h: + * gst/y4m/gsty4mencode.h: + Fix more broken GObject macros + 2006-04-08 Stefan Kost * ext/xine/gstxine.h: diff --git a/gst/colorspace/gstcolorspace.h b/gst/colorspace/gstcolorspace.h index 22e2f7ec..d935d7cb 100644 --- a/gst/colorspace/gstcolorspace.h +++ b/gst/colorspace/gstcolorspace.h @@ -29,7 +29,9 @@ G_BEGIN_DECLS #define GST_COLORSPACE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COLORSPACE,GstColorspace)) #define GST_COLORSPACE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstColorspace)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COLORSPACE,GstColorspaceClass)) +#define GST_COLORSPACE_GET_CLASS(obj) \ + (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) \ diff --git a/gst/deinterlace/gstdeinterlace.h b/gst/deinterlace/gstdeinterlace.h index 27207319..fc269af9 100644 --- a/gst/deinterlace/gstdeinterlace.h +++ b/gst/deinterlace/gstdeinterlace.h @@ -32,10 +32,12 @@ G_BEGIN_DECLS #define GST_DEINTERLACE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DEINTERLACE,GstDeInterlace)) #define GST_DEINTERLACE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstDeInterlace)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DEINTERLACE,GstDeInterlaceClass)) +#define GST_DEINTERLACE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_DEINTERLACE,GstDeInterlaceClass)) #define GST_IS_DEINTERLACE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DEINTERLACE)) -#define GST_IS_DEINTERLACE_CLASS(obj) \ +#define GST_IS_DEINTERLACE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DEINTERLACE)) typedef struct _GstDeInterlace GstDeInterlace; diff --git a/gst/passthrough/gstpassthrough.h b/gst/passthrough/gstpassthrough.h index 0b6f9d58..722b08f5 100644 --- a/gst/passthrough/gstpassthrough.h +++ b/gst/passthrough/gstpassthrough.h @@ -31,10 +31,12 @@ G_BEGIN_DECLS #define GST_PASSTHROUGH(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PASSTHROUGH,GstPassthrough)) #define GST_PASSTHROUGH_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstPassthrough)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PASSTHROUGH,GstPassthroughClass)) +#define GST_PASSTHROUGH_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_PASSTHROUGH,GstPassthroughClass)) #define GST_IS_PASSTHROUGH(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PASSTHROUGH)) -#define GST_IS_PASSTHROUGH_CLASS(obj) \ +#define GST_IS_PASSTHROUGH_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PASSTHROUGH)) typedef struct _GstPassthrough GstPassthrough; diff --git a/gst/y4m/gsty4mencode.h b/gst/y4m/gsty4mencode.h index 07d369cc..a0d3f9b9 100644 --- a/gst/y4m/gsty4mencode.h +++ b/gst/y4m/gsty4mencode.h @@ -36,10 +36,12 @@ extern "C" { #define GST_Y4MENCODE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_Y4MENCODE,GstY4mEncode)) #define GST_Y4MENCODE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstY4mEncode)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_Y4MENCODE,GstY4mEncodeClass)) +#define GST_Y4MENCODE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_Y4MENCODE,GstY4mEncodeClass)) #define GST_IS_Y4MENCODE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_Y4MENCODE)) -#define GST_IS_Y4MENCODE_CLASS(obj) \ +#define GST_IS_Y4MENCODE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_Y4MENCODE)) typedef struct _GstY4mEncode GstY4mEncode; -- cgit v1.2.1