From b6c3567b41f951c6340a7e05a4b070f930fc9dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 6 May 2009 17:59:13 +0200 Subject: [PATCH] interfaces: Separate struct definitions from typedefs --- gst-libs/gst/interfaces/colorbalance.h | 5 +++-- gst-libs/gst/interfaces/colorbalancechannel.h | 12 ++++++++---- gst-libs/gst/interfaces/tuner.h | 5 +++-- gst-libs/gst/interfaces/tunerchannel.h | 11 +++++++---- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gst-libs/gst/interfaces/colorbalance.h b/gst-libs/gst/interfaces/colorbalance.h index 44fbc67e7e..6884133e70 100644 --- a/gst-libs/gst/interfaces/colorbalance.h +++ b/gst-libs/gst/interfaces/colorbalance.h @@ -46,6 +46,7 @@ G_BEGIN_DECLS #define GST_COLOR_BALANCE_TYPE(klass) (klass->balance_type) typedef struct _GstColorBalance GstColorBalance; +typedef struct _GstColorBalanceClass GstColorBalanceClass; /** * GstColorBalanceType: @@ -65,7 +66,7 @@ typedef enum GST_COLOR_BALANCE_SOFTWARE } GstColorBalanceType; -typedef struct _GstColorBalanceClass { +struct _GstColorBalanceClass { GTypeInterface klass; GstColorBalanceType balance_type; @@ -85,7 +86,7 @@ typedef struct _GstColorBalanceClass { gint value); gpointer _gst_reserved[GST_PADDING]; -} GstColorBalanceClass; +}; GType gst_color_balance_get_type (void); diff --git a/gst-libs/gst/interfaces/colorbalancechannel.h b/gst-libs/gst/interfaces/colorbalancechannel.h index dfb0d9d0b2..f279f38ac6 100644 --- a/gst-libs/gst/interfaces/colorbalancechannel.h +++ b/gst-libs/gst/interfaces/colorbalancechannel.h @@ -39,22 +39,26 @@ G_BEGIN_DECLS #define GST_IS_COLOR_BALANCE_CHANNEL_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL)) +typedef struct _GstColorBalanceChannel GstColorBalanceChannel; +typedef struct _GstColorBalanceChannelClass GstColorBalanceChannelClass; + /** * GstColorBalanceChannel: * @label: A string containing a descriptive name for this channel * @min_value: The minimum valid value for this channel. * @max_value: The maximum valid value for this channel. */ -typedef struct _GstColorBalanceChannel { +struct _GstColorBalanceChannel { GObject parent; /*< public >*/ gchar *label; gint min_value; gint max_value; -} GstColorBalanceChannel; +}; -typedef struct _GstColorBalanceChannelClass { + +struct _GstColorBalanceChannelClass { GObjectClass parent; /* signals */ @@ -62,7 +66,7 @@ typedef struct _GstColorBalanceChannelClass { gint value); gpointer _gst_reserved[GST_PADDING]; -} GstColorBalanceChannelClass; +}; GType gst_color_balance_channel_get_type (void); diff --git a/gst-libs/gst/interfaces/tuner.h b/gst-libs/gst/interfaces/tuner.h index a8d05dbfeb..e7ca24e69f 100644 --- a/gst-libs/gst/interfaces/tuner.h +++ b/gst-libs/gst/interfaces/tuner.h @@ -43,8 +43,9 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_TUNER, GstTunerClass)) typedef struct _GstTuner GstTuner; +typedef struct _GstTunerClass GstTunerClass; -typedef struct _GstTunerClass { +struct _GstTunerClass { GTypeInterface klass; /* virtual functions */ @@ -80,7 +81,7 @@ typedef struct _GstTunerClass { gint signal); gpointer _gst_reserved[GST_PADDING]; -} GstTunerClass; +}; GType gst_tuner_get_type (void); diff --git a/gst-libs/gst/interfaces/tunerchannel.h b/gst-libs/gst/interfaces/tunerchannel.h index 7028f0fadc..45c9c3febd 100644 --- a/gst-libs/gst/interfaces/tunerchannel.h +++ b/gst-libs/gst/interfaces/tunerchannel.h @@ -39,6 +39,9 @@ G_BEGIN_DECLS #define GST_IS_TUNER_CHANNEL_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER_CHANNEL)) +typedef struct _GstTunerChannel GstTunerChannel; +typedef struct _GstTunerChannelClass GstTunerChannelClass; + /** * GstTunerChannelFlags: * @GST_TUNER_CHANNEL_INPUT: The channel is for input @@ -77,7 +80,7 @@ typedef enum { * @min_signal: Minimum reported signal strength value. * @max_signal: Maximum reported signal strength value. */ -typedef struct _GstTunerChannel { +struct _GstTunerChannel { GObject parent; /*< public >*/ @@ -88,9 +91,9 @@ typedef struct _GstTunerChannel { gulong max_frequency; gint min_signal; gint max_signal; -} GstTunerChannel; +}; -typedef struct _GstTunerChannelClass { +struct _GstTunerChannelClass { GObjectClass parent; /*< private >*/ @@ -101,7 +104,7 @@ typedef struct _GstTunerChannelClass { gint signal); gpointer _gst_reserved[GST_PADDING]; -} GstTunerChannelClass; +}; GType gst_tuner_channel_get_type (void);