From 75d28cadcdb17a357385615a31b0ef427c41da42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Wed, 1 Jun 2022 20:53:42 +0200 Subject: [PATCH] pulse-server: rename `module_info::prepare()` to `create()` Now that the method does not actually create the `module` object, it would be somewhat misleading to call it "create", so rename it to "prepare". --- src/modules/module-protocol-pulse/module.c | 2 +- src/modules/module-protocol-pulse/module.h | 2 +- .../modules/module-always-sink.c | 4 ++-- .../modules/module-combine-sink.c | 4 ++-- .../modules/module-echo-cancel.c | 4 ++-- .../modules/module-ladspa-sink.c | 4 ++-- .../modules/module-ladspa-source.c | 4 ++-- .../modules/module-loopback.c | 4 ++-- .../modules/module-native-protocol-tcp.c | 4 ++-- .../modules/module-null-sink.c | 4 ++-- .../modules/module-pipe-sink.c | 4 ++-- .../modules/module-pipe-source.c | 4 ++-- .../modules/module-raop-discover.c | 4 ++-- .../modules/module-remap-sink.c | 4 ++-- .../modules/module-remap-source.c | 4 ++-- .../modules/module-roc-sink-input.c | 4 ++-- .../modules/module-roc-sink.c | 4 ++-- .../modules/module-roc-source.c | 4 ++-- .../modules/module-simple-protocol-tcp.c | 4 ++-- .../modules/module-switch-on-connect.c | 4 ++-- .../modules/module-tunnel-sink.c | 4 ++-- .../modules/module-tunnel-source.c | 4 ++-- .../modules/module-x11-bell.c | 22 +++++++++---------- .../modules/module-zeroconf-discover.c | 4 ++-- .../modules/module-zeroconf-publish.c | 4 ++-- 25 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/modules/module-protocol-pulse/module.c b/src/modules/module-protocol-pulse/module.c index 118d931c3..27a5b6b1f 100644 --- a/src/modules/module-protocol-pulse/module.c +++ b/src/modules/module-protocol-pulse/module.c @@ -318,7 +318,7 @@ struct module *module_create(struct client *client, const char *name, const char if (args) module_args_add_props(module->props, args); - int res = module->info->create(module); + int res = module->info->prepare(module); if (res < 0) { module_free(module); errno = -res; diff --git a/src/modules/module-protocol-pulse/module.h b/src/modules/module-protocol-pulse/module.h index efdc30025..c767d6896 100644 --- a/src/modules/module-protocol-pulse/module.h +++ b/src/modules/module-protocol-pulse/module.h @@ -40,7 +40,7 @@ struct module_info { unsigned int load_once:1; - int (*create) (struct module *module); + int (*prepare) (struct module *module); int (*load) (struct client *client, struct module *module); int (*unload) (struct module *module); diff --git a/src/modules/module-protocol-pulse/modules/module-always-sink.c b/src/modules/module-protocol-pulse/modules/module-always-sink.c index 78675b62a..2438c1fcd 100644 --- a/src/modules/module-protocol-pulse/modules/module-always-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-always-sink.c @@ -101,7 +101,7 @@ static const struct spa_dict_item module_always_sink_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_always_sink(struct module * const module) +int module_always_sink_prepare(struct module * const module) { PW_LOG_TOPIC_INIT(mod_topic); @@ -114,7 +114,7 @@ int create_module_always_sink(struct module * const module) DEFINE_MODULE_INFO(module_always_sink) = { .name = "module-always-sink", .load_once = true, - .create = create_module_always_sink, + .prepare = module_always_sink_prepare, .load = module_always_sink_load, .unload = module_always_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_always_sink_info), 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 8aba80bf3..8f33baf8d 100644 --- a/src/modules/module-protocol-pulse/modules/module-combine-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-combine-sink.c @@ -499,7 +499,7 @@ static int module_combine_sink_unload(struct module *module) return 0; } -int create_module_combine_sink(struct module * const module) +int module_combine_sink_prepare(struct module * const module) { struct module_combine_sink_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -558,7 +558,7 @@ out: DEFINE_MODULE_INFO(module_combine_sink) = { .name = "module-combine-sink", - .create = create_module_combine_sink, + .prepare = module_combine_sink_prepare, .load = module_combine_sink_load, .unload = module_combine_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_combine_sink_info), 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 aa96263af..675c62deb 100644 --- a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c +++ b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c @@ -155,7 +155,7 @@ static const struct spa_dict_item module_echo_cancel_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_echo_cancel(struct module * const module) +int module_echo_cancel_prepare(struct module * const module) { struct module_echo_cancel_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -247,7 +247,7 @@ out: DEFINE_MODULE_INFO(module_echo_cancel) = { .name = "module-echo-cancel", - .create = create_module_echo_cancel, + .prepare = module_echo_cancel_prepare, .load = module_echo_cancel_load, .unload = module_echo_cancel_unload, .properties = &SPA_DICT_INIT_ARRAY(module_echo_cancel_info), 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 85b77f4d4..ea2cc043d 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c @@ -177,7 +177,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); } -int create_module_ladspa_sink(struct module * const module) +int module_ladspa_sink_prepare(struct module * const module) { struct module_ladspa_sink_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -249,7 +249,7 @@ out: DEFINE_MODULE_INFO(module_ladspa_sink) = { .name = "module-ladspa-sink", - .create = create_module_ladspa_sink, + .prepare = module_ladspa_sink_prepare, .load = module_ladspa_sink_load, .unload = module_ladspa_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_ladspa_sink_info), 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 dfb017c73..6c0e3c67c 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c @@ -177,7 +177,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); } -int create_module_ladspa_source(struct module * const module) +int module_ladspa_source_prepare(struct module * const module) { struct module_ladspa_source_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -249,7 +249,7 @@ out: DEFINE_MODULE_INFO(module_ladspa_source) = { .name = "module-ladspa-source", - .create = create_module_ladspa_source, + .prepare = module_ladspa_source_prepare, .load = module_ladspa_source_load, .unload = module_ladspa_source_unload, .properties = &SPA_DICT_INIT_ARRAY(module_ladspa_source_info), diff --git a/src/modules/module-protocol-pulse/modules/module-loopback.c b/src/modules/module-protocol-pulse/modules/module-loopback.c index 0c5fc7ca4..9649ceedb 100644 --- a/src/modules/module-protocol-pulse/modules/module-loopback.c +++ b/src/modules/module-protocol-pulse/modules/module-loopback.c @@ -143,7 +143,7 @@ static const struct spa_dict_item module_loopback_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_loopback(struct module * const module) +int module_loopback_prepare(struct module * const module) { struct module_loopback_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -239,7 +239,7 @@ out: DEFINE_MODULE_INFO(module_loopback) = { .name = "module-loopback", - .create = create_module_loopback, + .prepare = module_loopback_prepare, .load = module_loopback_load, .unload = module_loopback_unload, .properties = &SPA_DICT_INIT_ARRAY(module_loopback_info), 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 09ffc34c1..032fdfc91 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 @@ -79,7 +79,7 @@ static const struct spa_dict_item module_native_protocol_tcp_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_native_protocol_tcp(struct module * const module) +int module_native_protocol_tcp_prepare(struct module * const module) { struct module_native_protocol_tcp_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -119,7 +119,7 @@ int create_module_native_protocol_tcp(struct module * const module) DEFINE_MODULE_INFO(module_native_protocol_tcp) = { .name = "module-native-protocol-tcp", - .create = create_module_native_protocol_tcp, + .prepare = module_native_protocol_tcp_prepare, .load = module_native_protocol_tcp_load, .unload = module_native_protocol_tcp_unload, .properties = &SPA_DICT_INIT_ARRAY(module_native_protocol_tcp_info), 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 c70ede18b..948cbad9a 100644 --- a/src/modules/module-protocol-pulse/modules/module-null-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-null-sink.c @@ -158,7 +158,7 @@ static const struct spa_dict_item module_null_sink_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_null_sink(struct module * const module) +int module_null_sink_prepare(struct module * const module) { struct pw_properties * const props = module->props; const char *str; @@ -220,7 +220,7 @@ int create_module_null_sink(struct module * const module) DEFINE_MODULE_INFO(module_null_sink) = { .name = "module-null-sink", - .create = create_module_null_sink, + .prepare = module_null_sink_prepare, .load = module_null_sink_load, .unload = module_null_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_null_sink_info), 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 e257d44d3..4dfe9497d 100644 --- a/src/modules/module-protocol-pulse/modules/module-pipe-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-pipe-sink.c @@ -218,7 +218,7 @@ static const struct spa_dict_item module_pipe_sink_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_pipe_sink(struct module * const module) +int module_pipe_sink_prepare(struct module * const module) { struct module_pipesink_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -324,7 +324,7 @@ out: DEFINE_MODULE_INFO(module_pipe_sink) = { .name = "module-pipe-sink", - .create = create_module_pipe_sink, + .prepare = module_pipe_sink_prepare, .load = module_pipe_sink_load, .unload = module_pipe_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_pipe_sink_info), diff --git a/src/modules/module-protocol-pulse/modules/module-pipe-source.c b/src/modules/module-protocol-pulse/modules/module-pipe-source.c index 27d65e4f7..e500ae8bf 100644 --- a/src/modules/module-protocol-pulse/modules/module-pipe-source.c +++ b/src/modules/module-protocol-pulse/modules/module-pipe-source.c @@ -238,7 +238,7 @@ static const struct spa_dict_item module_pipe_source_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_pipe_source(struct module * const module) +int module_pipe_source_prepare(struct module * const module) { struct module_pipesrc_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -382,7 +382,7 @@ out: DEFINE_MODULE_INFO(module_pipe_source) = { .name = "module-pipe-source", - .create = create_module_pipe_source, + .prepare = module_pipe_source_prepare, .load = module_pipe_source_load, .unload = module_pipe_source_unload, .properties = &SPA_DICT_INIT_ARRAY(module_pipe_source_info), diff --git a/src/modules/module-protocol-pulse/modules/module-raop-discover.c b/src/modules/module-protocol-pulse/modules/module-raop-discover.c index 5e1f63bb0..be29f0785 100644 --- a/src/modules/module-protocol-pulse/modules/module-raop-discover.c +++ b/src/modules/module-protocol-pulse/modules/module-raop-discover.c @@ -92,7 +92,7 @@ static const struct spa_dict_item module_raop_discover_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_raop_discover(struct module * const module) +int module_raop_discover_prepare(struct module * const module) { PW_LOG_TOPIC_INIT(mod_topic); @@ -105,7 +105,7 @@ int create_module_raop_discover(struct module * const module) DEFINE_MODULE_INFO(module_raop_discover) = { .name = "module-raop-discover", .load_once = true, - .create = create_module_raop_discover, + .prepare = module_raop_discover_prepare, .load = module_raop_discover_load, .unload = module_raop_discover_unload, .properties = &SPA_DICT_INIT_ARRAY(module_raop_discover_info), 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 2db1ea350..6288474f9 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-sink.c @@ -143,7 +143,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); } -int create_module_remap_sink(struct module * const module) +int module_remap_sink_prepare(struct module * const module) { struct module_remap_sink_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -246,7 +246,7 @@ out: DEFINE_MODULE_INFO(module_remap_sink) = { .name = "module-remap-sink", - .create = create_module_remap_sink, + .prepare = module_remap_sink_prepare, .load = module_remap_sink_load, .unload = module_remap_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_remap_sink_info), 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 beb927469..a64c8ed98 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-source.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-source.c @@ -143,7 +143,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); } -int create_module_remap_source(struct module * const module) +int module_remap_source_prepare(struct module * const module) { struct module_remap_source_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -246,7 +246,7 @@ out: DEFINE_MODULE_INFO(module_remap_source) = { .name = "module-remap-source", - .create = create_module_remap_source, + .prepare = module_remap_source_prepare, .load = module_remap_source_load, .unload = module_remap_source_unload, .properties = &SPA_DICT_INIT_ARRAY(module_remap_source_info), diff --git a/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c b/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c index 04a0ed549..a33340215 100644 --- a/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c +++ b/src/modules/module-protocol-pulse/modules/module-roc-sink-input.c @@ -124,7 +124,7 @@ static const struct spa_dict_item module_roc_sink_input_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_roc_sink_input(struct module * const module) +int module_roc_sink_input_prepare(struct module * const module) { struct module_roc_sink_input_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -194,7 +194,7 @@ out: DEFINE_MODULE_INFO(module_roc_sink_input) = { .name = "module-roc-sink-input", - .create = create_module_roc_sink_input, + .prepare = module_roc_sink_input_prepare, .load = module_roc_sink_input_load, .unload = module_roc_sink_input_unload, .properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_input_info), diff --git a/src/modules/module-protocol-pulse/modules/module-roc-sink.c b/src/modules/module-protocol-pulse/modules/module-roc-sink.c index bf33dab68..c19a47a0d 100644 --- a/src/modules/module-protocol-pulse/modules/module-roc-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-roc-sink.c @@ -123,7 +123,7 @@ static const struct spa_dict_item module_roc_sink_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_roc_sink(struct module * const module) +int module_roc_sink_prepare(struct module * const module) { struct module_roc_sink_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -196,7 +196,7 @@ out: DEFINE_MODULE_INFO(module_roc_sink) = { .name = "module-roc-sink", - .create = create_module_roc_sink, + .prepare = module_roc_sink_prepare, .load = module_roc_sink_load, .unload = module_roc_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_info), diff --git a/src/modules/module-protocol-pulse/modules/module-roc-source.c b/src/modules/module-protocol-pulse/modules/module-roc-source.c index 8ee98e27a..e52980796 100644 --- a/src/modules/module-protocol-pulse/modules/module-roc-source.c +++ b/src/modules/module-protocol-pulse/modules/module-roc-source.c @@ -124,7 +124,7 @@ static const struct spa_dict_item module_roc_source_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_roc_source(struct module * const module) +int module_roc_source_prepare(struct module * const module) { struct module_roc_source_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -199,7 +199,7 @@ out: DEFINE_MODULE_INFO(module_roc_source) = { .name = "module-roc-source", - .create = create_module_roc_source, + .prepare = module_roc_source_prepare, .load = module_roc_source_load, .unload = module_roc_source_unload, .properties = &SPA_DICT_INIT_ARRAY(module_roc_source_info), 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 3fd9542bb..bf1885fa2 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 @@ -130,7 +130,7 @@ static const struct spa_dict_item module_simple_protocol_tcp_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_simple_protocol_tcp(struct module * const module) +int module_simple_protocol_tcp_prepare(struct module * const module) { struct module_simple_protocol_tcp_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -202,7 +202,7 @@ out: DEFINE_MODULE_INFO(module_simple_protocol_tcp) = { .name = "module-simple-protocol-tcp", - .create = create_module_simple_protocol_tcp, + .prepare = module_simple_protocol_tcp_prepare, .load = module_simple_protocol_tcp_load, .unload = module_simple_protocol_tcp_unload, .properties = &SPA_DICT_INIT_ARRAY(module_simple_protocol_tcp_info), diff --git a/src/modules/module-protocol-pulse/modules/module-switch-on-connect.c b/src/modules/module-protocol-pulse/modules/module-switch-on-connect.c index 4cfe8796b..fce5fbab7 100644 --- a/src/modules/module-protocol-pulse/modules/module-switch-on-connect.c +++ b/src/modules/module-protocol-pulse/modules/module-switch-on-connect.c @@ -245,7 +245,7 @@ static const struct spa_dict_item module_switch_on_connect_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_switch_on_connect(struct module * const module) +int module_switch_on_connect_prepare(struct module * const module) { struct module_switch_on_connect_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -307,7 +307,7 @@ out: DEFINE_MODULE_INFO(module_switch_on_connect) = { .name = "module-switch-on-connect", .load_once = true, - .create = create_module_switch_on_connect, + .prepare = module_switch_on_connect_prepare, .load = module_switch_on_connect_load, .unload = module_switch_on_connect_unload, .properties = &SPA_DICT_INIT_ARRAY(module_switch_on_connect_info), 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 8070286c2..7e67944b9 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c @@ -149,7 +149,7 @@ static void audio_info_to_props(struct spa_audio_info_raw *info, struct pw_prope pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); } -int create_module_tunnel_sink(struct module * const module) +int module_tunnel_sink_prepare(struct module * const module) { struct module_tunnel_sink_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -223,7 +223,7 @@ out: DEFINE_MODULE_INFO(module_tunnel_sink) = { .name = "module-tunnel-sink", - .create = create_module_tunnel_sink, + .prepare = module_tunnel_sink_prepare, .load = module_tunnel_sink_load, .unload = module_tunnel_sink_unload, .properties = &SPA_DICT_INIT_ARRAY(module_tunnel_sink_info), 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 7f2fcf031..43ffb5464 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c @@ -149,7 +149,7 @@ static void audio_info_to_props(struct spa_audio_info_raw *info, struct pw_prope pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); } -int create_module_tunnel_source(struct module * const module) +int module_tunnel_source_prepare(struct module * const module) { struct module_tunnel_source_data * const d = module->user_data; struct pw_properties * const props = module->props; @@ -213,7 +213,7 @@ out: DEFINE_MODULE_INFO(module_tunnel_source) = { .name = "module-tunnel-source", - .create = create_module_tunnel_source, + .prepare = module_tunnel_source_prepare, .load = module_tunnel_source_load, .unload = module_tunnel_source_unload, .properties = &SPA_DICT_INIT_ARRAY(module_tunnel_source_info), diff --git a/src/modules/module-protocol-pulse/modules/module-x11-bell.c b/src/modules/module-protocol-pulse/modules/module-x11-bell.c index b9d1847e8..448db205c 100644 --- a/src/modules/module-protocol-pulse/modules/module-x11-bell.c +++ b/src/modules/module-protocol-pulse/modules/module-x11-bell.c @@ -100,6 +100,16 @@ static int module_x11_bell_unload(struct module *module) return 0; } +int module_x11_bell_prepare(struct module * const module) +{ + PW_LOG_TOPIC_INIT(mod_topic); + + struct module_x11_bell_data * const data = module->user_data; + data->module = module; + + return 0; +} + static const struct spa_dict_item module_x11_bell_info[] = { { PW_KEY_MODULE_AUTHOR, "Wim Taymans " }, { PW_KEY_MODULE_DESCRIPTION, "X11 bell interceptor" }, @@ -110,19 +120,9 @@ static const struct spa_dict_item module_x11_bell_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_x11_bell(struct module * const module) -{ - PW_LOG_TOPIC_INIT(mod_topic); - - struct module_x11_bell_data * const data = module->user_data; - data->module = module; - - return 0; -} - DEFINE_MODULE_INFO(module_x11_bell) = { .name = "module-x11-bell", - .create = create_module_x11_bell, + .prepare = module_x11_bell_prepare, .load = module_x11_bell_load, .unload = module_x11_bell_unload, .properties = &SPA_DICT_INIT_ARRAY(module_x11_bell_info), 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 6d3180e48..0d6d243a4 100644 --- a/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c +++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c @@ -92,7 +92,7 @@ static const struct spa_dict_item module_zeroconf_discover_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_zeroconf_discover(struct module * const module) +int module_zeroconf_discover_prepare(struct module * const module) { PW_LOG_TOPIC_INIT(mod_topic); @@ -105,7 +105,7 @@ int create_module_zeroconf_discover(struct module * const module) DEFINE_MODULE_INFO(module_zeroconf_discover) = { .name = "module-zeroconf-discover", .load_once = true, - .create = create_module_zeroconf_discover, + .prepare = module_zeroconf_discover_prepare, .load = module_zeroconf_discover_load, .unload = module_zeroconf_discover_unload, .properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_discover_info), diff --git a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c index e407e65a0..7709e9e2f 100644 --- a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c +++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c @@ -647,7 +647,7 @@ static const struct spa_dict_item module_zeroconf_publish_info[] = { { PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, }; -int create_module_zeroconf_publish(struct module * const module) +int module_zeroconf_publish_prepare(struct module * const module) { PW_LOG_TOPIC_INIT(mod_topic); @@ -662,7 +662,7 @@ int create_module_zeroconf_publish(struct module * const module) DEFINE_MODULE_INFO(module_zeroconf_publish) = { .name = "module-zeroconf-publish", - .create = create_module_zeroconf_publish, + .prepare = module_zeroconf_publish_prepare, .load = module_zeroconf_publish_load, .unload = module_zeroconf_publish_unload, .properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_publish_info),