1 files changed, 17 insertions, 35 deletions
diff --git a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-image-information.h b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-image-information.h
index 457ea61..2d4caa9 100644
--- a/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-image-information.h
+++ b/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-image-information.h
@@ -31,44 +31,26 @@ G_BEGIN_DECLS
 #define GUPNP_TYPE_DLNA_GST_IMAGE_INFORMATION \
         (gupnp_dlna_gst_image_information_get_type())
 
-#define GUPNP_DLNA_GST_IMAGE_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                                     GUPNP_TYPE_DLNA_GST_IMAGE_INFORMATION, \
-                                     GUPnPDLNAGstImageInformation))
-
-#define GUPNP_DLNA_GST_IMAGE_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST ((klass), \
-                                  GUPNP_TYPE_DLNA_GST_IMAGE_INFORMATION, \
-                                  GUPnPDLNAGstImageInformationClass))
-
-#define GUPNP_IS_DLNA_GST_IMAGE_INFORMATION(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                                     GUPNP_TYPE_DLNA_GST_IMAGE_INFORMATION))
-
-#define GUPNP_IS_DLNA_GST_IMAGE_INFORMATION_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-                                  GUPNP_TYPE_DLNA_GST_IMAGE_INFORMATION))
-
-#define GUPNP_DLNA_GST_IMAGE_INFORMATION_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-                                    GUPNP_TYPE_DLNA_GST_IMAGE_INFORMATION, \
-                                    GUPnPDLNAGstImageInformationClass))
-
-typedef struct _GUPnPDLNAGstImageInformationPrivate
-                GUPnPDLNAGstImageInformationPrivate;
-
-typedef struct {
-        GUPnPDLNAImageInformation parent;
+// Backwards-compatible defines
+/**
+ * GUPNP_IS_GST_DLNA_IMAGE_INFORMATION: (skip)
+ */
+#define GUPNP_IS_GST_DLNA_IMAGE_INFORMATION GUPNP_DLNA_IS_IMAGE_INFORMATION
+/**
+ * GUPNP_IS_GST_DLNA_IMAGE_INFORMATION_CLASS: (skip)
+ */
+#define GUPNP_IS_GST_DLNA_IMAGE_INFORMATION_CLASS                              \
+        GUPNP_DLNA_IS_IMAGE_INFORMATION_CLASS
 
-        GUPnPDLNAGstImageInformationPrivate *priv;
-} GUPnPDLNAGstImageInformation;
+G_DECLARE_FINAL_TYPE (GUPnPDLNAGstImageInformation,
+                      gupnp_dlna_gst_image_information,
+                      GUPNP_DLNA,
+                      GST_IMAGE_INFORMATION,
+                      GUPnPDLNAImageInformation)
 
-typedef struct {
+struct _GUPnPDLNAGstImageInformationClass {
         GUPnPDLNAImageInformationClass parent_class;
-} GUPnPDLNAGstImageInformationClass;
-
-GType
-gupnp_dlna_gst_image_information_get_type (void);
+};
 
 GUPnPDLNAGstImageInformation *
 gupnp_dlna_gst_image_information_new_from_discoverer_info