pulse-server: remove redundant log messages from modules

The same information is printed in
* `on_module_loaded()`,
* `module_load()`, and
* `module_unload()`.
This commit is contained in:
Barnabás Pőcze 2021-06-10 18:38:36 +02:00
parent a90c86dd47
commit cd0eb829dd
14 changed files with 5 additions and 41 deletions

View file

@ -361,7 +361,6 @@ static int module_combine_sink_load(struct client *client, struct module *module
data->cleanup = pw_loop_add_event(module->impl->loop, on_cleanup, data); data->cleanup = pw_loop_add_event(module->impl->loop, on_cleanup, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -372,8 +371,6 @@ static int module_combine_sink_unload(struct client *client, struct module *modu
struct module_combine_sink_data *d = module->user_data; struct module_combine_sink_data *d = module->user_data;
int i; int i;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->cleanup != NULL) if (d->cleanup != NULL)
pw_loop_destroy_source(module->impl->loop, d->cleanup); pw_loop_destroy_source(module->impl->loop, d->cleanup);

View file

@ -107,7 +107,6 @@ static int module_echo_cancel_load(struct client *client, struct module *module)
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -117,8 +116,6 @@ static int module_echo_cancel_unload(struct client *client, struct module *modul
{ {
struct module_echo_cancel_data *d = module->user_data; struct module_echo_cancel_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -110,7 +110,6 @@ static int module_ladspa_sink_load(struct client *client, struct module *module)
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -120,8 +119,6 @@ static int module_ladspa_sink_unload(struct client *client, struct module *modul
{ {
struct module_ladspa_sink_data *d = module->user_data; struct module_ladspa_sink_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -110,7 +110,6 @@ static int module_ladspa_source_load(struct client *client, struct module *modul
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -120,8 +119,6 @@ static int module_ladspa_source_unload(struct client *client, struct module *mod
{ {
struct module_ladspa_source_data *d = module->user_data; struct module_ladspa_source_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -98,7 +98,6 @@ static int module_loopback_load(struct client *client, struct module *module)
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -108,8 +107,6 @@ static int module_loopback_unload(struct client *client, struct module *module)
{ {
struct module_loopback_data *d = module->user_data; struct module_loopback_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -56,7 +56,6 @@ static int module_native_protocol_tcp_load(struct client *client, struct module
if (res < 0) if (res < 0)
return res; return res;
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -67,8 +66,6 @@ static int module_native_protocol_tcp_unload(struct client *client, struct modul
struct module_native_protocol_tcp_data *d = module->user_data; struct module_native_protocol_tcp_data *d = module->user_data;
struct server **s; struct server **s;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
pw_array_for_each (s, &d->servers) pw_array_for_each (s, &d->servers)
server_free(*s); server_free(*s);

View file

@ -88,19 +88,20 @@ static int module_null_sink_load(struct client *client, struct module *module)
if (d->proxy == NULL) if (d->proxy == NULL)
return -errno; return -errno;
pw_log_info("loaded module %p id:%u name:%s %p", module, module->idx, module->name, d->proxy);
pw_proxy_add_listener(d->proxy, &d->listener, &proxy_events, module); pw_proxy_add_listener(d->proxy, &d->listener, &proxy_events, module);
return 0; return 0;
} }
static int module_null_sink_unload(struct client *client, struct module *module) static int module_null_sink_unload(struct client *client, struct module *module)
{ {
struct module_null_sink_data *d = module->user_data; struct module_null_sink_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s %p", module, module->idx, module->name, d->proxy);
if (d->proxy != NULL) if (d->proxy != NULL)
pw_proxy_destroy(d->proxy); pw_proxy_destroy(d->proxy);
if (d->global_id != SPA_ID_INVALID) if (d->global_id != SPA_ID_INVALID)
pw_registry_destroy(client->manager->registry, d->global_id); pw_registry_destroy(client->manager->registry, d->global_id);
return 0; return 0;
} }

View file

@ -177,7 +177,6 @@ static int module_pipesink_load(struct client *client, struct module *module)
params, n_params)) < 0) params, n_params)) < 0)
return res; return res;
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -187,8 +186,6 @@ static int module_pipesink_unload(struct client *client, struct module *module)
{ {
struct module_pipesink_data *d = module->user_data; struct module_pipesink_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
pw_properties_free(d->capture_props); pw_properties_free(d->capture_props);
if (d->capture != NULL) if (d->capture != NULL)
pw_stream_destroy(d->capture); pw_stream_destroy(d->capture);

View file

@ -94,7 +94,6 @@ static int module_remap_sink_load(struct client *client, struct module *module)
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -104,8 +103,6 @@ static int module_remap_sink_unload(struct client *client, struct module *module
{ {
struct module_remap_sink_data *d = module->user_data; struct module_remap_sink_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -94,7 +94,6 @@ static int module_remap_source_load(struct client *client, struct module *module
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -104,8 +103,6 @@ static int module_remap_source_unload(struct client *client, struct module *modu
{ {
struct module_remap_source_data *d = module->user_data; struct module_remap_source_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -72,8 +72,8 @@ static int module_simple_protocol_tcp_load(struct client *client, struct module
if (data->mod == NULL) if (data->mod == NULL)
return -errno; return -errno;
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
} }
@ -81,8 +81,6 @@ static int module_simple_protocol_tcp_unload(struct client *client, struct modul
{ {
struct module_simple_protocol_tcp_data *d = module->user_data; struct module_simple_protocol_tcp_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);
return 0; return 0;

View file

@ -95,7 +95,6 @@ static int module_tunnel_sink_load(struct client *client, struct module *module)
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -105,8 +104,6 @@ static int module_tunnel_sink_unload(struct client *client, struct module *modul
{ {
struct module_tunnel_sink_data *d = module->user_data; struct module_tunnel_sink_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -95,7 +95,6 @@ static int module_tunnel_source_load(struct client *client, struct module *modul
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -105,8 +104,6 @@ static int module_tunnel_source_unload(struct client *client, struct module *mod
{ {
struct module_tunnel_source_data *d = module->user_data; struct module_tunnel_source_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);

View file

@ -71,7 +71,6 @@ static int module_zeroconf_discover_load(struct client *client, struct module *m
&data->mod_listener, &data->mod_listener,
&module_events, data); &module_events, data);
pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name);
module_emit_loaded(module, 0); module_emit_loaded(module, 0);
return 0; return 0;
@ -81,13 +80,12 @@ static int module_zeroconf_discover_unload(struct client *client, struct module
{ {
struct module_zeroconf_discover_data *d = module->user_data; struct module_zeroconf_discover_data *d = module->user_data;
pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name);
if (d->mod) { if (d->mod) {
spa_hook_remove(&d->mod_listener); spa_hook_remove(&d->mod_listener);
pw_impl_module_destroy(d->mod); pw_impl_module_destroy(d->mod);
d->mod = NULL; d->mod = NULL;
} }
return 0; return 0;
} }