From 86b5887cd7da9a6e8a34a75b91fbf960600ea7c3 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 1 Jun 2006 18:22:14 +0000 Subject: [PATCH] gst/gsttagsetter.h: Can't cast ifaces to a class Original commit message from CVS: * gst/gsttagsetter.h: Can't cast ifaces to a class * libs/gst/net/gstnetclientclock.h: * libs/gst/net/gstnettimeprovider.h: * plugins/elements/gstfakesink.h: * plugins/elements/gstfakesrc.h: * plugins/elements/gstfdsink.h: * plugins/elements/gstfdsrc.h: * plugins/elements/gstfilesink.h: * plugins/elements/gstfilesrc.h: * plugins/elements/gstidentity.h: * plugins/elements/gstqueue.h: * plugins/elements/gsttee.h: * plugins/indexers/gstfileindex.c: * plugins/indexers/gstmemindex.c: * tests/old/examples/plugins/example.h: Fix more gobject macros: obj<->klass, GstXXX<->GstXXXClass --- ChangeLog | 21 +++++++++++++++++++++ gst/gsttagsetter.h | 1 - libs/gst/net/gstnetclientclock.h | 2 +- libs/gst/net/gstnettimeprovider.h | 4 ++-- plugins/elements/gstfakesink.h | 2 +- plugins/elements/gstfakesrc.h | 2 +- plugins/elements/gstfdsink.h | 2 +- plugins/elements/gstfdsrc.h | 2 +- plugins/elements/gstfilesink.h | 2 +- plugins/elements/gstfilesrc.h | 2 +- plugins/elements/gstidentity.h | 2 +- plugins/elements/gstqueue.h | 2 +- plugins/elements/gsttee.h | 2 +- plugins/indexers/gstfileindex.c | 2 +- plugins/indexers/gstmemindex.c | 2 +- tests/old/examples/plugins/example.h | 2 +- 16 files changed, 36 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9f2905..894e994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2006-06-01 Stefan Kost + + * gst/gsttagsetter.h: + Can't cast ifaces to a class + + * libs/gst/net/gstnetclientclock.h: + * libs/gst/net/gstnettimeprovider.h: + * plugins/elements/gstfakesink.h: + * plugins/elements/gstfakesrc.h: + * plugins/elements/gstfdsink.h: + * plugins/elements/gstfdsrc.h: + * plugins/elements/gstfilesink.h: + * plugins/elements/gstfilesrc.h: + * plugins/elements/gstidentity.h: + * plugins/elements/gstqueue.h: + * plugins/elements/gsttee.h: + * plugins/indexers/gstfileindex.c: + * plugins/indexers/gstmemindex.c: + * tests/old/examples/plugins/example.h: + Fix more gobject macros: obj<->klass, GstXXX<->GstXXXClass + 2006-06-01 Thomas Vander Stichele * libs/gst/dataprotocol/dataprotocol.c: diff --git a/gst/gsttagsetter.h b/gst/gsttagsetter.h index c6322ee..f7941c1 100644 --- a/gst/gsttagsetter.h +++ b/gst/gsttagsetter.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS #define GST_TYPE_TAG_SETTER (gst_tag_setter_get_type ()) #define GST_TAG_SETTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TAG_SETTER, GstTagSetter)) -#define GST_TAG_SETTER_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GST_TYPE_TAG_SETTER, GstTagSetter)) #define GST_IS_TAG_SETTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TAG_SETTER)) #define GST_TAG_SETTER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_TAG_SETTER, GstTagSetterIFace)) diff --git a/libs/gst/net/gstnetclientclock.h b/libs/gst/net/gstnetclientclock.h index 6918770..f749a71 100644 --- a/libs/gst/net/gstnetclientclock.h +++ b/libs/gst/net/gstnetclientclock.h @@ -49,7 +49,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NET_CLIENT_CLOCK,GstNetClientClockClass)) #define GST_IS_NET_CLIENT_CLOCK(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NET_CLIENT_CLOCK)) -#define GST_IS_NET_CLIENT_CLOCK_CLASS(obj) \ +#define GST_IS_NET_CLIENT_CLOCK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NET_CLIENT_CLOCK)) typedef struct _GstNetClientClock GstNetClientClock; diff --git a/libs/gst/net/gstnettimeprovider.h b/libs/gst/net/gstnettimeprovider.h index dadf5c8..dcf020a 100644 --- a/libs/gst/net/gstnettimeprovider.h +++ b/libs/gst/net/gstnettimeprovider.h @@ -40,10 +40,10 @@ G_BEGIN_DECLS #define GST_NET_TIME_PROVIDER(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NET_TIME_PROVIDER,GstNetTimeProvider)) #define GST_NET_TIME_PROVIDER_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NET_TIME_PROVIDER,GstNetTimeProvider)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NET_TIME_PROVIDER,GstNetTimeProviderClass)) #define GST_IS_NET_TIME_PROVIDER(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NET_TIME_PROVIDER)) -#define GST_IS_NET_TIME_PROVIDER_CLASS(obj) \ +#define GST_IS_NET_TIME_PROVIDER_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NET_TIME_PROVIDER)) typedef struct _GstNetTimeProvider GstNetTimeProvider; diff --git a/plugins/elements/gstfakesink.h b/plugins/elements/gstfakesink.h index 96206bc..b8a5cde 100644 --- a/plugins/elements/gstfakesink.h +++ b/plugins/elements/gstfakesink.h @@ -38,7 +38,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FAKE_SINK,GstFakeSinkClass)) #define GST_IS_FAKE_SINK(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FAKE_SINK)) -#define GST_IS_FAKE_SINK_CLASS(obj) \ +#define GST_IS_FAKE_SINK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FAKE_SINK)) /** diff --git a/plugins/elements/gstfakesrc.h b/plugins/elements/gstfakesrc.h index 7d53170..a7b6043 100644 --- a/plugins/elements/gstfakesrc.h +++ b/plugins/elements/gstfakesrc.h @@ -105,7 +105,7 @@ typedef enum { (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FAKE_SRC,GstFakeSrcClass)) #define GST_IS_FAKE_SRC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FAKE_SRC)) -#define GST_IS_FAKE_SRC_CLASS(obj) \ +#define GST_IS_FAKE_SRC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FAKE_SRC)) typedef struct _GstFakeSrc GstFakeSrc; diff --git a/plugins/elements/gstfdsink.h b/plugins/elements/gstfdsink.h index 5deba3c..432abff 100644 --- a/plugins/elements/gstfdsink.h +++ b/plugins/elements/gstfdsink.h @@ -38,7 +38,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FD_SINK,GstFdSinkClass)) #define GST_IS_FD_SINK(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FD_SINK)) -#define GST_IS_FD_SINK_CLASS(obj) \ +#define GST_IS_FD_SINK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FD_SINK)) typedef struct _GstFdSink GstFdSink; diff --git a/plugins/elements/gstfdsrc.h b/plugins/elements/gstfdsrc.h index f330fc2..889a5a4 100644 --- a/plugins/elements/gstfdsrc.h +++ b/plugins/elements/gstfdsrc.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FD_SRC,GstFdSrcClass)) #define GST_IS_FD_SRC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FD_SRC)) -#define GST_IS_FD_SRC_CLASS(obj) \ +#define GST_IS_FD_SRC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FD_SRC)) diff --git a/plugins/elements/gstfilesink.h b/plugins/elements/gstfilesink.h index 17c0efa..9a462ae 100644 --- a/plugins/elements/gstfilesink.h +++ b/plugins/elements/gstfilesink.h @@ -37,7 +37,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FILE_SINK,GstFileSinkClass)) #define GST_IS_FILE_SINK(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FILE_SINK)) -#define GST_IS_FILE_SINK_CLASS(obj) \ +#define GST_IS_FILE_SINK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FILE_SINK)) typedef struct _GstFileSink GstFileSink; diff --git a/plugins/elements/gstfilesrc.h b/plugins/elements/gstfilesrc.h index f5f5735..49ea133 100644 --- a/plugins/elements/gstfilesrc.h +++ b/plugins/elements/gstfilesrc.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FILE_SRC,GstFileSrcClass)) #define GST_IS_FILE_SRC(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FILE_SRC)) -#define GST_IS_FILE_SRC_CLASS(obj) \ +#define GST_IS_FILE_SRC_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FILE_SRC)) typedef struct _GstFileSrc GstFileSrc; diff --git a/plugins/elements/gstidentity.h b/plugins/elements/gstidentity.h index b065898..990bcb2 100644 --- a/plugins/elements/gstidentity.h +++ b/plugins/elements/gstidentity.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IDENTITY,GstIdentityClass)) #define GST_IS_IDENTITY(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IDENTITY)) -#define GST_IS_IDENTITY_CLASS(obj) \ +#define GST_IS_IDENTITY_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IDENTITY)) typedef struct _GstIdentity GstIdentity; diff --git a/plugins/elements/gstqueue.h b/plugins/elements/gstqueue.h index ce5aad7..0de1218 100644 --- a/plugins/elements/gstqueue.h +++ b/plugins/elements/gstqueue.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_QUEUE,GstQueueClass)) #define GST_IS_QUEUE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_QUEUE)) -#define GST_IS_QUEUE_CLASS(obj) \ +#define GST_IS_QUEUE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_QUEUE)) enum { diff --git a/plugins/elements/gsttee.h b/plugins/elements/gsttee.h index fa88677..b2eabaa 100644 --- a/plugins/elements/gsttee.h +++ b/plugins/elements/gsttee.h @@ -37,7 +37,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TEE,GstTeeClass)) #define GST_IS_TEE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TEE)) -#define GST_IS_TEE_CLASS(obj) \ +#define GST_IS_TEE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TEE)) typedef struct _GstTee GstTee; diff --git a/plugins/indexers/gstfileindex.c b/plugins/indexers/gstfileindex.c index 2885470..d9a7699 100644 --- a/plugins/indexers/gstfileindex.c +++ b/plugins/indexers/gstfileindex.c @@ -35,7 +35,7 @@ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_FILE_INDEX, GstFileIndexClass)) #define GST_IS_FILE_INDEX(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_FILE_INDEX)) -#define GST_IS_FILE_INDEX_CLASS(obj) \ +#define GST_IS_FILE_INDEX_CLASS(klass) \ (GST_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_FILE_INDEX)) /* diff --git a/plugins/indexers/gstmemindex.c b/plugins/indexers/gstmemindex.c index 2d48b12..adc2162 100644 --- a/plugins/indexers/gstmemindex.c +++ b/plugins/indexers/gstmemindex.c @@ -27,7 +27,7 @@ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_MEM_INDEX, GstMemIndexClass)) #define GST_IS_MEM_INDEX(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MEM_INDEX)) -#define GST_IS_MEM_INDEX_CLASS(obj) \ +#define GST_IS_MEM_INDEX_CLASS(klass) \ (GST_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MEM_INDEX)) /* diff --git a/tests/old/examples/plugins/example.h b/tests/old/examples/plugins/example.h index 33003bc..cfa100a 100644 --- a/tests/old/examples/plugins/example.h +++ b/tests/old/examples/plugins/example.h @@ -74,7 +74,7 @@ struct _GstExampleClass { * class of the correct type. */ #define GST_IS_EXAMPLE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_EXAMPLE)) -#define GST_IS_EXAMPLE_CLASS(obj) \ +#define GST_IS_EXAMPLE_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_EXAMPLE)) /* This is the only prototype needed, because it is used in the above -- 2.7.4