From d374f50d28f7078a11108ee1a034a1d7bf7de23c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 25 Jul 2016 10:46:29 +0200 Subject: channel: remove the channel Remove the channel, the functionality is now in the client-node. --- pinos/Makefile.am | 1 - pinos/client/stream.c | 2 +- pinos/dbus/org.pinos.xml | 71 +---- pinos/server/channel.c | 729 --------------------------------------------- pinos/server/channel.h | 73 ----- pinos/server/client-node.c | 26 +- pinos/server/daemon.c | 127 +------- pinos/server/link.c | 27 +- pinos/server/port.c | 60 ---- pinos/server/port.h | 7 - 10 files changed, 67 insertions(+), 1056 deletions(-) delete mode 100644 pinos/server/channel.c delete mode 100644 pinos/server/channel.h diff --git a/pinos/Makefile.am b/pinos/Makefile.am index 03210c4f..ef1f434c 100644 --- a/pinos/Makefile.am +++ b/pinos/Makefile.am @@ -205,7 +205,6 @@ lib_LTLIBRARIES += libpinoscore-@PINOS_MAJORMINOR@.la # Pure core stuff libpinoscore_@PINOS_MAJORMINOR@_la_SOURCES = \ - server/channel.c server/channel.h \ server/client.c server/client.h \ server/client-node.c server/client-node.h \ server/daemon.c server/daemon.h \ diff --git a/pinos/client/stream.c b/pinos/client/stream.c index 4386ceea..815f025b 100644 --- a/pinos/client/stream.c +++ b/pinos/client/stream.c @@ -786,7 +786,7 @@ do_connect (PinosStream *stream) g_variant_builder_add (&b, "u", 0); g_variant_builder_add (&b, "s", g_bytes_get_data (priv->possible_formats, NULL)); g_variant_builder_add_value (&b, pinos_properties_to_variant (priv->properties)); - g_variant_builder_add (&b, "s", priv->path); + g_variant_builder_add (&b, "s", priv->path == NULL ? "" : priv->path); g_variant_builder_close (&b); ports = g_variant_builder_end (&b); diff --git a/pinos/dbus/org.pinos.xml b/pinos/dbus/org.pinos.xml index fe4076ec..eed21e28 100644 --- a/pinos/dbus/org.pinos.xml +++ b/pinos/dbus/org.pinos.xml @@ -23,27 +23,6 @@ - - - - - - - - - - @@ -83,54 +70,12 @@ - - - - - - - - - - - - - - - - - - - - - - -