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

pipewire: module-roc-{sink,source}: remove props member

Browse source 
The `props` member was not used at all, so get rid of it.
This commit is contained in:
Barnabás Pőcze 2023-11-22 19:42:13 +01:00
parent 6d8a31a3e4
commit 0a3bd825cd
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-roc-sink.c
View file

@ -19,6 +19,7 @@
#include <roc/log.h> #include <roc/log.h>
#include <roc/sender.h> #include <roc/sender.h>
#include <pipewire/cleanup.h>
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
#include <pipewire/impl.h> #include <pipewire/impl.h>
@ -81,7 +82,6 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
struct module_roc_sink_data { struct module_roc_sink_data {
struct pw_impl_module *module; struct pw_impl_module *module;
struct spa_hook module_listener; struct spa_hook module_listener;
struct pw_properties *props;
struct pw_context *module_context; struct pw_context *module_context;
struct pw_core *core; struct pw_core *core;
@ -211,7 +211,6 @@ static void impl_destroy(struct module_roc_sink_data *data)
pw_core_disconnect(data->core); pw_core_disconnect(data->core);
pw_properties_free(data->capture_props); pw_properties_free(data->capture_props);
pw_properties_free(data->props);
if (data->sender) if (data->sender)
roc_sender_close(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 pw_context *context = pw_impl_module_get_context(module);
struct module_roc_sink_data *data; struct module_roc_sink_data *data;
struct pw_properties *props = NULL, *capture_props = NULL; struct pw_properties *capture_props = NULL;
const char *str; const char *str;
int res = 0; int res = 0;
@ -366,13 +365,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
if (args == NULL) if (args == NULL)
args = ""; args = "";
props = pw_properties_new_string(args); spa_autoptr(pw_properties) props = pw_properties_new_string(args);
if (props == NULL) { if (props == NULL) {
res = -errno; res = -errno;
pw_log_error( "can't create properties: %m"); pw_log_error( "can't create properties: %m");
goto out; goto out;
} }
data->props = props;
capture_props = pw_properties_new(NULL, NULL); capture_props = pw_properties_new(NULL, NULL);
if (capture_props == NULL) { if (capture_props == NULL) {

8
src/modules/module-roc-source.c
View file

@ -19,6 +19,7 @@
#include <roc/log.h> #include <roc/log.h>
#include <roc/receiver.h> #include <roc/receiver.h>
#include <pipewire/cleanup.h>
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
#include <pipewire/impl.h> #include <pipewire/impl.h>
@ -86,7 +87,6 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
struct module_roc_source_data { struct module_roc_source_data {
struct pw_impl_module *module; struct pw_impl_module *module;
struct spa_hook module_listener; struct spa_hook module_listener;
struct pw_properties *props;
struct pw_context *module_context; struct pw_context *module_context;
struct pw_core *core; struct pw_core *core;
@ -220,7 +220,6 @@ static void impl_destroy(struct module_roc_source_data *data)
pw_core_disconnect(data->core); pw_core_disconnect(data->core);
pw_properties_free(data->playback_props); pw_properties_free(data->playback_props);
pw_properties_free(data->props);
if (data->receiver) if (data->receiver)
roc_receiver_close(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 pw_context *context = pw_impl_module_get_context(module);
struct module_roc_source_data *data; struct module_roc_source_data *data;
struct pw_properties *props = NULL, *playback_props = NULL; struct pw_properties *playback_props = NULL;
const char *str; const char *str;
int res = 0; int res = 0;
@ -391,13 +390,12 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
if (args == NULL) if (args == NULL)
args = ""; args = "";
props = pw_properties_new_string(args); spa_autoptr(pw_properties) props = pw_properties_new_string(args);
if (props == NULL) { if (props == NULL) {
res = -errno; res = -errno;
pw_log_error( "can't create properties: %m"); pw_log_error( "can't create properties: %m");
goto out; goto out;
} }
data->props = props;
playback_props = pw_properties_new(NULL, NULL); playback_props = pw_properties_new(NULL, NULL);
if (playback_props == NULL) { if (playback_props == NULL) {