wavpack: Use G_DECLARE_FINAL_TYPE

diff --git a/ext/wavpack/gstwavpackdec.h b/ext/wavpack/gstwavpackdec.h
index 8a002b4..3cba002 100644 (file)
--- a/ext/wavpack/gstwavpackdec.h
+++ b/ext/wavpack/gstwavpackdec.h
@@ -31,18 +31,10 @@
 #include "gstwavpackstreamreader.h"
 
 G_BEGIN_DECLS
-#define GST_TYPE_WAVPACK_DEC \
-  (gst_wavpack_dec_get_type())
-#define GST_WAVPACK_DEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_WAVPACK_DEC,GstWavpackDec))
-#define GST_WAVPACK_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WAVPACK_DEC,GstWavpackDecClass))
-#define GST_IS_WAVPACK_DEC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_DEC))
-#define GST_IS_WAVPACK_DEC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_DEC))
-typedef struct _GstWavpackDec GstWavpackDec;
-typedef struct _GstWavpackDecClass GstWavpackDecClass;
+
+#define GST_TYPE_WAVPACK_DEC (gst_wavpack_dec_get_type())
+G_DECLARE_FINAL_TYPE (GstWavpackDec, gst_wavpack_dec, GST, WAVPACK_DEC,
+    GstAudioDecoder)
 
 struct _GstWavpackDec
 {
@@ -65,13 +57,6 @@ struct _GstWavpackDec
 
 };
 
-struct _GstWavpackDecClass
-{
-  GstAudioDecoderClass parent;
-};
-
-GType gst_wavpack_dec_get_type (void);
-
 gboolean gst_wavpack_dec_plugin_init (GstPlugin * plugin);
 
 G_END_DECLS

diff --git a/ext/wavpack/gstwavpackenc.h b/ext/wavpack/gstwavpackenc.h
index 26a5b11..5a6ed0a 100644 (file)
--- a/ext/wavpack/gstwavpackenc.h
+++ b/ext/wavpack/gstwavpackenc.h
@@ -28,18 +28,10 @@
 #include <wavpack/wavpack.h>
 
 G_BEGIN_DECLS
-#define GST_TYPE_WAVPACK_ENC \
-  (gst_wavpack_enc_get_type())
-#define GST_WAVPACK_ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_WAVPACK_ENC,GstWavpackEnc))
-#define GST_WAVPACK_ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WAVPACK_ENC,GstWavpackEnc))
-#define GST_IS_WAVPACK_ENC(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WAVPACK_ENC))
-#define GST_IS_WAVPACK_ENC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WAVPACK_ENC))
-typedef struct _GstWavpackEnc GstWavpackEnc;
-typedef struct _GstWavpackEncClass GstWavpackEncClass;
+
+#define GST_TYPE_WAVPACK_ENC (gst_wavpack_enc_get_type())
+G_DECLARE_FINAL_TYPE (GstWavpackEnc, gst_wavpack_enc, GST, WAVPACK_ENC,
+    GstAudioEncoder)
 
 typedef struct
 {
@@ -48,7 +40,6 @@ typedef struct
   gboolean passthrough;
 } GstWavpackEncWriteID;
 
-
 struct _GstWavpackEnc
 {
   GstAudioEncoder element;
@@ -92,13 +83,6 @@ struct _GstWavpackEnc
   GstClockTime next_ts;
 };
 
-struct _GstWavpackEncClass
-{
-  GstAudioEncoderClass parent;
-};
-
-GType gst_wavpack_enc_get_type (void);
-
 gboolean gst_wavpack_enc_plugin_init (GstPlugin * plugin);
 
 G_END_DECLS