From 0a3bd825cd195aae6b331ce9066ebe0642c43db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Wed, 22 Nov 2023 19:42:13 +0100 Subject: [PATCH] pipewire: module-roc-{sink,source}: remove `props` member The `props` member was not used at all, so get rid of it. --- src/modules/module-roc-sink.c | 8 +++----- src/modules/module-roc-source.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/modules/module-roc-sink.c b/src/modules/module-roc-sink.c index ec7a0740b..6dc4f7cb6 100644 --- a/src/modules/module-roc-sink.c +++ b/src/modules/module-roc-sink.c @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -81,7 +82,6 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME); struct module_roc_sink_data { struct pw_impl_module *module; struct spa_hook module_listener; - struct pw_properties *props; struct pw_context *module_context; struct pw_core *core; @@ -211,7 +211,6 @@ static void impl_destroy(struct module_roc_sink_data *data) pw_core_disconnect(data->core); pw_properties_free(data->capture_props); - pw_properties_free(data->props); if (data->sender) roc_sender_close(data->sender); @@ -353,7 +352,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) { struct pw_context *context = pw_impl_module_get_context(module); struct module_roc_sink_data *data; - struct pw_properties *props = NULL, *capture_props = NULL; + struct pw_properties *capture_props = NULL; const char *str; int res = 0; @@ -366,13 +365,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) if (args == NULL) args = ""; - props = pw_properties_new_string(args); + spa_autoptr(pw_properties) props = pw_properties_new_string(args); if (props == NULL) { res = -errno; pw_log_error( "can't create properties: %m"); goto out; } - data->props = props; capture_props = pw_properties_new(NULL, NULL); if (capture_props == NULL) { diff --git a/src/modules/module-roc-source.c b/src/modules/module-roc-source.c index 8f6de4d80..f1ff70c8a 100644 --- a/src/modules/module-roc-source.c +++ b/src/modules/module-roc-source.c @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -86,7 +87,6 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME); struct module_roc_source_data { struct pw_impl_module *module; struct spa_hook module_listener; - struct pw_properties *props; struct pw_context *module_context; struct pw_core *core; @@ -220,7 +220,6 @@ static void impl_destroy(struct module_roc_source_data *data) pw_core_disconnect(data->core); pw_properties_free(data->playback_props); - pw_properties_free(data->props); if (data->receiver) roc_receiver_close(data->receiver); @@ -378,7 +377,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) { struct pw_context *context = pw_impl_module_get_context(module); struct module_roc_source_data *data; - struct pw_properties *props = NULL, *playback_props = NULL; + struct pw_properties *playback_props = NULL; const char *str; int res = 0; @@ -391,13 +390,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args) if (args == NULL) args = ""; - props = pw_properties_new_string(args); + spa_autoptr(pw_properties) props = pw_properties_new_string(args); if (props == NULL) { res = -errno; pw_log_error( "can't create properties: %m"); goto out; } - data->props = props; playback_props = pw_properties_new(NULL, NULL); if (playback_props == NULL) {