[libdmapsharing: 13/13] Merge branch 'gobject-introspection'
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing: 13/13] Merge branch 'gobject-introspection'
- Date: Sat, 11 Nov 2017 02:52:48 +0000 (UTC)
commit 7baf2b9afdd1acc4f12b6ce27c8ce43ce759b575
Merge: 0fa30fa 9730159
Author: W. Michael Petullo <mike flyn org>
Date: Fri Nov 10 21:52:25 2017 -0500
Merge branch 'gobject-introspection'
Signed-off-by: W. Michael Petullo <mike flyn org>
configure.ac | 8 +-
...d.pc.in => libdmapsharing-3.2-uninstalled.pc.in | 0
...apsharing-3.0.pc.in => libdmapsharing-3.2.pc.in | 0
libdmapsharing/Makefile.am | 54 +-
libdmapsharing/daap-connection.h | 12 +
libdmapsharing/daap-share.c | 13 +-
libdmapsharing/dacp-share.c | 28 +-
libdmapsharing/dmap-connection.c | 53 +-
libdmapsharing/dmap-connection.h | 19 +-
libdmapsharing/dmap-db.c | 6 +-
libdmapsharing/dmap-db.h | 18 +-
libdmapsharing/dmap-mdns-browser-avahi.c | 64 +-
libdmapsharing/dmap-mdns-browser-dnssd.c | 3 +-
libdmapsharing/dmap-mdns-browser-howl.c | 13 +-
libdmapsharing/dmap-mdns-browser.h | 55 +--
libdmapsharing/dmap-mdns-service.c | 254 +++++++
libdmapsharing/dmap-mdns-service.h | 131 ++++
libdmapsharing/dmap-record-factory.h | 2 +-
libdmapsharing/dmap-share.c | 16 +-
libdmapsharing/dmap-share.h | 3 +-
libdmapsharing/dmap.h | 1 +
libdmapsharing/dpap-share.c | 10 +-
libdmapsharing/test-dpap-record.c | 16 +-
tests/Makefile.am | 10 +-
tests/dacplisten.c | 76 +-
tests/dmapcopy.c | 142 +++--
tests/dmapcopy.vala | 12 +-
tests/dmapserve.c | 45 +-
tests/dpapview.c | 610 -----------------
tests/dpapview.vala | 12 +-
tests/test-dmap-client-python | 89 +++
tests/test-dmap-client.c | 37 +-
tests/test-dmap-server.c | 8 +-
tests/vala-dmap-container-db.c | 54 +-
tests/vala-dmap-db.c | 268 --------
tests/vala-dpap-record.c | 709 --------------------
.../libdmapsharing-3.0-uninstalled.files.in | 2 -
.../libdmapsharing-3.0-uninstalled.excludes | 1 -
.../libdmapsharing-3.0-uninstalled.files.in | 2 -
.../libdmapsharing-3.0-uninstalled.files.in | 2 -
.../libdmapsharing-3.0-uninstalled.files.in | 2 -
.../.libdmapsharing-3.1-uninstalled.excludes.swp | Bin 0 -> 12288 bytes
.../libdmapsharing-3.2-uninstalled.excludes} | 1 +
.../libdmapsharing-3.2-uninstalled.files.in | 2 +
.../libdmapsharing-3.2-uninstalled.namespace} | 0
.../libdmapsharing-3.2.metadata} | 0
.../libdmapsharing-3.2-uninstalled.excludes} | 2 +-
.../libdmapsharing-3.2-uninstalled.files.in | 2 +
.../libdmapsharing-3.2-uninstalled.namespace} | 0
.../libdmapsharing-3.2.metadata} | 0
.../libdmapsharing-3.2-uninstalled.excludes} | 1 +
.../libdmapsharing-3.2-uninstalled.files.in | 2 +
.../libdmapsharing-3.2-uninstalled.namespace} | 0
.../libdmapsharing-3.2.metadata} | 0
.../libdmapsharing-3.2-uninstalled.excludes} | 1 +
.../libdmapsharing-3.2-uninstalled.files.in | 2 +
.../libdmapsharing-3.2-uninstalled.namespace} | 0
.../libdmapsharing-3.2.metadata} | 0
...mapsharing-3.0.vapi => libdmapsharing-3.2.vapi} | 478 ++++++++------
59 files changed, 1151 insertions(+), 2200 deletions(-)
---
diff --cc configure.ac
index cdf8c1e,cad2ecb..7ade2c1
--- a/configure.ac
+++ b/configure.ac
@@@ -1,8 -1,8 +1,8 @@@
- AC_INIT(libdmapsharing, 2.9.39)
-AC_INIT(libdmapsharing, 2.9.26)
++AC_INIT(libdmapsharing, 3.1.0)
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
- AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 39, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
-AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 26, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
++AS_VERSION(libdmapsharing, LIBDMAPSHARING, 3, 1, 0, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
# Enable silent build when available (Automake 1.11)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@@ -10,7 -10,7 +10,7 @@@
dnl FIXME:
dnl would like to automate this off the above definitions, but API might be 2.2 with version 2.1.
dnl see also Makefile.am, libdmapsharing/Makefile.am and libdmapsharing.pc.in
--API_VERSION=3.0
++API_VERSION=3.2
#AC_DEFINE(API_VERSION, $API_VERSION, [library API version])
AC_SUBST(API_VERSION)
@@@ -323,7 -331,7 +323,7 @@@ PKG_CHECK_MODULES(GSTREAMERAPP
if test x"$HAVE_GSTREAMERAPP" = "xyes"; then
AC_DEFINE(HAVE_GSTREAMERAPP, 1, [Define if GStreamer App support is enabled])
GSTLIB=gstreamer-1.0
-- AC_SUBST(GSTLIB) # For libdmapsharing-3.0.pc.in.
++ AC_SUBST(GSTLIB) # For libdmapsharing-3.2.pc.in.
else
AC_WARN(GStreamer app element not present, transcoding will not be supported.)
fi
diff --cc libdmapsharing/Makefile.am
index 5258da6,6cd6da1..7ddf24d
--- a/libdmapsharing/Makefile.am
+++ b/libdmapsharing/Makefile.am
@@@ -1,6 -1,9 +1,6 @@@
--lib_LTLIBRARIES = libdmapsharing-3.0.la
++lib_LTLIBRARIES = libdmapsharing-3.2.la
- libdmapsharing_3_0_la_SOURCES = \
-BUILT_SOURCES = dmap-marshal.c dmap-marshal.h dmap-enums.c dmap-enums.h
-
-libdmapsharing_3_0_la_SOURCES = \
- $(BUILT_SOURCES) \
++libdmapsharing_3_2_la_SOURCES = \
daap-connection.c \
daap-record.c \
daap-share.c \
@@@ -11,9 -14,8 +11,10 @@@
dmap-container-db.c \
dmap-container-record.c \
dmap-db.c \
+ dmap-enums.c \
+ dmap-marshal.c \
dmap-md5.c \
+ dmap-mdns-service.c \
dmap-private-utils.c \
dmap-record.c \
dmap-record-factory.c \
@@@ -24,24 -26,16 +25,24 @@@
dpap-record.c \
dpap-share.c
+if HAVE_CHECK
- libdmapsharing_3_0_la_SOURCES += \
++libdmapsharing_3_2_la_SOURCES += \
+ test-daap-record.c \
+ test-daap-record-factory.c \
+ test-dpap-record.c \
+ test-dpap-record-factory.c
+endif
+
if USE_HOWL
--libdmapsharing_3_0_la_SOURCES += \
++libdmapsharing_3_2_la_SOURCES += \
dmap-mdns-browser-howl.c
else
if USE_DNS_SD
--libdmapsharing_3_0_la_SOURCES += \
++libdmapsharing_3_2_la_SOURCES += \
dmap-mdns-browser-dnssd.c \
dmap-mdns-publisher-dnssd.c
else
--libdmapsharing_3_0_la_SOURCES += \
++libdmapsharing_3_2_la_SOURCES += \
dmap-mdns-avahi.c \
dmap-mdns-browser-avahi.c \
dmap-mdns-publisher-avahi.c
@@@ -49,7 -43,7 +50,7 @@@ endi
endif
if USE_GSTREAMERAPP
--libdmapsharing_3_0_la_SOURCES += \
++libdmapsharing_3_2_la_SOURCES += \
dmap-gst-input-stream.c \
dmap-gst-mp3-input-stream.c \
dmap-gst-qt-input-stream.c \
@@@ -57,16 -51,15 +58,16 @@@
gst-util.c
endif
--libdmapsharing_3_0_la_CFLAGS = \
++libdmapsharing_3_2_la_CFLAGS = \
-DG_LOG_DOMAIN=\"libdmapsharing\" \
-I$(top_srcdir) \
+ -I$(top_builddir) \
$(GDKPIXBUF_CFLAGS) \
$(SOUP_CFLAGS) \
$(GSTREAMERAPP_CFLAGS) \
$(MDNS_CFLAGS)
--libdmapsharing_3_0_la_LDFLAGS = \
++libdmapsharing_3_2_la_LDFLAGS = \
-version-info @SO_VERSION@ \
$(CHECK_LIBS) \
$(GLIB_LIBS) \
@@@ -157,21 -140,27 +159,27 @@@ unit-test.stamp: $(grep -l START_TEST *
if HAVE_INTROSPECTION
include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
- INTROSPECTION_SCANNER_ARGS = --symbol-prefix=dmap --add-include-path=$(srcdir) --warn-all
+ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
introspection_sources = $(libdmapsharinginclude_HEADERS) $(libdmapsharinginclude_SOURCES)
--DMAP-3.0.gir: libdmapsharing-3.0.la
- DMAP_3_0_gir_INCLUDES = GObject-2.0 Soup-2.4
- DMAP_3_0_gir_CFLAGS = \
- $(libdmapsharing_3_0_la_CFLAGS)
- DMAP_3_0_gir_LIBS = \
- libdmapsharing-3.0.la
- DMAP_3_0_gir_FILES = $(introspection_sources)
-DMAP_3_0_gir_NAMESPACE = DMAP
-DMAP_3_0_gir_SCANNERFLAGS = --symbol-prefix=dmap
-DMAP_3_0_gir_LIBS = libdmapsharing-3.0.la
-DMAP_3_0_gir_FILES = $(introspection_sources)
-DMAP_3_0_gir_INCLUDES = GObject-2.0 Soup-2.4
-DMAP_3_0_gir_CFLAGS = $(INCLUDES) $(libdmapsharing_3_0_la_CFLAGS)
++DMAP-3.2.gir: libdmapsharing-3.2.la
++DMAP_3_2_gir_NAMESPACE = DMAP
++DMAP_3_2_gir_SCANNERFLAGS = --symbol-prefix=dmap
++DMAP_3_2_gir_LIBS = libdmapsharing-3.2.la
++DMAP_3_2_gir_FILES = $(introspection_sources)
++DMAP_3_2_gir_INCLUDES = GObject-2.0 Soup-2.4
++DMAP_3_2_gir_CFLAGS = $(INCLUDES) $(libdmapsharing_3_2_la_CFLAGS)
+
-DAAP-3.0.gir: libdmapsharing-3.0.la
-DAAP_3_0_gir_NAMESPACE = DAAP
-DAAP_3_0_gir_SCANNERFLAGS = --symbol-prefix=daap
-DAAP_3_0_gir_LIBS = libdmapsharing-3.0.la
-DAAP_3_0_gir_FILES = $(introspection_sources)
-DAAP_3_0_gir_INCLUDES = GObject-2.0 Soup-2.4 DMAP-3.0
-DAAP_3_0_gir_CFLAGS = $(INCLUDES) $(libdmapsharing_3_0_la_CFLAGS)
++DAAP-3.2.gir: libdmapsharing-3.2.la
++DAAP_3_2_gir_NAMESPACE = DAAP
++DAAP_3_2_gir_SCANNERFLAGS = --symbol-prefix=daap
++DAAP_3_2_gir_LIBS = libdmapsharing-3.2.la
++DAAP_3_2_gir_FILES = $(introspection_sources)
++DAAP_3_2_gir_INCLUDES = GObject-2.0 Soup-2.4 DMAP-3.2
++DAAP_3_2_gir_CFLAGS = $(INCLUDES) $(libdmapsharing_3_2_la_CFLAGS)
- INTROSPECTION_GIRS += DMAP-3.0.gir
-INTROSPECTION_GIRS = DMAP-3.0.gir DAAP-3.0.gir
++INTROSPECTION_GIRS = DMAP-3.2.gir DAAP-3.2.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
@@@ -182,28 -171,4 +190,28 @@@ typelib_DATA = $(INTROSPECTION_GIRS:.gi
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
-EXTRA_DIST = dmap-marshal.list
+check:
+if HAVE_PEDANSEE
+ echo "[ignore]" > pedansee.conf
+ echo -n " name = " >> pedansee.conf
+ for i in $$(grep G_DEFINE_TYPE *.c | sed 's/[^,]*, \([^,]*\),.*/\1/g'); do \
+ echo -n $${i}_init\;; \
+ echo -n $${i}_class_init\;; \
+ echo -n $${i}_parent_class\;; \
+ echo -n $${i}_get_instance_private\;; \
+ echo -n $${i}_class_intern_init\;; \
+ echo -n $${i}_get_type\;; \
+ done >> pedansee.conf
+ for i in $$(grep G_DEFINE_TYPE *.c | sed 's/.*(\([^,]*\),.*/\1/g'); do \
+ echo -n $${i}_private_offset\;; \
+ done >> pedansee.conf
- set -e; for i in $(libdmapsharing_3_0_la_SOURCES); do \
- $(PEDANSEE) -c pedansee.conf $$i -- -x c $(DEFS) $(libdmapsharing_3_0_la_CFLAGS); \
++ set -e; for i in $(libdmapsharing_3_2_la_SOURCES); do \
++ $(PEDANSEE) -c pedansee.conf $$i -- -x c $(DEFS) $(libdmapsharing_3_2_la_CFLAGS); \
+ done
+ set -e; for i in $(libdmapsharinginclude_HEADERS) \
+ $(noinst_HEADERS); do \
- $(PEDANSEE) -c pedansee.conf $$i -- -x c $(DEFS) $(libdmapsharing_3_0_la_CFLAGS); \
++ $(PEDANSEE) -c pedansee.conf $$i -- -x c $(DEFS) $(libdmapsharing_3_2_la_CFLAGS); \
+ done
+endif
+
+EXTRA_DIST = dmap-marshal.list generate-test-suites
diff --cc libdmapsharing/dmap-connection.c
index cec5b4b,60219ee..3059f11
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@@ -1256,10 -1258,10 +1259,10 @@@ dmap_connection_start (DMAPConnection
g_strdup_printf ("daap://%s:%d", connection->priv->host,
connection->priv->port);
- rdata = g_new (ConnectionResponseData, 1);
+ rdata = g_new0 (ConnectionResponseData, 1);
rdata->connection = g_object_ref (connection);
rdata->callback = callback;
- rdata->data = user_data;
+ rdata->user_data = user_data;
rdata->destroy = connection_response_data_free;
g_signal_connect (connection, "operation-done",
G_CALLBACK (connected_cb), rdata);
@@@ -1334,10 -1336,10 +1337,10 @@@ dmap_connection_disconnect (DMAPConnect
// FIXME: GDK_THREADS_ENTER ();
}
- rdata = g_new (ConnectionResponseData, 1);
+ rdata = g_new0 (ConnectionResponseData, 1);
rdata->connection = g_object_ref (connection);
rdata->callback = callback;
- rdata->data = user_data;
+ rdata->user_data = user_data;
rdata->destroy = connection_response_data_free;
g_signal_connect (connection, "operation-done",
diff --cc libdmapsharing/dmap-mdns-browser-dnssd.c
index c2c0cf0,e3f93c0..7a250bf
--- a/libdmapsharing/dmap-mdns-browser-dnssd.c
+++ b/libdmapsharing/dmap-mdns-browser-dnssd.c
@@@ -63,23 -68,18 +63,22 @@@ static guint dmap_mdns_browser_signals[
G_DEFINE_TYPE (DMAPMdnsBrowser, dmap_mdns_browser, G_TYPE_OBJECT);
static void
-dnssd_browser_init (DMAPMdnsBrowser * browser)
+dmap_mdns_browser_init (DMAPMdnsBrowser * browser)
{
- g_debug ("dnssd_browser_init ()");
+ g_assert (NULL != browser);
+
+ browser->priv = DMAP_MDNS_BROWSER_GET_PRIVATE (browser);
}
--static void
-dmap_mdns_browser_init (DMAPMdnsBrowser * browser)
+free_service (DMAPMdnsBrowserService * service)
{
- g_debug ("dmap_mdns_browser_init ()");
+ g_assert (NULL != service);
- browser->priv = DMAP_MDNS_BROWSER_GET_PRIVATE (browser);
- dnssd_browser_init (browser);
+ g_free (service->service_name);
+ g_free (service->name);
+ g_free (service->host);
+ g_free (service->pair);
+ g_free (service);
}
static void
@@@ -445,9 -317,9 +444,9 @@@ dmap_mdns_browser_dispose (GObject * ob
GSList *walk;
DMAPMdnsBrowserService *service;
- for (walk = browser->priv->services; walk; walk = walk->next) {
+ for (walk = browser->priv->services; NULL != walk; walk = walk->next) {
service = (DMAPMdnsBrowserService *) walk->data;
- free_service (service);
+ g_object_unref (service);
}
g_slist_free (browser->priv->services);
diff --cc tests/Makefile.am
index bfc5f6d,9c0048f..abe0c5f
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -7,7 -6,7 +7,7 @@@ endi
# Automake documentation mentions LDADD, but it does not work;
# LIBS does.
--LIBS = $(top_builddir)/libdmapsharing/libdmapsharing-3.0.la
++LIBS = $(top_builddir)/libdmapsharing/libdmapsharing-3.2.la
if HAVE_CHECK
noinst_PROGRAMS += unit-test
@@@ -45,24 -53,22 +45,24 @@@ test_dmap_server_LDADD =
$(MDNS_LIBS)
if HAVE_VALAC
+if WITH_TESTS
BUILT_SOURCES = dacplisten.stamp dpapview.stamp dmapcopy.stamp dmapserve.stamp
+endif
dacplisten.stamp: $(dacplisten_VALASOURCES)
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg
libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg
libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
++ $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.2 --pkg
libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
touch $@
dpapview.stamp: $(dpapview_VALASOURCES)
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gtk+-2.0 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0
--pkg libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gtk+-2.0 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0
--pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
++ $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gtk+-2.0 --pkg gstreamer-1.0 --pkg libdmapsharing-3.2
--pkg libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
touch $@
dmapcopy.stamp: $(dmapcopy_VALASOURCES)
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg
libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg
libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
++ $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.2 --pkg
libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
touch $@
dmapserve.stamp: $(dmapserve_VALASOURCES)
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg
libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
- $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg
libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
++ $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.2 --pkg
libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
touch $@
endif
diff --cc tests/dacplisten.c
index ac7c401,6903376..7142027
--- a/tests/dacplisten.c
+++ b/tests/dacplisten.c
@@@ -1,4 -1,4 +1,4 @@@
- /* dacplisten.c generated by valac 0.27.2, the Vala compiler
-/* dacplisten.c generated by valac 0.22.1, the Vala compiler
++/* dacplisten.c generated by valac 0.36.5, the Vala compiler
* generated from dacplisten.vala, do not modify */
/* FILE: dacplisten.vala -- Listen to DACP remotes
@@@ -102,7 -102,7 +102,7 @@@ struct _DACPListenerPrivate
static gpointer vala_dacp_player_parent_class = NULL;
--static DACPPlayerIface* vala_dacp_player_dacp_player_parent_iface = NULL;
++static DACPPlayerIface * vala_dacp_player_dacp_player_parent_iface = NULL;
static gpointer dacp_listener_parent_class = NULL;
GType vala_dacp_player_get_type (void) G_GNUC_CONST;
@@@ -132,18 -132,18 +132,18 @@@ GType vala_dmap_db_get_type (void) G_GN
ValaDMAPContainerDb* vala_dmap_container_db_new (void);
ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type);
GType vala_dmap_container_db_get_type (void) G_GNUC_CONST;
-static void __lambda2_ (DACPListener* self, const gchar* service_name, const gchar* display_name);
-static void ___lambda2__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const
gchar* remote_name, gpointer self);
-static void __lambda3_ (DACPListener* self, const gchar* guid);
-static void ___lambda3__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self);
-static void dacp_listener_finalize (GObject* obj);
+static void __lambda4_ (DACPListener* self, const gchar* service_name, const gchar* display_name);
+static void ___lambda4__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const
gchar* remote_name, gpointer self);
+static void __lambda5_ (DACPListener* self, const gchar* guid);
+static void ___lambda5__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self);
- static void dacp_listener_finalize (GObject* obj);
++static void dacp_listener_finalize (GObject * obj);
gint _vala_main (gchar** args, int args_length1);
static DAAPRecord* vala_dacp_player_real_now_playing_record (DACPPlayer* base) {
ValaDACPPlayer * self;
DAAPRecord* result = NULL;
-- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Now playing record request received\n");
@@@ -155,9 -155,9 +155,9 @@@
static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guint width, guint height, int*
result_length1) {
ValaDACPPlayer * self;
guchar* result = NULL;
-- FILE* _tmp0_ = NULL;
-- guchar* _tmp1_ = NULL;
-- gint _tmp1__length1 = 0;
++ FILE* _tmp0_;
++ guchar* _tmp1_;
++ gint _tmp1__length1;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Now playing artwork request received\n");
@@@ -173,7 -173,7 +173,7 @@@
static void vala_dacp_player_real_play_pause (DACPPlayer* base) {
ValaDACPPlayer * self;
-- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Play/pause request received\n");
@@@ -182,7 -182,7 +182,7 @@@
static void vala_dacp_player_real_pause (DACPPlayer* base) {
ValaDACPPlayer * self;
-- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Pause request received\n");
@@@ -191,7 -191,7 +191,7 @@@
static void vala_dacp_player_real_next_item (DACPPlayer* base) {
ValaDACPPlayer * self;
-- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Next item request received\n");
@@@ -200,7 -200,7 +200,7 @@@
static void vala_dacp_player_real_prev_item (DACPPlayer* base) {
ValaDACPPlayer * self;
-- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Previous item request received\n");
@@@ -209,7 -209,7 +209,7 @@@
static void vala_dacp_player_real_cue_clear (DACPPlayer* base) {
ValaDACPPlayer * self;
-- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Cue clear request received\n");
@@@ -218,7 -218,7 +218,7 @@@
static void vala_dacp_player_real_cue_play (DACPPlayer* base, GList* records, guint index) {
ValaDACPPlayer * self;
-- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
self = (ValaDACPPlayer*) base;
_tmp0_ = stdout;
fprintf (_tmp0_, "Cue play request received\n");
@@@ -244,14 -244,14 +244,14 @@@ static void vala_dacp_player_class_ini
static void vala_dacp_player_dacp_player_interface_init (DACPPlayerIface * iface) {
vala_dacp_player_dacp_player_parent_iface = g_type_interface_peek_parent (iface);
-- iface->now_playing_record = (DAAPRecord* (*)(DACPPlayer*)) vala_dacp_player_real_now_playing_record;
-- iface->now_playing_artwork = (guchar* (*)(DACPPlayer*, guint, guint, int*))
vala_dacp_player_real_now_playing_artwork;
-- iface->play_pause = (void (*)(DACPPlayer*)) vala_dacp_player_real_play_pause;
-- iface->pause = (void (*)(DACPPlayer*)) vala_dacp_player_real_pause;
-- iface->next_item = (void (*)(DACPPlayer*)) vala_dacp_player_real_next_item;
-- iface->prev_item = (void (*)(DACPPlayer*)) vala_dacp_player_real_prev_item;
-- iface->cue_clear = (void (*)(DACPPlayer*)) vala_dacp_player_real_cue_clear;
-- iface->cue_play = (void (*)(DACPPlayer*, GList*, guint)) vala_dacp_player_real_cue_play;
++ iface->now_playing_record = (DAAPRecord* (*) (DACPPlayer *)) vala_dacp_player_real_now_playing_record;
++ iface->now_playing_artwork = (guchar* (*) (DACPPlayer *, guint, guint, int*))
vala_dacp_player_real_now_playing_artwork;
++ iface->play_pause = (void (*) (DACPPlayer *)) vala_dacp_player_real_play_pause;
++ iface->pause = (void (*) (DACPPlayer *)) vala_dacp_player_real_pause;
++ iface->next_item = (void (*) (DACPPlayer *)) vala_dacp_player_real_next_item;
++ iface->prev_item = (void (*) (DACPPlayer *)) vala_dacp_player_real_prev_item;
++ iface->cue_clear = (void (*) (DACPPlayer *)) vala_dacp_player_real_cue_clear;
++ iface->cue_play = (void (*) (DACPPlayer *, GList*, guint)) vala_dacp_player_real_cue_play;
}
@@@ -273,10 -273,10 +273,10 @@@ GType vala_dacp_player_get_type (void)
}
-static void __lambda2_ (DACPListener* self, const gchar* service_name, const gchar* display_name) {
- FILE* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+static void __lambda4_ (DACPListener* self, const gchar* service_name, const gchar* display_name) {
- FILE* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
++ FILE* _tmp0_;
++ const gchar* _tmp1_;
++ const gchar* _tmp2_;
g_return_if_fail (service_name != NULL);
g_return_if_fail (display_name != NULL);
_tmp0_ = stdout;
@@@ -291,8 -291,8 +291,8 @@@ static void ___lambda4__dacp_share_remo
}
-static void __lambda3_ (DACPListener* self, const gchar* guid) {
- FILE* _tmp0_ = NULL;
+static void __lambda5_ (DACPListener* self, const gchar* guid) {
- FILE* _tmp0_ = NULL;
++ FILE* _tmp0_;
g_return_if_fail (guid != NULL);
_tmp0_ = stdout;
fprintf (_tmp0_, "Add GUID request received\n");
@@@ -306,16 -306,16 +306,16 @@@ static void ___lambda5__dacp_share_add_
DACPListener* dacp_listener_construct (GType object_type) {
DACPListener * self = NULL;
-- ValaDMAPDb* _tmp0_ = NULL;
-- ValaDMAPContainerDb* _tmp1_ = NULL;
-- ValaDACPPlayer* _tmp2_ = NULL;
-- DACPPlayer* _tmp3_ = NULL;
-- DMAPDb* _tmp4_ = NULL;
-- DMAPContainerDb* _tmp5_ = NULL;
-- DACPShare* _tmp6_ = NULL;
-- DACPShare* _tmp7_ = NULL;
-- DACPShare* _tmp8_ = NULL;
-- DACPShare* _tmp9_ = NULL;
++ ValaDMAPDb* _tmp0_;
++ ValaDMAPContainerDb* _tmp1_;
++ ValaDACPPlayer* _tmp2_;
++ DACPPlayer* _tmp3_;
++ DMAPDb* _tmp4_;
++ DMAPContainerDb* _tmp5_;
++ DACPShare* _tmp6_;
++ DACPShare* _tmp7_;
++ DACPShare* _tmp8_;
++ DACPShare* _tmp9_;
self = (DACPListener*) g_object_new (object_type, NULL);
_tmp0_ = vala_dmap_db_new ();
_g_object_unref0 (self->priv->db);
@@@ -359,7 -359,7 +359,7 @@@ static void dacp_listener_instance_ini
}
--static void dacp_listener_finalize (GObject* obj) {
++static void dacp_listener_finalize (GObject * obj) {
DACPListener * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DACP_LISTENER, DACPListener);
_g_object_unref0 (self->priv->db);
@@@ -385,9 -385,9 +385,9 @@@ GType dacp_listener_get_type (void)
gint _vala_main (gchar** args, int args_length1) {
gint result = 0;
GMainLoop* loop = NULL;
-- GMainLoop* _tmp0_ = NULL;
++ GMainLoop* _tmp0_;
DACPListener* dacplistener = NULL;
-- DACPListener* _tmp1_ = NULL;
++ DACPListener* _tmp1_;
_tmp0_ = g_main_loop_new (NULL, FALSE);
loop = _tmp0_;
_tmp1_ = dacp_listener_new ();
diff --cc tests/dmapcopy.c
index 58baa1d,da1fbce..413ac87
--- a/tests/dmapcopy.c
+++ b/tests/dmapcopy.c
@@@ -1,4 -1,4 +1,4 @@@
- /* dmapcopy.c generated by valac 0.27.2, the Vala compiler
-/* dmapcopy.c generated by valac 0.22.1, the Vala compiler
++/* dmapcopy.c generated by valac 0.36.5, the Vala compiler
* generated from dmapcopy.vala, do not modify */
/* FILE: dmapcopy.vala -- Copy files from a DMAP server
@@@ -116,31 -117,32 +117,32 @@@ enum
DPAP_COPY_DUMMY_PROPERTY
};
static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connection, gboolean _result_,
const gchar* reason);
- static void __lambda4_ (DPAPCopy* self, gconstpointer k, gconstpointer v);
-static void __lambda2_ (DPAPCopy* self, guint k, DMAPRecord* v);
++static void __lambda4_ (DPAPCopy* self, guint k, DMAPRecord* v);
GType vala_dpap_record_get_type (void) G_GNUC_CONST;
const gchar* vala_dpap_record_get_location (ValaDPAPRecord* self);
- static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self);
- static void dpap_copy_service_added_cb (DPAPCopy* self, DMAPMdnsBrowserService* service);
- static gboolean _dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self);
-static void ___lambda2__dmap_id_record_func (guint id, DMAPRecord* record, gpointer self);
++static void ___lambda4__dmap_id_record_func (guint id, DMAPRecord* record, gpointer self);
DPAPCopy* dpap_copy_new (GError** error);
DPAPCopy* dpap_copy_construct (GType object_type, GError** error);
ValaDMAPDb* vala_dmap_db_new (void);
ValaDMAPDb* vala_dmap_db_construct (GType object_type);
ValaDPAPRecordFactory* vala_dpap_record_factory_new (void);
ValaDPAPRecordFactory* vala_dpap_record_factory_construct (GType object_type);
- static void _dpap_copy_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self);
- static void dpap_copy_finalize (DPAPCopy* obj);
-static void __lambda3_ (DPAPCopy* self, DMAPMdnsBrowser* browser, DMAPMdnsService* service);
++static void __lambda5_ (DPAPCopy* self, DMAPMdnsBrowser* browser, DMAPMdnsService* service);
+ static gboolean _dpap_copy_connected_cb_dmap_connection_func (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self);
-static void ___lambda3__dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, DMAPMdnsService*
service, gpointer self);
-static void dpap_copy_finalize (DPAPCopy* obj);
++static void ___lambda5__dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, DMAPMdnsService*
service, gpointer self);
++static void dpap_copy_finalize (DPAPCopy * obj);
void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
void debug_null (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
gint _vala_main (gchar** args, int args_length1);
static void _debug_null_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar*
message, gpointer self);
- static void __lambda4_ (DPAPCopy* self, gconstpointer k, gconstpointer v) {
- FILE* _tmp0_ = NULL;
- gconstpointer _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
-static void __lambda2_ (DPAPCopy* self, guint k, DMAPRecord* v) {
- FILE* _tmp0_ = NULL;
- DMAPRecord* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
++static void __lambda4_ (DPAPCopy* self, guint k, DMAPRecord* v) {
++ FILE* _tmp0_;
++ DMAPRecord* _tmp1_;
++ const gchar* _tmp2_;
++ const gchar* _tmp3_;
+ g_return_if_fail (v != NULL);
_tmp0_ = stdout;
_tmp1_ = v;
_tmp2_ = vala_dpap_record_get_location (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
@@@ -149,75 -151,88 +151,88 @@@
}
- static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self) {
- __lambda4_ ((DPAPCopy*) self, key, value);
-static void ___lambda2__dmap_id_record_func (guint id, DMAPRecord* record, gpointer self) {
- __lambda2_ (self, id, record);
++static void ___lambda4__dmap_id_record_func (guint id, DMAPRecord* record, gpointer self) {
++ __lambda4_ ((DPAPCopy*) self, id, record);
}
static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connection, gboolean _result_,
const gchar* reason) {
gboolean result = FALSE;
-- ValaDMAPDb* _tmp0_ = NULL;
-- gint64 _tmp1_ = 0LL;
-- ValaDMAPDb* _tmp2_ = NULL;
++ ValaDMAPDb* _tmp0_;
++ gint64 _tmp1_;
++ ValaDMAPDb* _tmp2_;
g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (connection != NULL, FALSE);
_tmp0_ = self->priv->db;
_tmp1_ = dmap_db_count ((DMAPDb*) _tmp0_);
-- g_debug ("dmapcopy.vala:30: %lld entries\n", _tmp1_);
++ g_debug ("%" G_GINT64_FORMAT " entries\n", _tmp1_);
_tmp2_ = self->priv->db;
- dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda4__gh_func, self);
- dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda2__dmap_id_record_func, self);
++ dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda4__dmap_id_record_func, self);
result = TRUE;
return result;
}
- static gboolean _dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self) {
+ static gboolean _dpap_copy_connected_cb_dmap_connection_func (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self) {
gboolean result;
- result = dpap_copy_connected_cb (self, connection, _result_, reason);
+ result = dpap_copy_connected_cb ((DPAPCopy*) self, connection, _result_, reason);
return result;
}
- static void dpap_copy_service_added_cb (DPAPCopy* self, DMAPMdnsBrowserService* service) {
- DMAPMdnsBrowserService* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- DMAPMdnsBrowserService* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- DMAPMdnsBrowserService* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- ValaDMAPDb* _tmp6_ = NULL;
- ValaDPAPRecordFactory* _tmp7_ = NULL;
- DPAPConnection* _tmp8_ = NULL;
- DMAPConnection* _tmp9_ = NULL;
- g_return_if_fail (self != NULL);
-static void __lambda3_ (DPAPCopy* self, DMAPMdnsBrowser* browser, DMAPMdnsService* service) {
- DMAPMdnsService* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- DMAPMdnsService* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- DMAPMdnsService* _tmp8_ = NULL;
- guint _tmp9_ = 0U;
- guint _tmp10_ = 0U;
- ValaDMAPDb* _tmp11_ = NULL;
- ValaDPAPRecordFactory* _tmp12_ = NULL;
- DPAPConnection* _tmp13_ = NULL;
- DMAPConnection* _tmp14_ = NULL;
++static void __lambda5_ (DPAPCopy* self, DMAPMdnsBrowser* browser, DMAPMdnsService* service) {
++ DMAPMdnsService* _tmp0_;
++ gchar* _tmp1_;
++ gchar* _tmp2_;
++ gchar* _tmp3_;
++ DMAPMdnsService* _tmp4_;
++ gchar* _tmp5_;
++ gchar* _tmp6_;
++ gchar* _tmp7_;
++ DMAPMdnsService* _tmp8_;
++ guint _tmp9_;
++ guint _tmp10_;
++ ValaDMAPDb* _tmp11_;
++ ValaDPAPRecordFactory* _tmp12_;
++ DPAPConnection* _tmp13_;
++ DMAPConnection* _tmp14_;
+ g_return_if_fail (browser != NULL);
+ g_return_if_fail (service != NULL);
_tmp0_ = service;
- _tmp1_ = _tmp0_->service_name;
- _tmp2_ = service;
- _tmp3_ = _tmp2_->host;
+ g_object_get (_tmp0_, "service-name", &_tmp1_, NULL);
+ _tmp2_ = _tmp1_;
+ _tmp3_ = _tmp2_;
_tmp4_ = service;
- _tmp5_ = _tmp4_->port;
- _tmp6_ = self->priv->db;
- _tmp7_ = self->priv->factory;
- _tmp8_ = dpap_connection_new (_tmp1_, _tmp3_, _tmp5_, (DMAPDb*) _tmp6_, (DMAPRecordFactory*) _tmp7_);
+ g_object_get (_tmp4_, "host", &_tmp5_, NULL);
+ _tmp6_ = _tmp5_;
+ _tmp7_ = _tmp6_;
+ _tmp8_ = service;
+ g_object_get (_tmp8_, "port", &_tmp9_, NULL);
+ _tmp10_ = _tmp9_;
+ _tmp11_ = self->priv->db;
+ _tmp12_ = self->priv->factory;
+ _tmp13_ = dpap_connection_new (_tmp3_, _tmp7_, _tmp10_, (DMAPDb*) _tmp11_, (DMAPRecordFactory*)
_tmp12_);
_g_object_unref0 (self->priv->connection);
- self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, DMAP_TYPE_CONNECTION, DMAPConnection);
- _tmp9_ = self->priv->connection;
- dmap_connection_connect (_tmp9_, _dpap_copy_connected_cb_dmap_connection_callback, self);
+ self->priv->connection = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, DMAP_TYPE_CONNECTION, DMAPConnection);
+ _g_free0 (_tmp7_);
+ _g_free0 (_tmp3_);
+ _tmp14_ = self->priv->connection;
+ dmap_connection_start (_tmp14_, _dpap_copy_connected_cb_dmap_connection_func, self);
}
- static void _dpap_copy_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self) {
- dpap_copy_service_added_cb ((DPAPCopy*) self, service);
-static void ___lambda3__dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, DMAPMdnsService*
service, gpointer self) {
- __lambda3_ (self, _sender, service);
++static void ___lambda5__dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, DMAPMdnsService*
service, gpointer self) {
++ __lambda5_ ((DPAPCopy*) self, _sender, service);
}
DPAPCopy* dpap_copy_construct (GType object_type, GError** error) {
DPAPCopy* self = NULL;
-- ValaDMAPDb* _tmp0_ = NULL;
-- ValaDPAPRecordFactory* _tmp1_ = NULL;
-- DMAPMdnsBrowser* _tmp2_ = NULL;
-- DMAPMdnsBrowser* _tmp3_ = NULL;
-- DMAPMdnsBrowser* _tmp4_ = NULL;
++ ValaDMAPDb* _tmp0_;
++ ValaDPAPRecordFactory* _tmp1_;
++ DMAPMdnsBrowser* _tmp2_;
++ DMAPMdnsBrowser* _tmp3_;
++ DMAPMdnsBrowser* _tmp4_;
GError * _inner_error_ = NULL;
self = (DPAPCopy*) g_type_create_instance (object_type);
_tmp0_ = vala_dmap_db_new ();
@@@ -230,10 -245,10 +245,10 @@@
_g_object_unref0 (self->priv->browser);
self->priv->browser = _tmp2_;
_tmp3_ = self->priv->browser;
- g_signal_connect (_tmp3_, "service-added", (GCallback)
_dpap_copy_service_added_cb_dmap_mdns_browser_service_added, self);
- g_signal_connect (_tmp3_, "service-added", (GCallback) ___lambda3__dmap_mdns_browser_service_added,
self);
++ g_signal_connect (_tmp3_, "service-added", (GCallback) ___lambda5__dmap_mdns_browser_service_added,
self);
_tmp4_ = self->priv->browser;
dmap_mdns_browser_start (_tmp4_, &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
g_propagate_error (error, _inner_error_);
_dpap_copy_unref0 (self);
return NULL;
@@@ -275,7 -290,7 +290,7 @@@ static gpointer value_dpap_copy_peek_po
static gchar* value_dpap_copy_collect_value (GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
if (collect_values[0].v_pointer) {
-- DPAPCopy* object;
++ DPAPCopy * object;
object = collect_values[0].v_pointer;
if (object->parent_instance.g_class == NULL) {
return g_strconcat ("invalid unclassed object pointer for value type `",
G_VALUE_TYPE_NAME (value), "'", NULL);
@@@ -291,7 -306,7 +306,7 @@@
static gchar* value_dpap_copy_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
-- DPAPCopy** object_p;
++ DPAPCopy ** object_p;
object_p = collect_values[0].v_pointer;
if (!object_p) {
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
@@@ -323,7 -338,7 +338,7 @@@ gpointer value_get_dpap_copy (const GVa
void value_set_dpap_copy (GValue* value, gpointer v_object) {
-- DPAPCopy* old;
++ DPAPCopy * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_COPY));
old = value->data[0].v_pointer;
if (v_object) {
@@@ -341,7 -356,7 +356,7 @@@
void value_take_dpap_copy (GValue* value, gpointer v_object) {
-- DPAPCopy* old;
++ DPAPCopy * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_COPY));
old = value->data[0].v_pointer;
if (v_object) {
@@@ -370,10 -385,9 +385,10 @@@ static void dpap_copy_instance_init (DP
}
--static void dpap_copy_finalize (DPAPCopy* obj) {
++static void dpap_copy_finalize (DPAPCopy * obj) {
DPAPCopy * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_COPY, DPAPCopy);
+ g_signal_handlers_destroy (self);
_g_object_unref0 (self->priv->browser);
_g_object_unref0 (self->priv->connection);
_g_object_unref0 (self->priv->db);
@@@ -396,7 -410,7 +411,7 @@@ GType dpap_copy_get_type (void)
gpointer dpap_copy_ref (gpointer instance) {
-- DPAPCopy* self;
++ DPAPCopy * self;
self = instance;
g_atomic_int_inc (&self->ref_count);
return instance;
@@@ -404,7 -418,7 +419,7 @@@
void dpap_copy_unref (gpointer instance) {
-- DPAPCopy* self;
++ DPAPCopy * self;
self = instance;
if (g_atomic_int_dec_and_test (&self->ref_count)) {
DPAP_COPY_GET_CLASS (self)->finalize (self);
@@@ -414,8 -428,8 +429,8 @@@
void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
-- FILE* _tmp0_ = NULL;
-- const gchar* _tmp1_ = NULL;
++ FILE* _tmp0_;
++ const gchar* _tmp1_;
_tmp0_ = stdout;
_tmp1_ = message;
fprintf (_tmp0_, "%s\n", _tmp1_);
@@@ -434,9 -448,9 +449,9 @@@ static void _debug_null_glog_func (cons
gint _vala_main (gchar** args, int args_length1) {
gint result = 0;
GMainLoop* loop = NULL;
-- GMainLoop* _tmp0_ = NULL;
++ GMainLoop* _tmp0_;
DPAPCopy* dmapcopy = NULL;
-- DPAPCopy* _tmp1_ = NULL;
++ DPAPCopy* _tmp1_;
GError * _inner_error_ = NULL;
_tmp0_ = g_main_loop_new (NULL, FALSE);
loop = _tmp0_;
@@@ -444,11 -458,11 +459,12 @@@
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, _debug_null_glog_func, NULL);
_tmp1_ = dpap_copy_new (&_inner_error_);
dmapcopy = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
++ gint _tmp2_ = 0;
_g_main_loop_unref0 (loop);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
-- return 0;
++ return _tmp2_;
}
g_main_loop_run (loop);
result = 0;
diff --cc tests/dmapserve.c
index e8891e5,8adea7d..a58978d
--- a/tests/dmapserve.c
+++ b/tests/dmapserve.c
@@@ -1,4 -1,4 +1,4 @@@
- /* dmapserve.c generated by valac 0.27.2, the Vala compiler
-/* dmapserve.c generated by valac 0.22.1, the Vala compiler
++/* dmapserve.c generated by valac 0.36.5, the Vala compiler
* generated from dmapserve.vala, do not modify */
/* FILE: dmapserve.vala -- Serve media using DMAP
@@@ -124,7 -124,7 +124,7 @@@ ValaDMAPDb* vala_dmap_db_new (void)
ValaDMAPDb* vala_dmap_db_construct (GType object_type);
ValaDMAPContainerDb* vala_dmap_container_db_new (void);
ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type);
--static void dpap_serve_finalize (DPAPServe* obj);
++static void dpap_serve_finalize (DPAPServe * obj);
void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
void debug_null (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
gint _vala_main (gchar** args, int args_length1);
@@@ -133,14 -133,14 +133,14 @@@ static void _debug_printf_glog_func (co
DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
DPAPServe* self = NULL;
-- ValaDPAPRecord* _tmp0_ = NULL;
-- ValaDMAPDb* _tmp1_ = NULL;
-- ValaDMAPDb* _tmp2_ = NULL;
-- ValaDPAPRecord* _tmp3_ = NULL;
-- ValaDMAPContainerDb* _tmp4_ = NULL;
-- ValaDMAPDb* _tmp5_ = NULL;
-- ValaDMAPContainerDb* _tmp6_ = NULL;
-- DPAPShare* _tmp7_ = NULL;
++ ValaDPAPRecord* _tmp0_;
++ ValaDMAPDb* _tmp1_;
++ ValaDMAPDb* _tmp2_;
++ ValaDPAPRecord* _tmp3_;
++ ValaDMAPContainerDb* _tmp4_;
++ ValaDMAPDb* _tmp5_;
++ ValaDMAPContainerDb* _tmp6_;
++ DPAPShare* _tmp7_;
self = (DPAPServe*) g_type_create_instance (object_type);
_tmp0_ = vala_dpap_record_new ();
_g_object_unref0 (self->priv->record);
@@@ -196,7 -196,7 +196,7 @@@ static gpointer value_dpap_serve_peek_p
static gchar* value_dpap_serve_collect_value (GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
if (collect_values[0].v_pointer) {
-- DPAPServe* object;
++ DPAPServe * object;
object = collect_values[0].v_pointer;
if (object->parent_instance.g_class == NULL) {
return g_strconcat ("invalid unclassed object pointer for value type `",
G_VALUE_TYPE_NAME (value), "'", NULL);
@@@ -212,7 -212,7 +212,7 @@@
static gchar* value_dpap_serve_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue*
collect_values, guint collect_flags) {
-- DPAPServe** object_p;
++ DPAPServe ** object_p;
object_p = collect_values[0].v_pointer;
if (!object_p) {
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
@@@ -244,7 -244,7 +244,7 @@@ gpointer value_get_dpap_serve (const GV
void value_set_dpap_serve (GValue* value, gpointer v_object) {
-- DPAPServe* old;
++ DPAPServe * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_SERVE));
old = value->data[0].v_pointer;
if (v_object) {
@@@ -262,7 -262,7 +262,7 @@@
void value_take_dpap_serve (GValue* value, gpointer v_object) {
-- DPAPServe* old;
++ DPAPServe * old;
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DPAP_SERVE));
old = value->data[0].v_pointer;
if (v_object) {
@@@ -291,10 -291,9 +291,10 @@@ static void dpap_serve_instance_init (D
}
--static void dpap_serve_finalize (DPAPServe* obj) {
++static void dpap_serve_finalize (DPAPServe * obj) {
DPAPServe * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_SERVE, DPAPServe);
+ g_signal_handlers_destroy (self);
_g_object_unref0 (self->priv->record);
_g_object_unref0 (self->priv->db);
_g_object_unref0 (self->priv->container_db);
@@@ -317,7 -316,7 +317,7 @@@ GType dpap_serve_get_type (void)
gpointer dpap_serve_ref (gpointer instance) {
-- DPAPServe* self;
++ DPAPServe * self;
self = instance;
g_atomic_int_inc (&self->ref_count);
return instance;
@@@ -325,7 -324,7 +325,7 @@@
void dpap_serve_unref (gpointer instance) {
-- DPAPServe* self;
++ DPAPServe * self;
self = instance;
if (g_atomic_int_dec_and_test (&self->ref_count)) {
DPAP_SERVE_GET_CLASS (self)->finalize (self);
@@@ -335,8 -334,8 +335,8 @@@
void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
-- FILE* _tmp0_ = NULL;
-- const gchar* _tmp1_ = NULL;
++ FILE* _tmp0_;
++ const gchar* _tmp1_;
_tmp0_ = stdout;
_tmp1_ = message;
fprintf (_tmp0_, "%s\n", _tmp1_);
@@@ -355,9 -354,9 +355,9 @@@ static void _debug_printf_glog_func (co
gint _vala_main (gchar** args, int args_length1) {
gint result = 0;
GMainLoop* loop = NULL;
-- GMainLoop* _tmp0_ = NULL;
++ GMainLoop* _tmp0_;
DPAPServe* dmapcopy = NULL;
-- DPAPServe* _tmp1_ = NULL;
++ DPAPServe* _tmp1_;
GError * _inner_error_ = NULL;
_tmp0_ = g_main_loop_new (NULL, FALSE);
loop = _tmp0_;
@@@ -365,11 -364,11 +365,12 @@@
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, _debug_printf_glog_func, NULL);
_tmp1_ = dpap_serve_new (&_inner_error_);
dmapcopy = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
++ gint _tmp2_ = 0;
_g_main_loop_unref0 (loop);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
-- return 0;
++ return _tmp2_;
}
g_main_loop_run (loop);
result = 0;
diff --cc tests/test-dmap-client.c
index e127bd6,d4dae29..214d663
--- a/tests/test-dmap-client.c
+++ b/tests/test-dmap-client.c
@@@ -23,10 -23,10 +23,10 @@@
#include <string.h>
#include <libdmapsharing/dmap.h>
++#include <libdmapsharing/test-daap-record-factory.h>
++#include <libdmapsharing/test-dpap-record-factory.h>
#include "test-dmap-db.h"
--#include "test-daap-record-factory.h"
--#include "test-dpap-record-factory.h"
enum {
DAAP,
@@@ -37,21 -37,41 +37,21 @@@ static GMainLoop *loop
static guint conn_type = DAAP;
static void
- print_record (gpointer id, DMAPRecord *record, gpointer user_data)
+ print_record (guint id, DMAPRecord *record, gpointer user_data)
{
- if (IS_DAAP_RECORD (record)) {
- gboolean has_video = FALSE;
- gchar *artist = NULL, *title = NULL, *format = NULL, *filename = NULL;
-
- g_object_get (record,
- "has-video", &has_video,
- "songartist", &artist,
- "title", &title,
- "format", &format,
- "filename", &filename,
- NULL);
-
- g_print ("%d: %s %s %s %s (has video: %s)\n", id, artist, title, format, filename, has_video
? "Y" : "N");
-
- g_free (artist);
- g_free (title);
- g_free (format);
- g_free (filename);
- } else if (IS_DPAP_RECORD (record)) {
- gchar *format = NULL, *filename = NULL;
-
- g_object_get (record,
- "format", &format,
- "filename", &filename,
- NULL);
-
- g_print ("%d: %s %s\n", id, format, filename);
-
- g_free (format);
- g_free (filename);
- } else {
- g_error ("Unknown record type");
- }
+ gboolean has_video;
+ gchar *artist, *title;
+
+ g_object_get (record,
+ "has-video", &has_video,
+ "songartist", &artist,
+ "title", &title,
+ NULL);
+
- g_print ("%d: %s %s (has video: %s)\n", GPOINTER_TO_UINT (id), artist, title, has_video ? "Y" : "N");
++ g_print ("%d: %s %s (has video: %s)\n", id, artist, title, has_video ? "Y" : "N");
+
+ g_free (artist);
+ g_free (title);
}
static void
@@@ -62,7 -82,7 +62,7 @@@ connected_cb (DMAPConnection *connectio
{
g_print ("Connection cb., DB has %lu entries\n", dmap_db_count (db));
- dmap_db_foreach (db, (GHFunc) print_record, NULL);
- dmap_db_foreach (db, print_record, NULL);
++ dmap_db_foreach (db, (DMAPIdRecordFunc) print_record, NULL);
}
static void
@@@ -86,18 -106,23 +86,25 @@@ authenticate_cb (DMAPConnection *connec
static void
service_added_cb (DMAPMdnsBrowser *browser,
- DMAPMdnsBrowserService *service,
+ DMAPMdnsService *service,
gpointer user_data)
{
DMAPRecordFactory *factory;
DMAPConnection *conn;
DMAPDb *db;
++ guint port;
++ gchar *service_name, *name, *host;
+
- g_object_get (service,
- "service-name", &service_name,
- "name", &name,
- "host", &host,
- "port", &port,
- NULL);
++ g_object_get(service, "service-name", &service_name,
++ "name", &name,
++ "host", &host,
++ "port", &port, NULL);
- g_debug ("service added %s:%s:%s:%d", service_name, name, host, port);
+ g_debug ("service added %s:%s:%s:%d",
- service->service_name,
- service->name,
- service->host,
- service->port);
++ service_name,
++ name,
++ host,
++ port);
db = DMAP_DB (test_dmap_db_new ());
if (db == NULL) {
diff --cc tests/test-dmap-server.c
index b773b3c,b773b3c..f6d7b93
--- a/tests/test-dmap-server.c
+++ b/tests/test-dmap-server.c
@@@ -24,12 -24,12 +24,12 @@@
#include <glib.h>
#include <libdmapsharing/dmap.h>
++#include <libdmapsharing/test-daap-record.h>
++#include <libdmapsharing/test-dpap-record.h>
++#include <libdmapsharing/test-daap-record-factory.h>
++#include <libdmapsharing/test-dpap-record-factory.h>
#include "test-dmap-container-record.h"
--#include "test-daap-record.h"
--#include "test-daap-record-factory.h"
--#include "test-dpap-record.h"
--#include "test-dpap-record-factory.h"
#include "test-dmap-container-db.h"
#include "test-dmap-db.h"
diff --cc tests/vala-dmap-container-db.c
index b9bd776,c98e8bc..c41b00b
--- a/tests/vala-dmap-container-db.c
+++ b/tests/vala-dmap-container-db.c
@@@ -1,4 -1,4 +1,4 @@@
- /* vala-dmap-container-db.c generated by valac 0.27.2, the Vala compiler
-/* vala-dmap-container-db.c generated by valac 0.22.1, the Vala compiler
++/* vala-dmap-container-db.c generated by valac 0.36.5, the Vala compiler
* generated from vala-dmap-container-db.vala, do not modify */
/* FILE: vala-dmap-db.vala -- A DMAPContainerDb implementation in Vala
@@@ -56,7 -56,7 +56,7 @@@ struct _ValaDMAPContainerDbPrivate
static gpointer vala_dmap_container_db_parent_class = NULL;
--static DMAPContainerDbIface* 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))
@@@ -69,18 -69,18 +69,18 @@@ static DMAPContainerRecord* vala_dmap_c
static void vala_dmap_container_db_real_add (DMAPContainerDb* base, DMAPContainerRecord* record);
ValaDMAPContainerDb* vala_dmap_container_db_new (void);
ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type);
--static void vala_dmap_container_db_finalize (GObject* obj);
++static void vala_dmap_container_db_finalize (GObject * obj);
static gint64 vala_dmap_container_db_real_count (DMAPContainerDb* base) {
ValaDMAPContainerDb * self;
gint64 result = 0LL;
-- GeeArrayList* _tmp0_ = NULL;
-- gint _tmp1_ = 0;
-- gint _tmp2_ = 0;
++ GeeArrayList* _tmp0_;
++ gint _tmp1_;
++ gint _tmp2_;
self = (ValaDMAPContainerDb*) base;
_tmp0_ = self->priv->db;
-- _tmp1_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp0_);
++ _tmp1_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _tmp0_);
_tmp2_ = _tmp1_;
result = (gint64) _tmp2_;
return result;
@@@ -96,38 -96,40 +96,38 @@@ static void vala_dmap_container_db_real
i = 0;
_tmp0_ = TRUE;
while (TRUE) {
- gint _tmp2_ = 0;
- GeeArrayList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- GHFunc _tmp6_ = NULL;
- void* _tmp6__target = NULL;
- gint _tmp7_ = 0;
- void* _tmp8_ = NULL;
- GeeArrayList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gpointer _tmp11_ = NULL;
- gboolean _tmp1_ = FALSE;
- gint _tmp3_ = 0;
- GeeArrayList* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- GHFunc _tmp7_ = NULL;
- void* _tmp7__target = NULL;
- gint _tmp8_ = 0;
- void* _tmp9_ = NULL;
- GeeArrayList* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gpointer _tmp12_ = NULL;
- _tmp1_ = _tmp0_;
- if (!_tmp1_) {
- gint _tmp2_ = 0;
- _tmp2_ = i;
- i = _tmp2_ + 1;
++ gint _tmp2_;
++ GeeArrayList* _tmp3_;
++ gint _tmp4_;
++ gint _tmp5_;
++ GHFunc _tmp6_;
++ void* _tmp6__target;
++ gint _tmp7_;
++ void* _tmp8_;
++ GeeArrayList* _tmp9_;
++ gint _tmp10_;
++ gpointer _tmp11_;
+ if (!_tmp0_) {
- gint _tmp1_ = 0;
++ gint _tmp1_;
+ _tmp1_ = i;
+ i = _tmp1_ + 1;
}
_tmp0_ = FALSE;
- _tmp3_ = i;
- _tmp4_ = self->priv->db;
- _tmp5_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp4_);
- _tmp6_ = _tmp5_;
- if (!(_tmp3_ < _tmp6_)) {
+ _tmp2_ = i;
+ _tmp3_ = self->priv->db;
- _tmp4_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp3_);
++ _tmp4_ = gee_abstract_collection_get_size ((GeeAbstractCollection*) _tmp3_);
+ _tmp5_ = _tmp4_;
+ if (!(_tmp2_ < _tmp5_)) {
break;
}
- _tmp7_ = func;
- _tmp7__target = func_target;
- _tmp8_ = i;
- _tmp9_ = GINT_TO_POINTER (_tmp8_);
- _tmp10_ = self->priv->db;
- _tmp11_ = i;
- _tmp12_ = gee_abstract_list_get ((GeeAbstractList*) _tmp10_, _tmp11_);
- _tmp7_ (_tmp9_, (DMAPRecord*) _tmp12_, _tmp7__target);
+ _tmp6_ = func;
+ _tmp6__target = func_target;
+ _tmp7_ = i;
+ _tmp8_ = GINT_TO_POINTER (_tmp7_);
+ _tmp9_ = self->priv->db;
+ _tmp10_ = i;
+ _tmp11_ = gee_abstract_list_get ((GeeAbstractList*) _tmp9_, _tmp10_);
+ _tmp6_ (_tmp8_, (DMAPRecord*) _tmp11_, _tmp6__target);
}
}
}
@@@ -171,22 -173,22 +171,22 @@@ static void vala_dmap_container_db_clas
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*, GHFunc, void*)) vala_dmap_container_db_real_foreach;
-- iface->lookup_by_id = (DMAPContainerRecord* (*)(DMAPContainerDb*, guint))
vala_dmap_container_db_real_lookup_by_id;
-- iface->add = (void (*)(DMAPContainerDb*, DMAPContainerRecord*)) vala_dmap_container_db_real_add;
++ iface->count = (gint64 (*) (DMAPContainerDb *)) vala_dmap_container_db_real_count;
++ iface->foreach = (void (*) (DMAPContainerDb *, GHFunc, void*)) vala_dmap_container_db_real_foreach;
++ iface->lookup_by_id = (DMAPContainerRecord* (*) (DMAPContainerDb *, guint))
vala_dmap_container_db_real_lookup_by_id;
++ iface->add = (void (*) (DMAPContainerDb *, DMAPContainerRecord*)) vala_dmap_container_db_real_add;
}
static void vala_dmap_container_db_instance_init (ValaDMAPContainerDb * self) {
-- GeeArrayList* _tmp0_ = NULL;
++ GeeArrayList* _tmp0_;
self->priv = VALA_DMAP_CONTAINER_DB_GET_PRIVATE (self);
-- _tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL,
NULL, NULL);
++ _tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify)
g_object_unref, NULL, NULL, NULL);
self->priv->db = _tmp0_;
}
--static void vala_dmap_container_db_finalize (GObject* obj) {
++static void vala_dmap_container_db_finalize (GObject * obj) {
ValaDMAPContainerDb * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VALA_DMAP_CONTAINER_DB, ValaDMAPContainerDb);
_g_object_unref0 (self->priv->db);
diff --cc vala/libdmapsharing-3.2-daap/.libdmapsharing-3.1-uninstalled.excludes.swp
index 0000000,0000000..acd0b83
new file mode 100644
--- /dev/null
+++ b/vala/libdmapsharing-3.2-daap/.libdmapsharing-3.1-uninstalled.excludes.swp
@@@ -1,0 -1,0 +1,1 @@@
++b0VIM 8.0
diff --cc vala/libdmapsharing-3.2-daap/libdmapsharing-3.2-uninstalled.excludes
index a08be2f,a08be2f..afef6de
--- a/vala/libdmapsharing-3.2-daap/libdmapsharing-3.2-uninstalled.excludes
+++ b/vala/libdmapsharing-3.2-daap/libdmapsharing-3.2-uninstalled.excludes
@@@ -1,2 -1,2 +1,3 @@@
dacp-*
dpap-*
++test-*
diff --cc vala/libdmapsharing-3.2-daap/libdmapsharing-3.2-uninstalled.files.in
index 0000000,0000000..08385ba
new file mode 100644
--- /dev/null
+++ b/vala/libdmapsharing-3.2-daap/libdmapsharing-3.2-uninstalled.files.in
@@@ -1,0 -1,0 +1,2 @@@
++@srcdir@/../libdmapsharing/
++@builddir@/../libdmapsharing/.libs/libdmapsharing-3.2.so
diff --cc vala/libdmapsharing-3.2-dacp/libdmapsharing-3.2-uninstalled.excludes
index a08be2f,a08be2f..dfc4445
--- a/vala/libdmapsharing-3.2-dacp/libdmapsharing-3.2-uninstalled.excludes
+++ b/vala/libdmapsharing-3.2-dacp/libdmapsharing-3.2-uninstalled.excludes
@@@ -1,2 -1,2 +1,2 @@@
--dacp-*
dpap-*
++test-*
diff --cc vala/libdmapsharing-3.2-dacp/libdmapsharing-3.2-uninstalled.files.in
index 0000000,0000000..08385ba
new file mode 100644
--- /dev/null
+++ b/vala/libdmapsharing-3.2-dacp/libdmapsharing-3.2-uninstalled.files.in
@@@ -1,0 -1,0 +1,2 @@@
++@srcdir@/../libdmapsharing/
++@builddir@/../libdmapsharing/.libs/libdmapsharing-3.2.so
diff --cc vala/libdmapsharing-3.2-dmap/libdmapsharing-3.2-uninstalled.excludes
index c25880e,c25880e..3c178ae
--- a/vala/libdmapsharing-3.2-dmap/libdmapsharing-3.2-uninstalled.excludes
+++ b/vala/libdmapsharing-3.2-dmap/libdmapsharing-3.2-uninstalled.excludes
@@@ -1,3 -1,3 +1,4 @@@
daap-*
dacp-*
dpap-*
++test-*
diff --cc vala/libdmapsharing-3.2-dmap/libdmapsharing-3.2-uninstalled.files.in
index 0000000,0000000..08385ba
new file mode 100644
--- /dev/null
+++ b/vala/libdmapsharing-3.2-dmap/libdmapsharing-3.2-uninstalled.files.in
@@@ -1,0 -1,0 +1,2 @@@
++@srcdir@/../libdmapsharing/
++@builddir@/../libdmapsharing/.libs/libdmapsharing-3.2.so
diff --cc vala/libdmapsharing-3.2-dpap/libdmapsharing-3.2-uninstalled.excludes
index a1caa27,a1caa27..4e4a8bf
--- a/vala/libdmapsharing-3.2-dpap/libdmapsharing-3.2-uninstalled.excludes
+++ b/vala/libdmapsharing-3.2-dpap/libdmapsharing-3.2-uninstalled.excludes
@@@ -1,2 -1,2 +1,3 @@@
daap-*
dacp-*
++test-*
diff --cc vala/libdmapsharing-3.2-dpap/libdmapsharing-3.2-uninstalled.files.in
index 0000000,0000000..08385ba
new file mode 100644
--- /dev/null
+++ b/vala/libdmapsharing-3.2-dpap/libdmapsharing-3.2-uninstalled.files.in
@@@ -1,0 -1,0 +1,2 @@@
++@srcdir@/../libdmapsharing/
++@builddir@/../libdmapsharing/.libs/libdmapsharing-3.2.so
diff --cc vala/libdmapsharing-3.2.vapi
index 32ebe7a,755e90b..f874611
--- a/vala/libdmapsharing-3.2.vapi
+++ b/vala/libdmapsharing-3.2.vapi
@@@ -1,4 -1,4 +1,4 @@@
--/* libdmapsharing-3.0-daap.vapi generated by vapigen, do not modify. */
++/* libdmapsharing-3.2-daap.vapi generated by vapigen, do not modify. */
namespace DAAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@@ -164,10 -153,31 +153,33 @@@
public virtual signal void published (string name);
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class DMAPMdnsService : GLib.Object {
+ [CCode (has_construct_function = false)]
+ protected DMAPMdnsService ();
+ [NoAccessorMethod]
+ public string host { owned get; set; }
+ [NoAccessorMethod]
+ public string name { owned get; set; }
+ [NoAccessorMethod]
+ public string pair { owned get; set; }
+ [NoAccessorMethod]
+ public bool password_protected { get; set; }
+ [NoAccessorMethod]
+ public uint port { get; set; }
+ [NoAccessorMethod]
+ public string service_name { owned get; set; }
+ [NoAccessorMethod]
+ public uint transport_protocol { get; set; }
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ [Compact]
+ public class DMAPMdnsServiceService {
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class DMAPMetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
@@@ -571,28 -583,28 +583,26 @@@
public static void dmap_hash_progressive_to_string (uint digest, string str);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
public static void dmap_hash_progressive_update (DAAP.DMAPHashContext context, uint buffer, uint
length);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
-- public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
-- public static void dmap_marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__ULONG_ULONG")]
-- public static void dmap_marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_ULONG__VOID")]
-- public static void dmap_marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_BOOLEAN")]
-- public static void dmap_marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
-- public static void dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_STRING")]
-- public static void dmap_marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__ULONG_FLOAT")]
-- public static void dmap_marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_BOOLEAN__STRING")]
++ public static void dmap_marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_STRING__STRING")]
++ public static void dmap_marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_STRING__ULONG_ULONG")]
++ public static void dmap_marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_ULONG__VOID")]
++ public static void dmap_marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_BOOLEAN")]
++ public static void dmap_marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
++ public static void dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_STRING")]
++ public static void dmap_marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__ULONG_FLOAT")]
++ public static void dmap_marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_get_client")]
public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
-- public static unowned string dmap_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DAAP.DMAPContentCode cc);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@@ -611,6 -623,6 +621,8 @@@
public static void dmap_structure_print (GLib.Node structure);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_serialize")]
public static unowned string dmap_structure_serialize (GLib.Node structure, uint length);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_utils_mime_to_format")]
++ public static unowned string dmap_utils_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_write_next_chunk")]
public static void dmap_write_next_chunk (Soup.Message message, DAAP.ChunkData cd);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmapd_input_stream_strdup_format_extension")]
@@@ -618,7 -630,7 +630,7 @@@
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "pads_compatible")]
public static bool pads_compatible (Gst.Pad pad1, Gst.Pad pad2);
}
--/* libdmapsharing-3.0-dacp.vapi generated by vapigen, do not modify. */
++/* libdmapsharing-3.2-dacp.vapi generated by vapigen, do not modify. */
namespace DACP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@@ -794,10 -795,31 +795,33 @@@
public virtual signal void published (string name);
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class DMAPMdnsService : GLib.Object {
+ [CCode (has_construct_function = false)]
+ protected DMAPMdnsService ();
+ [NoAccessorMethod]
+ public string host { owned get; set; }
+ [NoAccessorMethod]
+ public string name { owned get; set; }
+ [NoAccessorMethod]
+ public string pair { owned get; set; }
+ [NoAccessorMethod]
+ public bool password_protected { get; set; }
+ [NoAccessorMethod]
+ public uint port { get; set; }
+ [NoAccessorMethod]
+ public string service_name { owned get; set; }
+ [NoAccessorMethod]
+ public uint transport_protocol { get; set; }
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ [Compact]
+ public class DMAPMdnsServiceService {
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class DMAPMetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
@@@ -1238,28 -1262,28 +1262,26 @@@
public static void dmap_hash_progressive_to_string (uint digest, string str);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
public static void dmap_hash_progressive_update (DACP.DMAPHashContext context, uint buffer, uint
length);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
-- public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
-- public static void dmap_marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__ULONG_ULONG")]
-- public static void dmap_marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_ULONG__VOID")]
-- public static void dmap_marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_BOOLEAN")]
-- public static void dmap_marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
-- public static void dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_STRING")]
-- public static void dmap_marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__ULONG_FLOAT")]
-- public static void dmap_marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_BOOLEAN__STRING")]
++ public static void dmap_marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_STRING__STRING")]
++ public static void dmap_marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_STRING__ULONG_ULONG")]
++ public static void dmap_marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_ULONG__VOID")]
++ public static void dmap_marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_BOOLEAN")]
++ public static void dmap_marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
++ public static void dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_STRING")]
++ public static void dmap_marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__ULONG_FLOAT")]
++ public static void dmap_marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_get_client")]
public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
-- public static unowned string dmap_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DACP.DMAPContentCode cc);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@@ -1278,6 -1302,6 +1300,8 @@@
public static void dmap_structure_print (GLib.Node structure);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_serialize")]
public static unowned string dmap_structure_serialize (GLib.Node structure, uint length);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_utils_mime_to_format")]
++ public static unowned string dmap_utils_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_write_next_chunk")]
public static void dmap_write_next_chunk (Soup.Message message, DACP.ChunkData cd);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmapd_input_stream_strdup_format_extension")]
@@@ -1285,7 -1309,7 +1309,7 @@@
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "pads_compatible")]
public static bool pads_compatible (Gst.Pad pad1, Gst.Pad pad2);
}
--/* libdmapsharing-3.0-dmap.vapi generated by vapigen, do not modify. */
++/* libdmapsharing-3.2-dmap.vapi generated by vapigen, do not modify. */
namespace DMAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@@ -1428,10 -1441,31 +1441,33 @@@
public virtual signal void published (string name);
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class MdnsService : GLib.Object {
+ [CCode (has_construct_function = false)]
+ protected MdnsService ();
+ [NoAccessorMethod]
+ public string host { owned get; set; }
+ [NoAccessorMethod]
+ public string name { owned get; set; }
+ [NoAccessorMethod]
+ public string pair { owned get; set; }
+ [NoAccessorMethod]
+ public bool password_protected { get; set; }
+ [NoAccessorMethod]
+ public uint port { get; set; }
+ [NoAccessorMethod]
+ public string service_name { owned get; set; }
+ [NoAccessorMethod]
+ public uint transport_protocol { get; set; }
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ [Compact]
+ public class MdnsServiceService {
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class MetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
@@@ -1807,27 -1843,27 +1843,25 @@@
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static void hash_progressive_update (DMAP.HashContext context, uint buffer, uint length);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ public static void marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ public static void marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ public static void marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ public static void marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ public static void marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
++ public static void marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ public static void marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static void marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ public static void marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static unowned Avahi.Client mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static void mdns_avahi_set_entry_group (Avahi.EntryGroup group);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h")]
-- public static unowned string mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "pads_compatible")]
public static bool pads_compatible (Gst.Pad pad1, Gst.Pad pad2);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@@ -1849,9 -1885,9 +1883,11 @@@
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static unowned string structure_serialize (GLib.Node structure, uint length);
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
++ public static unowned string utils_mime_to_format (string transcode_mimetype);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
public static void write_next_chunk (Soup.Message message, DMAP.ChunkData cd);
}
--/* libdmapsharing-3.0-dpap.vapi generated by vapigen, do not modify. */
++/* libdmapsharing-3.2-dpap.vapi generated by vapigen, do not modify. */
namespace DPAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@@ -2017,10 -2042,31 +2042,33 @@@
public virtual signal void published (string name);
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ public class DMAPMdnsService : GLib.Object {
+ [CCode (has_construct_function = false)]
+ protected DMAPMdnsService ();
+ [NoAccessorMethod]
+ public string host { owned get; set; }
+ [NoAccessorMethod]
+ public string name { owned get; set; }
+ [NoAccessorMethod]
+ public string pair { owned get; set; }
+ [NoAccessorMethod]
+ public bool password_protected { get; set; }
+ [NoAccessorMethod]
+ public uint port { get; set; }
+ [NoAccessorMethod]
+ public string service_name { owned get; set; }
+ [NoAccessorMethod]
+ public uint transport_protocol { get; set; }
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
+ [Compact]
+ public class DMAPMdnsServiceService {
+ }
+ [CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class DMAPMetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
@@@ -2422,28 -2470,28 +2470,26 @@@
public static void dmap_hash_progressive_to_string (uint digest, string str);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
public static void dmap_hash_progressive_update (DPAP.DMAPHashContext context, uint buffer, uint
length);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
-- public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
-- public static void dmap_marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__ULONG_ULONG")]
-- public static void dmap_marshal_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_ULONG__VOID")]
-- public static void dmap_marshal_ULONG__VOID (GLib.Closure closure, GLib.Value return_value, uint
n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_BOOLEAN")]
-- public static void dmap_marshal_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
-- public static void dmap_marshal_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure closure,
GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__STRING_STRING")]
-- public static void dmap_marshal_VOID__STRING_STRING (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_VOID__ULONG_FLOAT")]
-- public static void dmap_marshal_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_BOOLEAN__STRING")]
++ public static void dmap_marshal_generated_BOOLEAN__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_STRING__STRING")]
++ public static void dmap_marshal_generated_STRING__STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_STRING__ULONG_ULONG")]
++ public static void dmap_marshal_generated_STRING__ULONG_ULONG (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_generated_ULONG__VOID")]
++ public static void dmap_marshal_generated_ULONG__VOID (GLib.Closure closure, GLib.Value return_value,
uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_BOOLEAN")]
++ public static void dmap_marshal_generated_VOID__STRING_BOOLEAN (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN")]
++ public static void dmap_marshal_generated_VOID__STRING_POINTER_POINTER_POINTER_BOOLEAN (GLib.Closure
closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void*
marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__STRING_STRING")]
++ public static void dmap_marshal_generated_VOID__STRING_STRING (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmap_marshal_generated_VOID__ULONG_FLOAT")]
++ public static void dmap_marshal_generated_VOID__ULONG_FLOAT (GLib.Closure closure, GLib.Value
return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_get_client")]
public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
-- [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
-- public static unowned string dmap_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DPAP.DMAPContentCode cc);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@@ -2462,6 -2510,6 +2508,8 @@@
public static void dmap_structure_print (GLib.Node structure);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_serialize")]
public static unowned string dmap_structure_serialize (GLib.Node structure, uint length);
++ [CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_utils_mime_to_format")]
++ public static unowned string dmap_utils_mime_to_format (string transcode_mimetype);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_write_next_chunk")]
public static void dmap_write_next_chunk (Soup.Message message, DPAP.ChunkData cd);
[CCode (cheader_filename = "libdmapsharing/dmap.h", cname =
"dmapd_input_stream_strdup_format_extension")]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
