mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-node: set parent id and owner

Browse source 
Make sure we set the right parent id and owner for the client node
and client-stream
Move the remote id in the proxy object and use it in the stream to
get the node id.
This commit is contained in:
Wim Taymans 2018-07-03 21:43:21 +02:00
parent fe03ec8bde
commit 79a3b594f9
11 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/module-client-node/client-node.c
View file

@ -1156,6 +1156,7 @@ void pw_client_node_registered(struct pw_client_node *this, uint32_t node_id)
{
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
pw_log_debug("client-node %p: %d", this, node_id);
pw_client_node_resource_transport(this->resource,
node_id,
impl->other_fds[0],
@ -1326,6 +1327,7 @@ static const struct pw_resource_events resource_events = {
* \memberof pw_client_node
*/
struct pw_client_node *pw_client_node_new(struct pw_resource *resource,
struct pw_global *parent,
struct pw_properties *properties,
bool do_register)
{
@ -1360,9 +1362,10 @@ struct pw_client_node *pw_client_node_new(struct pw_resource *resource,
name = "client-node";
this->resource = resource;
this->parent = parent;
this->node = pw_spa_node_new(core,
pw_resource_get_client(this->resource),
NULL,
parent,
name,
PW_SPA_NODE_FLAG_ASYNC |
(do_register ? 0 : PW_SPA_NODE_FLAG_NO_REGISTER),

2
src/modules/module-client-node/client-node.h
View file

@ -35,10 +35,12 @@ struct pw_client_node {
struct pw_node *node;
struct pw_resource *resource;
struct pw_global *parent;
};
struct pw_client_node *
pw_client_node_new(struct pw_resource *resource,
struct pw_global *parent,
struct pw_properties *properties,
bool do_register);

5
src/modules/module-client-node/client-stream.c
View file

@ -633,6 +633,7 @@ impl_node_port_set_io(struct spa_node *node,
impl = this->impl;
t = impl->t;
spa_log_debug(this->log, "set io %d %d %d", id, direction, impl->direction);
if (direction != impl->direction)
return -EINVAL;
@ -1028,6 +1029,7 @@ static const struct pw_node_events node_events = {
* \memberof pw_client_stream
*/
struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
struct pw_global *parent,
struct pw_properties *properties)
{
struct impl *impl;
@ -1053,6 +1055,7 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
impl->client_node = pw_client_node_new(
resource,
parent,
pw_properties_copy(properties),
false);
if (impl->client_node == NULL)
@ -1068,7 +1071,7 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
this->node = pw_spa_node_new(core,
client,
NULL,
parent,
name,
PW_SPA_NODE_FLAG_ASYNC,
&impl->node.node,

3
src/modules/module-client-node/client-stream.h
View file

@ -36,7 +36,8 @@ struct pw_client_stream {
struct pw_client_stream *
pw_client_stream_new(struct pw_resource *resource,
struct pw_properties *properties);
struct pw_global *parent,
struct pw_properties *properties);
void
pw_client_stream_destroy(struct pw_client_stream *stream);