[libdmapsharing] Work related to Vala binding

[W. Michael Petullo <wmpetullo src gnome org>]

commit 3a0fb49ce7b2151b81f1d4b36c2e0e6be8d15e80
Author: W. Michael Petullo <mike flyn org>
Date:   Tue Mar 20 22:58:28 2018 -0400

    Work related to Vala binding
    
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/dmap-mdns-browser.h |   21 ++++++++++-----------
 libdmapsharing/dmap-mdns-service.h |   12 +++++-------
 tests/dacplisten.c                 |    4 ++--
 tests/dmapcopy.c                   |    2 +-
 tests/dmapserve.c                  |    2 +-
 tests/vala-dmap-container-db.c     |    4 ++--
 vala/libdmapsharing-4.0.metadata   |   15 +++++----------
 7 files changed, 26 insertions(+), 34 deletions(-)
---
diff --git a/libdmapsharing/dmap-mdns-browser.h b/libdmapsharing/dmap-mdns-browser.h
index 91178ec..275da02 100644
--- a/libdmapsharing/dmap-mdns-browser.h
+++ b/libdmapsharing/dmap-mdns-browser.h
@@ -74,8 +74,7 @@ G_BEGIN_DECLS
  * Returns: pointer to object class structure.
  */
 #define DMAP_MDNS_BROWSER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_MDNS_BROWSER, 
DmapMdnsBrowserClass))
-typedef struct _DmapMdnsBrowser DmapMdnsBrowser;
-typedef struct _DmapMdnsBrowserClass DmapMdnsBrowserClass;
+
 typedef struct _DmapMdnsBrowserPrivate DmapMdnsBrowserPrivate;
 
 typedef enum
@@ -84,7 +83,14 @@ typedef enum
        DMAP_MDNS_BROWSER_ERROR_FAILED,
 } DmapMdnsBrowserError;
 
-struct _DmapMdnsBrowserClass
+typedef struct
+{
+       GObject object;
+
+       DmapMdnsBrowserPrivate *priv;
+} DmapMdnsBrowser;
+
+typedef struct
 {
        GObjectClass parent_class;
 
@@ -92,14 +98,7 @@ struct _DmapMdnsBrowserClass
                               DmapMdnsService * service);
        void (*service_removed) (DmapMdnsBrowser * browser,
                                 DmapMdnsService * service);
-};
-
-struct _DmapMdnsBrowser
-{
-       GObject object;
-
-       DmapMdnsBrowserPrivate *priv;
-};
+} DmapMdnsBrowserClass;
 
 #define DMAP_MDNS_BROWSER_ERROR dmap_mdns_browser_error_quark ()
 
diff --git a/libdmapsharing/dmap-mdns-service.h b/libdmapsharing/dmap-mdns-service.h
index d911f66..884ad93 100644
--- a/libdmapsharing/dmap-mdns-service.h
+++ b/libdmapsharing/dmap-mdns-service.h
@@ -69,10 +69,8 @@ G_BEGIN_DECLS
  * Returns: pointer to object class structure.
  */
 #define DMAP_MDNS_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_MDNS_SERVICE, 
DmapMdnsServiceClass))
-typedef struct _DmapMdnsService DmapMdnsService;
-typedef struct _DmapMdnsServiceClass DmapMdnsServiceClass;
+
 typedef struct _DmapMdnsServicePrivate DmapMdnsServicePrivate;
-typedef struct _DmapMdnsServiceService DmapMdnsServiceService;
 
 /**
  * DmapMdnsServiceType:
@@ -113,17 +111,17 @@ static const char * const service_type_name[] = {
        "_raop._tcp"
 };
 
-struct _DmapMdnsServiceClass
+typedef struct
 {
        GObjectClass parent_class;
-};
+} DmapMdnsServiceClass;
 
-struct _DmapMdnsService
+typedef struct
 {
        GObject object;
 
        DmapMdnsServicePrivate *priv;
-};
+} DmapMdnsService;
 
 GType dmap_mdns_service_get_type (void);
 
diff --git a/tests/dacplisten.c b/tests/dacplisten.c
index 72dbfe6..d6cb2c3 100644
--- a/tests/dacplisten.c
+++ b/tests/dacplisten.c
@@ -112,7 +112,7 @@ struct _DacpListenerPrivate {
 
 
 static gpointer vala_dacp_player_parent_class = NULL;
-static DmapControlPlayerInterface * vala_dacp_player_dmap_control_player_parent_iface = NULL;
+static DmapControlPlayerIface * vala_dacp_player_dmap_control_player_parent_iface = NULL;
 static gpointer dacp_listener_parent_class = NULL;
 
 GType vala_dacp_player_get_type (void) G_GNUC_CONST;
@@ -239,7 +239,7 @@ static void vala_dacp_player_class_init (ValaDacpPlayerClass * klass) {
 }
 
 
-static void vala_dacp_player_dmap_control_player_interface_init (DmapControlPlayerInterface * iface) {
+static void vala_dacp_player_dmap_control_player_interface_init (DmapControlPlayerIface * iface) {
        vala_dacp_player_dmap_control_player_parent_iface = g_type_interface_peek_parent (iface);
        iface->now_playing_record = (DmapAvRecord* (*) (DmapControlPlayer *)) 
vala_dacp_player_real_now_playing_record;
        iface->now_playing_artwork = (const gchar* (*) (DmapControlPlayer *, guint, guint)) 
vala_dacp_player_real_now_playing_artwork;
diff --git a/tests/dmapcopy.c b/tests/dmapcopy.c
index eb99c18..1b9ac47 100644
--- a/tests/dmapcopy.c
+++ b/tests/dmapcopy.c
@@ -1,4 +1,4 @@
-/* dmapcopy.c generated by valac 0.38.7, the Vala compiler
+/* dmapcopy.c generated by valac 0.38.8, the Vala compiler
  * generated from dmapcopy.vala, do not modify */
 
 /*   FILE: dmapcopy.vala -- Copy files from a DMAP server
diff --git a/tests/dmapserve.c b/tests/dmapserve.c
index 142ca6b..76a9986 100644
--- a/tests/dmapserve.c
+++ b/tests/dmapserve.c
@@ -1,4 +1,4 @@
-/* dmapserve.c generated by valac 0.38.7, the Vala compiler
+/* dmapserve.c generated by valac 0.38.8, the Vala compiler
  * generated from dmapserve.vala, do not modify */
 
 /*   FILE: dmapserve.vala -- Serve media using DMAP
diff --git a/tests/vala-dmap-container-db.c b/tests/vala-dmap-container-db.c
index fe2dd3f..4350ce5 100644
--- a/tests/vala-dmap-container-db.c
+++ b/tests/vala-dmap-container-db.c
@@ -61,7 +61,7 @@ struct _ValaDmapContainerDbPrivate {
 
 
 static gpointer vala_dmap_container_db_parent_class = NULL;
-static DmapContainerDbInterface * vala_dmap_container_db_dmap_container_db_parent_iface = NULL;
+static DmapContainerDbIface * vala_dmap_container_db_dmap_container_db_parent_iface = NULL;
 
 GType vala_dmap_container_db_get_type (void) G_GNUC_CONST;
 #define VALA_DMAP_CONTAINER_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
TYPE_VALA_DMAP_CONTAINER_DB, ValaDmapContainerDbPrivate))
@@ -171,7 +171,7 @@ static void vala_dmap_container_db_class_init (ValaDmapContainerDbClass * klass)
 }
 
 
-static void vala_dmap_container_db_dmap_container_db_interface_init (DmapContainerDbInterface * iface) {
+static void vala_dmap_container_db_dmap_container_db_interface_init (DmapContainerDbIface * iface) {
        vala_dmap_container_db_dmap_container_db_parent_iface = g_type_interface_peek_parent (iface);
        iface->count = (gint64 (*) (DmapContainerDb *)) vala_dmap_container_db_real_count;
        iface->foreach = (void (*) (DmapContainerDb *, DmapIdContainerRecordFunc, void*)) 
vala_dmap_container_db_real_foreach;
diff --git a/vala/libdmapsharing-4.0.metadata b/vala/libdmapsharing-4.0.metadata
index efa0666..fd5a676 100644
--- a/vala/libdmapsharing-4.0.metadata
+++ b/vala/libdmapsharing-4.0.metadata
@@ -1,14 +1,9 @@
 Dmap cheader_filename="libdmapsharing/dmap.h"
+AvahiClient name="Client" namespace="Avahi"
+AvahiEntryGroup name="EntryGroup" namespace="Avahi"
+
 dmap_container_db_foreach.data hidden="1"
 dmap_db_foreach.data hidden="1"
+
+# Why is this needed? The comment on the function should be sufficient.
 dmap_record_factory_create transfer_ownership="1"
-AvahiClient name="Client" namespace="Avahi"
-AvahiEntryGroup name="EntryGroup" namespace="Avahi"
-DACPPlayState common_prefix="DACP_PLAY_" rename_to="DACPPlayState"
-DACPRepeatState common_prefix="DACP_REPEAT_" rename_to="DACPRepeatState"
-DmapContainerDb type_cname="DmapContainerDbInterface"
-DmapControlPlayer type_cname="DmapControlPlayerInterface"
-DmapDb type_cname="DmapDbInterface"
-DmapImageRecord type_cname="DmapImageRecordInterface"
-DmapRecordFactory type_cname="DmapRecordFactoryInterface"
-DmapRecord type_cname="DmapRecordInterface"