From 37ba52005b110987cab7dc2fa020e1d636d2ca2f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 6 May 2022 15:38:43 +0200 Subject: [PATCH] module: also support global node.name Support a global node.name and prefix it with input. and output. if no per-stream node.name is given. This might be less confusing. --- src/modules/module-filter-chain.c | 9 +++++++-- src/modules/module-loopback.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c index b7ac0fece..1e15f9fe5 100644 --- a/src/modules/module-filter-chain.c +++ b/src/modules/module-filter-chain.c @@ -2150,12 +2150,17 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) parse_audio_info(impl->capture_props, &impl->capture_info); parse_audio_info(impl->playback_props, &impl->playback_info); + if ((str = pw_properties_get(props, PW_KEY_NODE_NAME)) == NULL) { + pw_properties_setf(props, PW_KEY_NODE_NAME, + "filter-chain-%u-%u", pid, id); + str = pw_properties_get(props, PW_KEY_NODE_NAME); + } if (pw_properties_get(impl->capture_props, PW_KEY_NODE_NAME) == NULL) pw_properties_setf(impl->capture_props, PW_KEY_NODE_NAME, - "input.filter-chain-%u-%u", pid, id); + "input.%s", str); if (pw_properties_get(impl->playback_props, PW_KEY_NODE_NAME) == NULL) pw_properties_setf(impl->playback_props, PW_KEY_NODE_NAME, - "output.filter-chain-%u-%u", pid, id); + "output.%s", str); if (pw_properties_get(impl->capture_props, PW_KEY_MEDIA_NAME) == NULL) pw_properties_setf(impl->capture_props, PW_KEY_MEDIA_NAME, "%s input", diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c index 4ed487975..b9c881158 100644 --- a/src/modules/module-loopback.c +++ b/src/modules/module-loopback.c @@ -526,12 +526,17 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) copy_props(impl, props, PW_KEY_NODE_VIRTUAL); copy_props(impl, props, PW_KEY_MEDIA_NAME); + if ((str = pw_properties_get(props, PW_KEY_NODE_NAME)) == NULL) { + pw_properties_setf(props, PW_KEY_NODE_NAME, + "loopback-%u-%u", pid, id); + str = pw_properties_get(props, PW_KEY_NODE_NAME); + } if (pw_properties_get(impl->capture_props, PW_KEY_NODE_NAME) == NULL) pw_properties_setf(impl->capture_props, PW_KEY_NODE_NAME, - "input.loopback-%u-%u", pid, id); + "input.%s", str); if (pw_properties_get(impl->playback_props, PW_KEY_NODE_NAME) == NULL) pw_properties_setf(impl->playback_props, PW_KEY_NODE_NAME, - "output.loopback-%u-%u", pid, id); + "output.%s", str); parse_audio_info(impl->capture_props, &impl->capture_info); parse_audio_info(impl->playback_props, &impl->playback_info);