From a72a87751519acc7b0a9c47691e227e68bf51998 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 21 Jan 2022 17:42:29 +0100 Subject: [PATCH] modules: improve node.name Make sure the node name is something unique for the capture and playback part of filter-chain and loopback so that volumes can be remembered separately. Fixes #1983 --- src/modules/module-filter-chain.c | 27 +++++++++++++++------------ src/modules/module-loopback.c | 26 ++++++++++++++------------ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c index dcb94f676..251f3be52 100644 --- a/src/modules/module-filter-chain.c +++ b/src/modules/module-filter-chain.c @@ -1705,11 +1705,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL) pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true"); - if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL) - pw_properties_setf(props, PW_KEY_NODE_NAME, "filter-chain-%u", id); if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL) - pw_properties_set(props, PW_KEY_NODE_DESCRIPTION, - pw_properties_get(props, PW_KEY_NODE_NAME)); + pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION, "filter-chain-%u", id); if ((str = pw_properties_get(props, "capture.props")) != NULL) pw_properties_update_string(impl->capture_props, str, strlen(str)); @@ -1719,7 +1716,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) copy_props(impl, props, PW_KEY_AUDIO_RATE); copy_props(impl, props, PW_KEY_AUDIO_CHANNELS); copy_props(impl, props, SPA_KEY_AUDIO_POSITION); - copy_props(impl, props, PW_KEY_NODE_NAME); copy_props(impl, props, PW_KEY_NODE_DESCRIPTION); copy_props(impl, props, PW_KEY_NODE_GROUP); copy_props(impl, props, PW_KEY_NODE_LINK_GROUP); @@ -1730,18 +1726,25 @@ 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 (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", id); + 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", id); + + if (pw_properties_get(impl->capture_props, PW_KEY_MEDIA_NAME) == NULL) + pw_properties_setf(impl->capture_props, PW_KEY_MEDIA_NAME, "%s input", + pw_properties_get(impl->capture_props, PW_KEY_NODE_DESCRIPTION)); + if (pw_properties_get(impl->playback_props, PW_KEY_MEDIA_NAME) == NULL) + pw_properties_setf(impl->playback_props, PW_KEY_MEDIA_NAME, "%s output", + pw_properties_get(impl->playback_props, PW_KEY_NODE_DESCRIPTION)); + if ((res = load_graph(&impl->graph, props)) < 0) { pw_log_error("can't load graph: %s", spa_strerror(res)); goto error; } - if (pw_properties_get(impl->capture_props, PW_KEY_MEDIA_NAME) == NULL) - pw_properties_setf(impl->capture_props, PW_KEY_MEDIA_NAME, "filter input %s", - pw_properties_get(impl->capture_props, PW_KEY_NODE_NAME)); - if (pw_properties_get(impl->playback_props, PW_KEY_MEDIA_NAME) == NULL) - pw_properties_setf(impl->playback_props, PW_KEY_MEDIA_NAME, "filter output %s", - pw_properties_get(impl->playback_props, PW_KEY_NODE_NAME)); - impl->core = pw_context_get_object(impl->context, PW_TYPE_INTERFACE_Core); if (impl->core == NULL) { str = pw_properties_get(props, PW_KEY_REMOTE_NAME); diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c index a2ecb9c95..511498d6c 100644 --- a/src/modules/module-loopback.c +++ b/src/modules/module-loopback.c @@ -461,11 +461,9 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) if (pw_properties_get(props, PW_KEY_NODE_VIRTUAL) == NULL) pw_properties_set(props, PW_KEY_NODE_VIRTUAL, "true"); - if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL) - pw_properties_setf(props, PW_KEY_NODE_NAME, "loopback-%u", id); if (pw_properties_get(props, PW_KEY_NODE_DESCRIPTION) == NULL) - pw_properties_set(props, PW_KEY_NODE_DESCRIPTION, - pw_properties_get(props, PW_KEY_NODE_NAME)); + pw_properties_setf(props, PW_KEY_NODE_DESCRIPTION, + "loopback-%u", id); if ((str = pw_properties_get(props, "capture.props")) != NULL) pw_properties_update_string(impl->capture_props, str, strlen(str)); @@ -475,25 +473,29 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) copy_props(impl, props, PW_KEY_AUDIO_RATE); copy_props(impl, props, PW_KEY_AUDIO_CHANNELS); copy_props(impl, props, SPA_KEY_AUDIO_POSITION); - copy_props(impl, props, PW_KEY_NODE_NAME); copy_props(impl, props, PW_KEY_NODE_DESCRIPTION); copy_props(impl, props, PW_KEY_NODE_GROUP); copy_props(impl, props, PW_KEY_NODE_LINK_GROUP); copy_props(impl, props, PW_KEY_NODE_LATENCY); copy_props(impl, props, PW_KEY_NODE_VIRTUAL); + copy_props(impl, props, PW_KEY_MEDIA_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", id); + 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", id); parse_audio_info(impl->capture_props, &impl->capture_info); parse_audio_info(impl->playback_props, &impl->playback_info); if (pw_properties_get(impl->capture_props, PW_KEY_MEDIA_NAME) == NULL) - pw_properties_setf(impl->capture_props, PW_KEY_MEDIA_NAME, - "loopback input %s", - pw_properties_get(impl->capture_props, PW_KEY_NODE_NAME)); - + pw_properties_setf(impl->capture_props, PW_KEY_MEDIA_NAME, "%s input", + pw_properties_get(impl->capture_props, PW_KEY_NODE_DESCRIPTION)); if (pw_properties_get(impl->playback_props, PW_KEY_MEDIA_NAME) == NULL) - pw_properties_setf(impl->playback_props, PW_KEY_MEDIA_NAME, - "loopback output %s", - pw_properties_get(impl->playback_props, PW_KEY_NODE_NAME)); + pw_properties_setf(impl->playback_props, PW_KEY_MEDIA_NAME, "%s output", + pw_properties_get(impl->playback_props, PW_KEY_NODE_DESCRIPTION)); impl->core = pw_context_get_object(impl->context, PW_TYPE_INTERFACE_Core); if (impl->core == NULL) {