mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-14 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix target node path handling

Browse source
This commit is contained in:
Wim Taymans 2016-08-09 14:49:27 +02:00
parent 837c23a370
commit 4153fac9bb
3 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pinos/server/client-node.c
View file

@ -271,8 +271,7 @@ on_node_event (SpaNode *node, SpaEvent *event, void *user_data)
case SPA_EVENT_TYPE_PORT_ADDED:
{
SpaEventPortAdded *pa = event->data;
PinosPort *port, *target;
PinosLink *link;
PinosPort *port;
PinosNode *pnode = PINOS_NODE (this);
GError *error = NULL;
@ -288,19 +287,6 @@ on_node_event (SpaNode *node, SpaEvent *event, void *user_data)
}
pinos_port_set_received_cb (port, on_received_buffer, on_received_event, this, NULL);
target = pinos_daemon_find_port (pinos_node_get_daemon (pnode),
pinos_direction_reverse (pa->direction),
"/org/pinos/node_1",
NULL,
NULL,
&error);
if (target == NULL) {
g_warning ("proxy %p: can't find port target: %s", this, error->message);
g_clear_error (&error);
break;
}
link = pinos_link_new (pinos_node_get_daemon (pnode), port, target, NULL);
break;
}
case SPA_EVENT_TYPE_PORT_REMOVED:

27
pinos/server/daemon.c
View file

@ -185,6 +185,33 @@ no_node:
static void
on_port_added (PinosNode *node, PinosPort *port, PinosClient *client)
{
PinosDaemon *this;
PinosProperties *props;
PinosPort *target;
const gchar *path;
GError *error = NULL;
PinosLink *link;
this = pinos_node_get_daemon (node);
props = pinos_node_get_properties (node);
path = pinos_properties_get (props, "pinos.target.node");
if (path) {
target = pinos_daemon_find_port (this,
pinos_direction_reverse (port->direction),
path,
NULL,
NULL,
&error);
if (target == NULL) {
g_warning ("daemon %p: can't find port target: %s", this, error->message);
g_clear_error (&error);
return;
}
link = pinos_link_new (pinos_node_get_daemon (node), port, target, NULL);
pinos_client_add_object (client, G_OBJECT (link));
}
}
static void