mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-02-20 01:40:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipewire: module-roc-{sink,source}: remove logging related unused code

Browse source 
!2699 has been merged a bit prematurely and it contained things that are
not used. So remove the unused member variables, functions, fix module
usage strings, and move some functions from headers.
This commit is contained in:
Barnabás Pőcze 2026-02-19 20:11:08 +01:00 • committed by Wim Taymans
parent d4329600d1
commit d8b06f94ee
4 changed files with 43 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,8 +120,6 @@ struct module_roc_sink_data {
roc_endpoint *remote_control_addr;
int remote_control_port;
roc_log_level loglevel;
};
static void stream_destroy(void *d)
@ -391,8 +389,7 @@ static const struct spa_dict_item module_roc_sink_info[] = {
"( remote.repair.port=<remote receiver port for repair packets> ) "
"( remote.control.port=<remote receiver port for control packets> ) "
"( audio.position=<channel map, default:"PW_ROC_STEREO_POSITIONS"> ) "
"( sink.props= { key=val ... } ) "
"( log.level=<empty>|DEFAULT|NONE|RROR|INFO|DEBUG|TRACE ) " },
"( sink.props= { key=val ... } ) " },
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
};
@ -513,14 +510,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_log_error("can't connect: %m");
goto out;
}
if ((str = pw_properties_get(props, "log.level")) != NULL) {
const struct spa_log *log_conf = pw_log_get();
const roc_log_level default_level = pw_roc_log_level_pw_2_roc(log_conf->level);
if (pw_roc_parse_log_level(&data->loglevel, str, default_level)) {
pw_log_error("Invalid log level %s, using default", str);
data->loglevel = default_level;
}
}
pw_proxy_add_listener((struct pw_proxy*)data->core,
&data->core_proxy_listener,

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

@ -140,8 +140,6 @@ struct module_roc_source_data {
roc_endpoint *local_control_addr;
int local_control_port;
roc_log_level loglevel;
};
static void stream_destroy(void *d)
@ -430,8 +428,7 @@ static const struct spa_dict_item module_roc_source_info[] = {
"( local.repair.port=<local receiver port for repair packets> ) "
"( local.control.port=<local receiver port for control packets> ) "
"( audio.position=<channel map, default:"PW_ROC_STEREO_POSITIONS"> ) "
"( source.props= { key=value ... } ) "
"( log.level=<empty>|DEFAULT|NONE|RROR|INFO|DEBUG|TRACE ) " },
"( source.props= { key=value ... } ) " },
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
};
@ -567,14 +564,6 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
} else {
data->fec_code = ROC_FEC_ENCODING_DEFAULT;
}
if ((str = pw_properties_get(props, "log.level")) != NULL) {
const struct spa_log *log_conf = pw_log_get();
const roc_log_level default_level = pw_roc_log_level_pw_2_roc(log_conf->level);
if (pw_roc_parse_log_level(&data->loglevel, str, default_level)) {
pw_log_error("Invalid log level %s, using default", str);
data->loglevel = default_level;
}
}
data->core = pw_context_get_object(data->module_context, PW_TYPE_INTERFACE_Core);
if (data->core == NULL) {

45
src/modules/module-roc/common.c
View file

@ -5,13 +5,45 @@
PW_LOG_TOPIC(roc_log_topic, "mod.roc.lib");
void pw_roc_log_init(void)
static inline roc_log_level pw_roc_log_level_pw_2_roc(const enum spa_log_level pw_log_level)
{
roc_log_set_handler(pw_roc_log_handler, NULL);
roc_log_set_level(pw_roc_log_level_pw_2_roc(roc_log_topic->has_custom_level ? roc_log_topic->level : pw_log_level));
switch (pw_log_level) {
case SPA_LOG_LEVEL_NONE:
return ROC_LOG_NONE;
case SPA_LOG_LEVEL_ERROR:
return ROC_LOG_ERROR;
case SPA_LOG_LEVEL_WARN:
return ROC_LOG_ERROR;
case SPA_LOG_LEVEL_INFO:
return ROC_LOG_INFO;
case SPA_LOG_LEVEL_DEBUG:
return ROC_LOG_DEBUG;
case SPA_LOG_LEVEL_TRACE:
return ROC_LOG_TRACE;
default:
return ROC_LOG_NONE;
}
}
void pw_roc_log_handler(const roc_log_message *message, void *argument)
static inline enum spa_log_level pw_roc_log_level_roc_2_pw(const roc_log_level roc_log_level)
{
switch (roc_log_level) {
case ROC_LOG_NONE:
return SPA_LOG_LEVEL_NONE;
case ROC_LOG_ERROR:
return SPA_LOG_LEVEL_ERROR;
case ROC_LOG_INFO:
return SPA_LOG_LEVEL_INFO;
case ROC_LOG_DEBUG:
return SPA_LOG_LEVEL_DEBUG;
case ROC_LOG_TRACE:
return SPA_LOG_LEVEL_TRACE;
default:
return SPA_LOG_LEVEL_NONE;
}
}
static void pw_roc_log_handler(const roc_log_message *message, void *argument)
{
const enum spa_log_level log_level = pw_roc_log_level_roc_2_pw(message->level);
if (SPA_UNLIKELY(pw_log_topic_enabled(log_level, roc_log_topic))) {
@ -19,3 +51,8 @@ void pw_roc_log_handler(const roc_log_message *message, void *argument)
}
}
void pw_roc_log_init(void)
{
roc_log_set_handler(pw_roc_log_handler, NULL);
roc_log_set_level(pw_roc_log_level_pw_2_roc(roc_log_topic->has_custom_level ? roc_log_topic->level : pw_log_level));
}

60
src/modules/module-roc/common.h
View file

@ -3,7 +3,6 @@
#include <roc/config.h>
#include <roc/endpoint.h>
#include <roc/log.h>
#include <spa/utils/string.h>
#include <spa/support/log.h>
@ -21,7 +20,6 @@
#define PW_ROC_STEREO_POSITIONS "[ FL FR ]"
void pw_roc_log_init(void);
void pw_roc_log_handler(const roc_log_message *message, void *argument);
static inline int pw_roc_parse_fec_encoding(roc_fec_encoding *out, const char *str)
{
@ -137,62 +135,4 @@ static inline void pw_roc_fec_encoding_to_proto(roc_fec_encoding fec_code, roc_p
}
}
static inline roc_log_level pw_roc_log_level_pw_2_roc(const enum spa_log_level pw_log_level)
{
switch (pw_log_level) {
case SPA_LOG_LEVEL_NONE:
return ROC_LOG_NONE;
case SPA_LOG_LEVEL_ERROR:
return ROC_LOG_ERROR;
case SPA_LOG_LEVEL_WARN:
return ROC_LOG_ERROR;
case SPA_LOG_LEVEL_INFO:
return ROC_LOG_INFO;
case SPA_LOG_LEVEL_DEBUG:
return ROC_LOG_DEBUG;
case SPA_LOG_LEVEL_TRACE:
return ROC_LOG_TRACE;
default:
return ROC_LOG_NONE;
}
}
static inline enum spa_log_level pw_roc_log_level_roc_2_pw(const roc_log_level roc_log_level)
{
switch (roc_log_level) {
case ROC_LOG_NONE:
return SPA_LOG_LEVEL_NONE;
case ROC_LOG_ERROR:
return SPA_LOG_LEVEL_ERROR;
case ROC_LOG_INFO:
return SPA_LOG_LEVEL_INFO;
case ROC_LOG_DEBUG:
return SPA_LOG_LEVEL_DEBUG;
case ROC_LOG_TRACE:
return SPA_LOG_LEVEL_TRACE;
default:
return SPA_LOG_LEVEL_NONE;
}
}
static inline int pw_roc_parse_log_level(roc_log_level *loglevel, const char *str,
roc_log_level default_level)
{
if (spa_streq(str, "DEFAULT"))
*loglevel = default_level;
else if (spa_streq(str, "NONE"))
*loglevel = ROC_LOG_NONE;
else if (spa_streq(str, "ERROR"))
*loglevel = ROC_LOG_ERROR;
else if (spa_streq(str, "INFO"))
*loglevel = ROC_LOG_INFO;
else if (spa_streq(str, "DEBUG"))
*loglevel = ROC_LOG_DEBUG;
else if (spa_streq(str, "TRACE"))
*loglevel = ROC_LOG_TRACE;
else
return -EINVAL;
return 0;
}
#endif /* MODULE_ROC_COMMON_H */