mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-04 13:30:12 -05:00
modules: add pid to unique name
So that modules loaded from different processes don't generate the same node names.
This commit is contained in:
parent
2922b0e108
commit
cc39644253
6 changed files with 21 additions and 19 deletions
|
|
@ -153,8 +153,6 @@ struct impl {
|
|||
struct pw_impl_module *module;
|
||||
struct spa_hook module_listener;
|
||||
|
||||
uint32_t id;
|
||||
|
||||
struct pw_core *core;
|
||||
struct spa_hook core_proxy_listener;
|
||||
struct spa_hook core_listener;
|
||||
|
|
@ -851,6 +849,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
|
|||
struct pw_properties *props, *aec_props;
|
||||
struct impl *impl;
|
||||
uint32_t id = pw_global_get_id(pw_impl_module_get_global(module));
|
||||
uint32_t pid = getpid();
|
||||
const char *str;
|
||||
const char *path;
|
||||
int res = 0;
|
||||
|
|
@ -883,14 +882,13 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
|
|||
goto error;
|
||||
}
|
||||
|
||||
impl->id = id;
|
||||
impl->module = module;
|
||||
impl->context = context;
|
||||
|
||||
if (pw_properties_get(props, PW_KEY_NODE_GROUP) == NULL)
|
||||
pw_properties_setf(props, PW_KEY_NODE_GROUP, "echo-cancel-%u", id);
|
||||
pw_properties_setf(props, PW_KEY_NODE_GROUP, "echo-cancel-%u-%u", pid, id);
|
||||
if (pw_properties_get(props, PW_KEY_NODE_LINK_GROUP) == NULL)
|
||||
pw_properties_setf(props, PW_KEY_NODE_LINK_GROUP, "echo-cancel-%u", id);
|
||||
pw_properties_setf(props, PW_KEY_NODE_LINK_GROUP, "echo-cancel-%u-%u", pid, id);
|
||||
if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL)
|
||||
pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue