wavpack: Use G_DECLARE_FINAL_TYPE

This commit is contained in:
Niels De Graef 2020-03-15 19:28:18 +01:00
parent 34a934d8d4
commit 4f4997a935
2 changed files with 8 additions and 39 deletions

View file

@ -31,18 +31,10 @@
#include "gstwavpackstreamreader.h" #include "gstwavpackstreamreader.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_WAVPACK_DEC \
(gst_wavpack_dec_get_type()) #define GST_TYPE_WAVPACK_DEC (gst_wavpack_dec_get_type())
#define GST_WAVPACK_DEC(obj) \ G_DECLARE_FINAL_TYPE (GstWavpackDec, gst_wavpack_dec, GST, WAVPACK_DEC,
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_WAVPACK_DEC,GstWavpackDec)) GstAudioDecoder)
#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;
struct _GstWavpackDec 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); gboolean gst_wavpack_dec_plugin_init (GstPlugin * plugin);
G_END_DECLS G_END_DECLS

View file

@ -28,18 +28,10 @@
#include <wavpack/wavpack.h> #include <wavpack/wavpack.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_WAVPACK_ENC \
(gst_wavpack_enc_get_type()) #define GST_TYPE_WAVPACK_ENC (gst_wavpack_enc_get_type())
#define GST_WAVPACK_ENC(obj) \ G_DECLARE_FINAL_TYPE (GstWavpackEnc, gst_wavpack_enc, GST, WAVPACK_ENC,
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_WAVPACK_ENC,GstWavpackEnc)) GstAudioEncoder)
#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;
typedef struct typedef struct
{ {
@ -48,7 +40,6 @@ typedef struct
gboolean passthrough; gboolean passthrough;
} GstWavpackEncWriteID; } GstWavpackEncWriteID;
struct _GstWavpackEnc struct _GstWavpackEnc
{ {
GstAudioEncoder element; GstAudioEncoder element;
@ -92,13 +83,6 @@ struct _GstWavpackEnc
GstClockTime next_ts; GstClockTime next_ts;
}; };
struct _GstWavpackEncClass
{
GstAudioEncoderClass parent;
};
GType gst_wavpack_enc_get_type (void);
gboolean gst_wavpack_enc_plugin_init (GstPlugin * plugin); gboolean gst_wavpack_enc_plugin_init (GstPlugin * plugin);
G_END_DECLS G_END_DECLS