1 files changed, 16 insertions, 35 deletions
diff --git a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h
index fb17b44..c051257 100644
--- a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h
+++ b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-information.h
@@ -30,45 +30,26 @@
 
 G_BEGIN_DECLS
 
+G_DECLARE_FINAL_TYPE (GUPnPDLNAGstInformation,
+                      gupnp_dlna_gst_information,
+                      GUPNP_DLNA,
+                      GST_INFORMATION,
+                      GUPnPDLNAInformation)
 #define GUPNP_TYPE_DLNA_GST_INFORMATION (gupnp_dlna_gst_information_get_type())
 
-#define GUPNP_DLNA_GST_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                                     GUPNP_TYPE_DLNA_GST_INFORMATION, \
-                                     GUPnPDLNAGstInformation))
-
-#define GUPNP_DLNA_GST_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST ((klass), \
-                                  GUPNP_TYPE_DLNA_GST_INFORMATION, \
-                                  GUPnPDLNAGstInformationClass))
-
-#define GUPNP_IS_DLNA_GST_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                                     GUPNP_TYPE_DLNA_GST_INFORMATION))
-
-#define GUPNP_IS_DLNA_GST_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                  GUPNP_TYPE_DLNA_GST_INFORMATION))
-
-#define GUPNP_DLNA_GST_INFORMATION_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-                                    GUPNP_TYPE_DLNA_GST_INFORMATION, \
-                                    GUPnPDLNAGstInformationClass))
-
-typedef struct _GUPnPDLNAGstInformationPrivate GUPnPDLNAGstInformationPrivate;
-
-typedef struct {
-        GUPnPDLNAInformation parent;
-
-        GUPnPDLNAGstInformationPrivate *priv;
-} GUPnPDLNAGstInformation;
+// Backwards-compatible defines
+/**
+ * GUPNP_IS_GST_DLNA_INFORMATION: (skip)
+ */
+#define GUPNP_IS_GST_DLNA_INFORMATION GUPNP_DLNA_IS_GST_IMAGE_INFORMATION
+/**
+ * GUPNP_IS_GST_DLNA_INFORMATION_CLASS: (skip)
+ */
+#define GUPNP_IS_GST_DLNA_INFORMATION_CLASS GUPNP_DLNA_IS_GST_IMAGE_INFORMATION_CLASS
 
-typedef struct {
+struct _GUPnPDLNAGstInformationClass {
         GUPnPDLNAInformationClass parent_class;
-} GUPnPDLNAGstInformationClass;
-
-GType
-gupnp_dlna_gst_information_get_type (void);
+};
 
 GUPnPDLNAGstInformation *
 gupnp_dlna_gst_information_new_from_discoverer_info (const gchar       *uri,