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

Pass some more properties around

Browse source 
Only start listener when core is a daemon.
This commit is contained in:
Wim Taymans 2017-07-11 20:38:48 +02:00
parent 4f9d631910
commit 83b4eaca53
7 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-protocol-native.c
View file

@ -395,7 +395,6 @@ get_name(struct pw_properties *properties)
name = getenv("PIPEWIRE_CORE");
if (name == NULL)
name = "pipewire-0";
return name;
}
@ -411,10 +410,7 @@ static int impl_connect(struct pw_protocol_connection *conn)
return -1;
}
if (name == NULL)
name = getenv("PIPEWIRE_CORE");
if (name == NULL)
name = "pipewire-0";
name = get_name(NULL);
if ((fd = socket(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)) < 0)
return -1;
@ -614,7 +610,7 @@ impl_add_listener(struct pw_protocol *protocol,
l->fd = -1;
l->fd_lock = -1;
name = get_name(properties);
name = get_name(core->properties);
if (!init_socket_name(l, name))
goto error;
@ -643,6 +639,7 @@ impl_add_listener(struct pw_protocol *protocol,
static struct impl *pw_protocol_native_new(struct pw_core *core, struct pw_properties *properties)
{
struct impl *impl;
const char *val;
impl = calloc(1, sizeof(struct impl));
@ -656,8 +653,10 @@ static struct impl *pw_protocol_native_new(struct pw_core *core, struct pw_prope
spa_list_init(&impl->client_list);
impl_add_listener(impl->protocol, core, properties);
if ((val = pw_properties_get(core->properties, "pipewire.daemon"))) {
if (atoi(val) == 1)
impl_add_listener(impl->protocol, core, properties);
}
return impl;
}