diff --git a/src/modules/module-protocol-pulse/modules/module-combine-sink.c b/src/modules/module-protocol-pulse/modules/module-combine-sink.c index 3a1c4bacf..32b15c06f 100644 --- a/src/modules/module-protocol-pulse/modules/module-combine-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-combine-sink.c @@ -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); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; int i; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->cleanup != NULL) pw_loop_destroy_source(module->impl->loop, d->cleanup); diff --git a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c index 0a49c01d6..dd144daa8 100644 --- a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c +++ b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c @@ -107,7 +107,6 @@ static int module_echo_cancel_load(struct client *client, struct module *module) &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c index 3270f8bd9..62ea18229 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c @@ -110,7 +110,6 @@ static int module_ladspa_sink_load(struct client *client, struct module *module) &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c index d84ec1fd3..8500f1880 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c @@ -110,7 +110,6 @@ static int module_ladspa_source_load(struct client *client, struct module *modul &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-loopback.c b/src/modules/module-protocol-pulse/modules/module-loopback.c index fe41acc5c..777f9c3c5 100644 --- a/src/modules/module-protocol-pulse/modules/module-loopback.c +++ b/src/modules/module-protocol-pulse/modules/module-loopback.c @@ -98,7 +98,6 @@ static int module_loopback_load(struct client *client, struct module *module) &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-native-protocol-tcp.c b/src/modules/module-protocol-pulse/modules/module-native-protocol-tcp.c index e297d1722..eae8a4e9a 100644 --- a/src/modules/module-protocol-pulse/modules/module-native-protocol-tcp.c +++ b/src/modules/module-protocol-pulse/modules/module-native-protocol-tcp.c @@ -56,7 +56,6 @@ static int module_native_protocol_tcp_load(struct client *client, struct module if (res < 0) return res; - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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 server **s; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - pw_array_for_each (s, &d->servers) server_free(*s); diff --git a/src/modules/module-protocol-pulse/modules/module-null-sink.c b/src/modules/module-protocol-pulse/modules/module-null-sink.c index 52b3fafb8..0741f8cc3 100644 --- a/src/modules/module-protocol-pulse/modules/module-null-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-null-sink.c @@ -88,19 +88,20 @@ static int module_null_sink_load(struct client *client, struct module *module) if (d->proxy == NULL) 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); + return 0; } static int module_null_sink_unload(struct client *client, struct module *module) { 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) pw_proxy_destroy(d->proxy); if (d->global_id != SPA_ID_INVALID) pw_registry_destroy(client->manager->registry, d->global_id); + return 0; } diff --git a/src/modules/module-protocol-pulse/modules/module-pipe-sink.c b/src/modules/module-protocol-pulse/modules/module-pipe-sink.c index 3f1d5c2cb..d6f213a54 100644 --- a/src/modules/module-protocol-pulse/modules/module-pipe-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-pipe-sink.c @@ -177,7 +177,6 @@ static int module_pipesink_load(struct client *client, struct module *module) params, n_params)) < 0) return res; - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - pw_properties_free(d->capture_props); if (d->capture != NULL) pw_stream_destroy(d->capture); diff --git a/src/modules/module-protocol-pulse/modules/module-remap-sink.c b/src/modules/module-protocol-pulse/modules/module-remap-sink.c index 519f15aeb..7da638e20 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-sink.c @@ -94,7 +94,6 @@ static int module_remap_sink_load(struct client *client, struct module *module) &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-remap-source.c b/src/modules/module-protocol-pulse/modules/module-remap-source.c index dc4f7e21a..a7551a1e5 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-source.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-source.c @@ -94,7 +94,6 @@ static int module_remap_source_load(struct client *client, struct module *module &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-simple-protocol-tcp.c b/src/modules/module-protocol-pulse/modules/module-simple-protocol-tcp.c index b0e9f3c33..ff25629bc 100644 --- a/src/modules/module-protocol-pulse/modules/module-simple-protocol-tcp.c +++ b/src/modules/module-protocol-pulse/modules/module-simple-protocol-tcp.c @@ -72,8 +72,8 @@ static int module_simple_protocol_tcp_load(struct client *client, struct module if (data->mod == NULL) return -errno; - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - pw_impl_module_destroy(d->mod); return 0; diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c index 9b8b6877d..b49fb008a 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c @@ -95,7 +95,6 @@ static int module_tunnel_sink_load(struct client *client, struct module *module) &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c index d572f2272..49c55fcbb 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c @@ -95,7 +95,6 @@ static int module_tunnel_source_load(struct client *client, struct module *modul &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c b/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c index bd6db8afd..e64329eef 100644 --- a/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c +++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c @@ -71,7 +71,6 @@ static int module_zeroconf_discover_load(struct client *client, struct module *m &data->mod_listener, &module_events, data); - pw_log_info("loaded module %p id:%u name:%s", module, module->idx, module->name); module_emit_loaded(module, 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; - pw_log_info("unload module %p id:%u name:%s", module, module->idx, module->name); - if (d->mod) { spa_hook_remove(&d->mod_listener); pw_impl_module_destroy(d->mod); d->mod = NULL; } + return 0; }