GNOME.org
 

[libdmapsharing] Use g_cclosure_marshal_generic rather than generated marshaling routines

commit e22fb2ac88e5d74d30ab691886bbc85a95d89ebe
Author: W. Michael Petullo <mike flyn org>
Date:   Sat Jul 4 19:20:59 2020 -0500

    Use g_cclosure_marshal_generic rather than generated marshaling routines
    
    Closes #37.

 .gitignore                                 |  2 --
 doc/Makefile.am                            |  1 -
 libdmapsharing/Makefile.am                 | 15 +--------------
 libdmapsharing/dmap-connection.c           | 13 ++++++-------
 libdmapsharing/dmap-control-share.c        | 11 +++++------
 libdmapsharing/dmap-mdns-browser-avahi.c   |  4 ++--
 libdmapsharing/dmap-mdns-browser-dnssd.c   |  4 ++--
 libdmapsharing/dmap-mdns-browser-howl.c    |  4 ++--
 libdmapsharing/dmap-mdns-publisher-avahi.c |  4 ++--
 libdmapsharing/dmap-mdns-publisher-dnssd.c |  4 ++--
 libdmapsharing/dmap-share.c                |  2 +-
 11 files changed, 23 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8d2426..0cafd2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,6 @@ libdmapsharing/Dmap-4.0.typelib
 libdmapsharing/dmap-config.h
 libdmapsharing/dmap-enums.c
 libdmapsharing/dmap-enums.h
-libdmapsharing/dmap-marshal.c
-libdmapsharing/dmap-marshal.h
 libdmapsharing/.libs/
 libdmapsharing/*.l[oa]
 libdmapsharing/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bdff649..e2499f8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -64,7 +64,6 @@ IGNORE_HFILES= \
        dmap-gst-qt-input-stream.h \
        dmap-gst-wav-input-stream.h \
        dmap.h \
-       dmap-marshal.h \
        dmap-mdns-avahi.h \
        dmap-private-utils.h \
        dmap-share-private.h \
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index 205c76e..52487ad 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -13,7 +13,6 @@ libdmapsharing_4_0_la_SOURCES = \
        dmap-db.c \
        dmap-enums.c \
        dmap-error.c \
-       dmap-marshal.c \
        dmap-md5.c \
        dmap-mdns-service.c \
        dmap-private-utils.c \
@@ -123,7 +122,6 @@ noinst_HEADERS = \
        dmap-transcode-qt-stream.h \
        dmap-transcode-stream-private.h \
        dmap-transcode-wav-stream.h \
-       dmap-marshal.h \
        dmap-mdns-avahi.h \
        dmap-private-utils.h \
        dmap-share-private.h \
@@ -138,8 +136,6 @@ noinst_HEADERS = \
        test-dmap-image-record.h
 
 BUILT_SOURCES = \
-       dmap-marshal.c \
-       dmap-marshal.h \
        dmap-enums.c \
        dmap-enums.h \
        unit-test.stamp
@@ -150,12 +146,6 @@ CLEANFILES = $(BUILT_SOURCES) \
        *-suite.h \
        pedansee.conf
 
-dmap-marshal.c: dmap-marshal.list
-       @glib-genmarshal --prefix=dmap_marshal_generated --include-header dmap-marshal.h 
$(srcdir)/dmap-marshal.list --body >dmap-marshal.c
-
-dmap-marshal.h: dmap-marshal.list
-       @glib-genmarshal --prefix=dmap_marshal_generated $(srcdir)/dmap-marshal.list --header >dmap-marshal.h
-
 dmap-enums.c: $(libdmapsharinginclude_headers) Makefile dmap-enums.h
        @glib-mkenums \
                        --fhead "/* Automatically generated by glib-mkenums */\n\n#include 
\"dmap-control-share.h\"\n#include \"dmap-control-player.h\"\n#include \"dmap-mdns-publisher.h\"\n#include 
\"dmap-mdns-browser.h\"\n#include \"dmap-connection.h\"\n#include \"dmap-error.h\"\n#include 
\"dmap-enums.h\"" \
@@ -319,9 +309,6 @@ if HAVE_PEDANSEE
                if [ $$i = dmap-enums.h ]; then # Skip this generated code. \
                        continue; \
                fi; \
-               if [ $$i = dmap-marshal.h ]; then # Skip this generated code. \
-                       continue; \
-               fi; \
                if [ $$i = dmap-share-private.h ]; then # Skip this code. \
                        continue; \
                fi; \
@@ -332,4 +319,4 @@ if HAVE_PEDANSEE
        done
 endif
 
-EXTRA_DIST = dmap-marshal.list generate-test-suites
+EXTRA_DIST = generate-test-suites
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index 4f657ba..ded073b 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -35,7 +35,6 @@
 #include "dmap-connection-private.h"
 #include "dmap-error.h"
 #include "dmap-record-factory.h"
-#include "dmap-marshal.h"
 #include "dmap-structure.h"
 
 #define DMAP_USER_AGENT "iTunes/4.6 (Windows; N)"
@@ -441,7 +440,7 @@ dmap_connection_class_init (DmapConnectionClass * klass)
                                              G_STRUCT_OFFSET
                                              (DmapConnectionClass,
                                               authenticate), NULL, NULL,
-                                             
dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN,
+                                             NULL,
                                              G_TYPE_NONE, 5,
                                              G_TYPE_STRING,
                                              SOUP_TYPE_SESSION,
@@ -453,34 +452,34 @@ dmap_connection_class_init (DmapConnectionClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapConnectionClass,
                                               connecting), NULL, NULL,
-                             dmap_marshal_generated_VOID__ULONG_FLOAT, G_TYPE_NONE, 2,
+                             NULL, G_TYPE_NONE, 2,
                              G_TYPE_ULONG, G_TYPE_FLOAT);
        _signals[CONNECTED] =
                g_signal_new ("connected", G_TYPE_FROM_CLASS (object_class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapConnectionClass,
                                               connected), NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+                             NULL, G_TYPE_NONE, 0);
        _signals[DISCONNECTED] =
                g_signal_new ("disconnected",
                              G_TYPE_FROM_CLASS (object_class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapConnectionClass,
                                               disconnected), NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+                             NULL, G_TYPE_NONE, 0);
        _signals[OPERATION_DONE] =
                g_signal_new ("operation-done",
                              G_TYPE_FROM_CLASS (object_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (DmapConnectionClass,
                                               operation_done), NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+                             NULL, G_TYPE_NONE, 0);
        _signals[ERROR] =
                g_signal_new ("error",
                              G_TYPE_FROM_CLASS (object_class),
                              G_SIGNAL_RUN_FIRST,
                              0, NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
+                             NULL, G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 }
 
diff --git a/libdmapsharing/dmap-control-share.c b/libdmapsharing/dmap-control-share.c
index 3bad58d..5ff89c7 100644
--- a/libdmapsharing/dmap-control-share.c
+++ b/libdmapsharing/dmap-control-share.c
@@ -38,7 +38,6 @@
 #include <libsoup/soup-server.h>
 
 #include <libdmapsharing/dmap.h>
-#include <libdmapsharing/dmap-marshal.h>
 #include <libdmapsharing/dmap-structure.h>
 #include <libdmapsharing/dmap-share-private.h>
 
@@ -285,7 +284,7 @@ dmap_control_share_class_init (DmapControlShareClass * klass)
                              G_STRUCT_OFFSET (DmapControlShareClass, remote_found),
                              NULL,
                              NULL,
-                             dmap_marshal_generated_VOID__STRING_STRING,
+                             NULL,
                              G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
        /**
@@ -302,7 +301,7 @@ dmap_control_share_class_init (DmapControlShareClass * klass)
                              G_STRUCT_OFFSET (DmapControlShareClass, remote_lost),
                              NULL,
                              NULL,
-                             g_cclosure_marshal_VOID__STRING,
+                             NULL,
                              G_TYPE_NONE, 1, G_TYPE_STRING);
 
        /**
@@ -320,7 +319,7 @@ dmap_control_share_class_init (DmapControlShareClass * klass)
                              G_STRUCT_OFFSET (DmapControlShareClass, remote_paired),
                              NULL,
                              NULL,
-                             dmap_marshal_generated_VOID__STRING_BOOLEAN,
+                             NULL,
                              G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
        /**
@@ -339,7 +338,7 @@ dmap_control_share_class_init (DmapControlShareClass * klass)
                              G_STRUCT_OFFSET (DmapControlShareClass, lookup_guid),
                              NULL,
                              NULL,
-                             dmap_marshal_generated_BOOLEAN__STRING,
+                             NULL,
                              G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
 
        /**
@@ -362,7 +361,7 @@ dmap_control_share_class_init (DmapControlShareClass * klass)
                              G_STRUCT_OFFSET (DmapControlShareClass, add_guid),
                              NULL,
                              NULL,
-                             g_cclosure_marshal_VOID__STRING,
+                             NULL,
                              G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
diff --git a/libdmapsharing/dmap-mdns-browser-avahi.c b/libdmapsharing/dmap-mdns-browser-avahi.c
index 64fe3a1..878279e 100644
--- a/libdmapsharing/dmap-mdns-browser-avahi.c
+++ b/libdmapsharing/dmap-mdns-browser-avahi.c
@@ -136,7 +136,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_added), NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE,
+                             NULL, G_TYPE_NONE,
                              1, DMAP_TYPE_MDNS_SERVICE);
        _signals[SERVICE_REMOVED] =
                g_signal_new ("service-removed",
@@ -144,7 +144,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_removed), NULL, NULL,
-                             g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1,
+                             NULL, G_TYPE_NONE, 1,
                              G_TYPE_STRING);
 }
 
diff --git a/libdmapsharing/dmap-mdns-browser-dnssd.c b/libdmapsharing/dmap-mdns-browser-dnssd.c
index 8ee1ccd..1db8e02 100644
--- a/libdmapsharing/dmap-mdns-browser-dnssd.c
+++ b/libdmapsharing/dmap-mdns-browser-dnssd.c
@@ -502,7 +502,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_added), NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE,
+                             NULL, G_TYPE_NONE,
                              1, DMAP_TYPE_MDNS_SERVICE);
 
        _signals[SERVICE_REMOVED] =
@@ -511,7 +511,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_removed), NULL, NULL,
-                             g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1,
+                             NULL, G_TYPE_NONE, 1,
                              G_TYPE_STRING);
 }
 
diff --git a/libdmapsharing/dmap-mdns-browser-howl.c b/libdmapsharing/dmap-mdns-browser-howl.c
index b8ae855..3fe78f1 100644
--- a/libdmapsharing/dmap-mdns-browser-howl.c
+++ b/libdmapsharing/dmap-mdns-browser-howl.c
@@ -442,7 +442,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_added), NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE,
+                             NULL, G_TYPE_NONE,
                              1, DMAP_TYPE_MDNS_SERVICE);
        signals[SERVICE_REMOVED] =
                g_signal_new ("service-removed",
@@ -450,7 +450,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_removed), NULL, NULL,
-                             g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1,
+                             NULL, G_TYPE_NONE, 1,
                              G_TYPE_STRING);
 }
 
diff --git a/libdmapsharing/dmap-mdns-publisher-avahi.c b/libdmapsharing/dmap-mdns-publisher-avahi.c
index 59e83f6..e5e8f71 100644
--- a/libdmapsharing/dmap-mdns-publisher-avahi.c
+++ b/libdmapsharing/dmap-mdns-publisher-avahi.c
@@ -410,7 +410,7 @@ dmap_mdns_publisher_class_init (DmapMdnsPublisherClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsPublisherClass,
                                               published), NULL, NULL,
-                             g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1,
+                             NULL, G_TYPE_NONE, 1,
                              G_TYPE_STRING);
        _signals[NAME_COLLISION] =
                g_signal_new ("name-collision",
@@ -418,7 +418,7 @@ dmap_mdns_publisher_class_init (DmapMdnsPublisherClass * klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (DmapMdnsPublisherClass,
                                               name_collision), NULL, NULL,
-                             g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1,
+                             NULL, G_TYPE_NONE, 1,
                              G_TYPE_STRING);
 }
 
diff --git a/libdmapsharing/dmap-mdns-publisher-dnssd.c b/libdmapsharing/dmap-mdns-publisher-dnssd.c
index c2d7a6b..da17af5 100644
--- a/libdmapsharing/dmap-mdns-publisher-dnssd.c
+++ b/libdmapsharing/dmap-mdns-publisher-dnssd.c
@@ -228,7 +228,7 @@ dmap_mdns_publisher_class_init (DmapMdnsPublisherClass *klass)
                              G_STRUCT_OFFSET (DmapMdnsPublisherClass, published),
                               NULL,
                               NULL,
-                              g_cclosure_marshal_VOID__STRING,
+                              NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
         _signals [NAME_COLLISION] =
@@ -238,7 +238,7 @@ dmap_mdns_publisher_class_init (DmapMdnsPublisherClass *klass)
                              G_STRUCT_OFFSET (DmapMdnsPublisherClass, name_collision),
                               NULL,
                               NULL,
-                              g_cclosure_marshal_VOID__STRING,
+                              NULL,
                               G_TYPE_NONE,
                               1, G_TYPE_STRING);
 }
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index 320c691..d652a29 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -1676,7 +1676,7 @@ dmap_share_class_init (DmapShareClass * klass)
                               G_TYPE_FROM_CLASS (object_class),
                               G_SIGNAL_RUN_FIRST,
                               0, NULL, NULL,
-                              g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1,
+                              NULL, G_TYPE_NONE, 1,
                               G_TYPE_POINTER);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]