[libdmapsharing/LIBDMAPSHARING_3_0] Use g_cclosure_marshal_generic rather than generated marshaling routines
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing/LIBDMAPSHARING_3_0] Use g_cclosure_marshal_generic rather than generated marshaling routines
- Date: Sun, 5 Jul 2020 18:56:10 +0000 (UTC)
commit e75f1561b9dc3556d0ffd0fe8609797903e0e289
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 | 12 ++----------
libdmapsharing/dacp-share.c | 11 +++++------
libdmapsharing/dmap-connection.c | 11 +++++------
libdmapsharing/dmap-marshal.list | 8 --------
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 ++--
11 files changed, 22 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 10aa917..fca981e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,8 +44,6 @@ libdmapsharing/.deps/
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 7a0831d..3883932 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -58,7 +58,6 @@ EXTRA_HFILES=
# Header files to ignore when scanning. Use base file name, no paths
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
IGNORE_HFILES= \
- dmap-marshal.h \
dmap-config.h \
dmap-md5.h \
dmap-mdns-avahi.h \
diff --git a/libdmapsharing/Makefile.am b/libdmapsharing/Makefile.am
index cc65d3a..b1e8dcd 100644
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@ -12,7 +12,6 @@ libdmapsharing_3_0_la_SOURCES = \
dmap-container-record.c \
dmap-db.c \
dmap-enums.c \
- dmap-marshal.c \
dmap-md5.c \
dmap-private-utils.c \
dmap-record.c \
@@ -112,7 +111,6 @@ noinst_HEADERS = \
dmap-gst-mp3-input-stream.h \
dmap-gst-qt-input-stream.h \
dmap-gst-wav-input-stream.h \
- dmap-marshal.h \
dmap-mdns-avahi.h \
dmap-private-utils.h \
gst-util.h \
@@ -121,16 +119,10 @@ noinst_HEADERS = \
test-dpap-record-factory.h \
test-dpap-record.h
-BUILT_SOURCES = dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums.h unit-test.stamp
+BUILT_SOURCES = dmap-enums.c dmap-enums.h unit-test.stamp
CLEANFILES = $(BUILT_SOURCES) ../tests/unit-test.c *-suite.c 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 --include-header dmap-marshal.h
$(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
\"dacp-share.h\"\n#include \"dacp-player.h\"\n#include \"dmap-mdns-publisher.h\"\n#include
\"dmap-mdns-browser.h\"\n#include \"dmap-connection.h\"\n#include \"dmap-enums.h\"" \
@@ -207,4 +199,4 @@ if HAVE_PEDANSEE
done
endif
-EXTRA_DIST = dmap-marshal.list generate-test-suites
+EXTRA_DIST = generate-test-suites
diff --git a/libdmapsharing/dacp-share.c b/libdmapsharing/dacp-share.c
index 2f91f50..8740932 100644
--- a/libdmapsharing/dacp-share.c
+++ b/libdmapsharing/dacp-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.h>
@@ -170,7 +169,7 @@ dacp_share_class_init (DACPShareClass * klass)
G_STRUCT_OFFSET (DACPShareClass, remote_found),
NULL,
NULL,
- dmap_marshal_generated_VOID__STRING_STRING,
+ NULL,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
/**
@@ -187,7 +186,7 @@ dacp_share_class_init (DACPShareClass * klass)
G_STRUCT_OFFSET (DACPShareClass, remote_lost),
NULL,
NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_STRING);
/**
@@ -205,7 +204,7 @@ dacp_share_class_init (DACPShareClass * klass)
G_STRUCT_OFFSET (DACPShareClass, remote_paired),
NULL,
NULL,
- dmap_marshal_generated_VOID__STRING_BOOLEAN,
+ NULL,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
/**
@@ -224,7 +223,7 @@ dacp_share_class_init (DACPShareClass * klass)
G_STRUCT_OFFSET (DACPShareClass, lookup_guid),
NULL,
NULL,
- dmap_marshal_generated_BOOLEAN__STRING,
+ NULL,
G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
/**
@@ -247,7 +246,7 @@ dacp_share_class_init (DACPShareClass * klass)
G_STRUCT_OFFSET (DACPShareClass, add_guid),
NULL,
NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_STRING);
}
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index 5f73242..c3a388c 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -33,7 +33,6 @@
#include "dmap-md5.h"
#include "dmap-connection.h"
#include "dmap-record-factory.h"
-#include "dmap-marshal.h"
#define DMAP_USER_AGENT "iTunes/4.6 (Windows; N)"
@@ -259,7 +258,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,
@@ -271,28 +270,28 @@ 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);
}
static void
diff --git a/libdmapsharing/dmap-mdns-browser-avahi.c b/libdmapsharing/dmap-mdns-browser-avahi.c
index cd65ecd..71f34fc 100644
--- a/libdmapsharing/dmap-mdns-browser-avahi.c
+++ b/libdmapsharing/dmap-mdns-browser-avahi.c
@@ -134,7 +134,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, G_TYPE_POINTER);
dmap_mdns_browser_signals[SERVICE_REMOVED] =
g_signal_new ("service-removed",
@@ -142,7 +142,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 403a0f5..02823a3 100644
--- a/libdmapsharing/dmap-mdns-browser-dnssd.c
+++ b/libdmapsharing/dmap-mdns-browser-dnssd.c
@@ -485,7 +485,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, G_TYPE_POINTER);
dmap_mdns_browser_signals[SERVICE_REMOVED] =
@@ -494,7 +494,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 13ce55c..cd4e28b 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, G_TYPE_POINTER);
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 973c64e..4b1644c 100644
--- a/libdmapsharing/dmap-mdns-publisher-avahi.c
+++ b/libdmapsharing/dmap-mdns-publisher-avahi.c
@@ -409,7 +409,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",
@@ -417,7 +417,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 15f5117..a40d3d0 100644
--- a/libdmapsharing/dmap-mdns-publisher-dnssd.c
+++ b/libdmapsharing/dmap-mdns-publisher-dnssd.c
@@ -226,7 +226,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] =
@@ -236,7 +236,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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
