From f4841754ecd4213a5ec9f0f1e83dfabb957f8c5e Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Sat, 14 Mar 2020 17:52:38 +0100 Subject: [PATCH] jack: Use G_DECLARE_FINAL_TYPE --- ext/jack/gstjackaudiosink.h | 18 +++--------------- ext/jack/gstjackaudiosrc.h | 19 +++---------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/ext/jack/gstjackaudiosink.h b/ext/jack/gstjackaudiosink.h index f12504c1df..4be821ca57 100644 --- a/ext/jack/gstjackaudiosink.h +++ b/ext/jack/gstjackaudiosink.h @@ -32,15 +32,9 @@ G_BEGIN_DECLS -#define GST_TYPE_JACK_AUDIO_SINK (gst_jack_audio_sink_get_type()) -#define GST_JACK_AUDIO_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_JACK_AUDIO_SINK,GstJackAudioSink)) -#define GST_JACK_AUDIO_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_JACK_AUDIO_SINK,GstJackAudioSinkClass)) -#define GST_JACK_AUDIO_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_JACK_AUDIO_SINK,GstJackAudioSinkClass)) -#define GST_IS_JACK_AUDIO_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_JACK_AUDIO_SINK)) -#define GST_IS_JACK_AUDIO_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_JACK_AUDIO_SINK)) - -typedef struct _GstJackAudioSink GstJackAudioSink; -typedef struct _GstJackAudioSinkClass GstJackAudioSinkClass; +#define GST_TYPE_JACK_AUDIO_SINK (gst_jack_audio_sink_get_type()) +G_DECLARE_FINAL_TYPE (GstJackAudioSink, gst_jack_audio_sink, + GST, JACK_AUDIO_SINK, GstAudioBaseSink) /** * GstJackAudioSink: @@ -71,12 +65,6 @@ struct _GstJackAudioSink { sample_t **buffers; }; -struct _GstJackAudioSinkClass { - GstAudioBaseSinkClass parent_class; -}; - -GType gst_jack_audio_sink_get_type (void); - G_END_DECLS #endif /* __GST_JACK_AUDIO_SINK_H__ */ diff --git a/ext/jack/gstjackaudiosrc.h b/ext/jack/gstjackaudiosrc.h index 63ffe3f754..52209b67a7 100644 --- a/ext/jack/gstjackaudiosrc.h +++ b/ext/jack/gstjackaudiosrc.h @@ -53,15 +53,9 @@ G_BEGIN_DECLS -#define GST_TYPE_JACK_AUDIO_SRC (gst_jack_audio_src_get_type()) -#define GST_JACK_AUDIO_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_JACK_AUDIO_SRC,GstJackAudioSrc)) -#define GST_JACK_AUDIO_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_JACK_AUDIO_SRC,GstJackAudioSrcClass)) -#define GST_JACK_AUDIO_SRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_JACK_AUDIO_SRC,GstJackAudioSrcClass)) -#define GST_IS_JACK_AUDIO_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_JACK_AUDIO_SRC)) -#define GST_IS_JACK_AUDIO_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_JACK_AUDIO_SRC)) - -typedef struct _GstJackAudioSrc GstJackAudioSrc; -typedef struct _GstJackAudioSrcClass GstJackAudioSrcClass; +#define GST_TYPE_JACK_AUDIO_SRC (gst_jack_audio_src_get_type()) +G_DECLARE_FINAL_TYPE (GstJackAudioSrc, gst_jack_audio_src, + GST, JACK_AUDIO_SRC, GstAudioBaseSrc) struct _GstJackAudioSrc { @@ -88,13 +82,6 @@ struct _GstJackAudioSrc sample_t **buffers; }; -struct _GstJackAudioSrcClass -{ - GstAudioBaseSrcClass parent_class; -}; - -GType gst_jack_audio_src_get_type (void); - G_END_DECLS #endif /* __GST_JACK_AUDIO_SRC_H__ */