1 files changed, 18 insertions, 33 deletions

diff --git a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.h b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.h
index 4e8f8e1..d092314 100644
--- a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.h
+++ b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.h
@@ -28,44 +28,29 @@
 
 G_BEGIN_DECLS
 
+G_DECLARE_FINAL_TYPE (GUPnPDLNAGstAudioInformation,
+                      gupnp_dlna_gst_audio_information,
+                      GUPNP_DLNA,
+                      GST_AUDIO_INFORMATION,
+                      GUPnPDLNAAudioInformation)
+
 #define GUPNP_TYPE_DLNA_GST_AUDIO_INFORMATION \
         (gupnp_dlna_gst_audio_information_get_type())
 
-#define GUPNP_DLNA_GST_AUDIO_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                                     GUPNP_TYPE_DLNA_GST_AUDIO_INFORMATION, \
-                                     GUPnPDLNAGstAudioInformation))
-
-#define GUPNP_DLNA_GST_AUDIO_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST ((klass), \
-                                  GUPNP_TYPE_DLNA_GST_AUDIO_INFORMATION, \
-                                  GUPnPDLNAGstAudioInformationClass))
-
-#define GUPNP_IS_DLNA_GST_AUDIO_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                                     GUPNP_TYPE_DLNA_GST_AUDIO_INFORMATION))
-
-#define GUPNP_IS_DLNA_GST_AUDIO_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                  GUPNP_TYPE_DLNA_GST_AUDIO_INFORMATION))
-
-#define GUPNP_DLNA_GST_AUDIO_INFORMATION_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-                                    GUPNP_TYPE_DLNA_GST_AUDIO_INFORMATION, \
-                                    GUPnPDLNAGstAudioInformationClass))
-
-typedef struct _GUPnPDLNAGstAudioInformationPrivate
-                GUPnPDLNAGstAudioInformationPrivate;
-
-typedef struct {
-        GUPnPDLNAAudioInformation parent;
-
-        GUPnPDLNAGstAudioInformationPrivate *priv;
-} GUPnPDLNAGstAudioInformation;
+// Backwards-compatible defines
+/**
+ * GUPNP_IS_DLNA_GST_AUDIO_INFORMATION: (skip)
+ */
+#define GUPNP_IS_DLNA_GST_AUDIO_INFORMATION GUPNP_DLNA_IS_GST_AUDIO_INFORMATION
+/**
+ * GUPNP_IS_DLNA_GST_AUDIO_INFORMATION_CLASS: (skip)
+ */
+#define GUPNP_IS_DLNA_GST_AUDIO_INFORMATION_CLASS                              \
+        GUPNP_DLNA_IS_GST_AUDIO_INFORMATION_CLASS
 
-typedef struct {
+struct _GUPnPDLNAGstAudioInformationClass {
         GUPnPDLNAAudioInformationClass parent_class;
-} GUPnPDLNAGstAudioInformationClass;
+};
 
 GType
 gupnp_dlna_gst_audio_information_get_type (void);