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".
This commit is contained in:
Barnabás Pőcze 2022-06-01 20:53:42 +02:00
parent fa3a28ab68
commit 75d28cadcd
25 changed files with 57 additions and 57 deletions

View file

@ -318,7 +318,7 @@ struct module *module_create(struct client *client, const char *name, const char
if (args) if (args)
module_args_add_props(module->props, args); module_args_add_props(module->props, args);
int res = module->info->create(module); int res = module->info->prepare(module);
if (res < 0) { if (res < 0) {
module_free(module); module_free(module);
errno = -res; errno = -res;

View file

@ -40,7 +40,7 @@ struct module_info {
unsigned int load_once:1; unsigned int load_once:1;
int (*create) (struct module *module); int (*prepare) (struct module *module);
int (*load) (struct client *client, struct module *module); int (*load) (struct client *client, struct module *module);
int (*unload) (struct module *module); int (*unload) (struct module *module);

View file

@ -101,7 +101,7 @@ static const struct spa_dict_item module_always_sink_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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); 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) = { DEFINE_MODULE_INFO(module_always_sink) = {
.name = "module-always-sink", .name = "module-always-sink",
.load_once = true, .load_once = true,
.create = create_module_always_sink, .prepare = module_always_sink_prepare,
.load = module_always_sink_load, .load = module_always_sink_load,
.unload = module_always_sink_unload, .unload = module_always_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_always_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_always_sink_info),

View file

@ -499,7 +499,7 @@ static int module_combine_sink_unload(struct module *module)
return 0; 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 module_combine_sink_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -558,7 +558,7 @@ out:
DEFINE_MODULE_INFO(module_combine_sink) = { DEFINE_MODULE_INFO(module_combine_sink) = {
.name = "module-combine-sink", .name = "module-combine-sink",
.create = create_module_combine_sink, .prepare = module_combine_sink_prepare,
.load = module_combine_sink_load, .load = module_combine_sink_load,
.unload = module_combine_sink_unload, .unload = module_combine_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_combine_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_combine_sink_info),

View file

@ -155,7 +155,7 @@ static const struct spa_dict_item module_echo_cancel_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_echo_cancel_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -247,7 +247,7 @@ out:
DEFINE_MODULE_INFO(module_echo_cancel) = { DEFINE_MODULE_INFO(module_echo_cancel) = {
.name = "module-echo-cancel", .name = "module-echo-cancel",
.create = create_module_echo_cancel, .prepare = module_echo_cancel_prepare,
.load = module_echo_cancel_load, .load = module_echo_cancel_load,
.unload = module_echo_cancel_unload, .unload = module_echo_cancel_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_echo_cancel_info), .properties = &SPA_DICT_INIT_ARRAY(module_echo_cancel_info),

View file

@ -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); 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 module_ladspa_sink_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -249,7 +249,7 @@ out:
DEFINE_MODULE_INFO(module_ladspa_sink) = { DEFINE_MODULE_INFO(module_ladspa_sink) = {
.name = "module-ladspa-sink", .name = "module-ladspa-sink",
.create = create_module_ladspa_sink, .prepare = module_ladspa_sink_prepare,
.load = module_ladspa_sink_load, .load = module_ladspa_sink_load,
.unload = module_ladspa_sink_unload, .unload = module_ladspa_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_ladspa_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_ladspa_sink_info),

View file

@ -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); 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 module_ladspa_source_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -249,7 +249,7 @@ out:
DEFINE_MODULE_INFO(module_ladspa_source) = { DEFINE_MODULE_INFO(module_ladspa_source) = {
.name = "module-ladspa-source", .name = "module-ladspa-source",
.create = create_module_ladspa_source, .prepare = module_ladspa_source_prepare,
.load = module_ladspa_source_load, .load = module_ladspa_source_load,
.unload = module_ladspa_source_unload, .unload = module_ladspa_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_ladspa_source_info), .properties = &SPA_DICT_INIT_ARRAY(module_ladspa_source_info),

View file

@ -143,7 +143,7 @@ static const struct spa_dict_item module_loopback_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_loopback_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -239,7 +239,7 @@ out:
DEFINE_MODULE_INFO(module_loopback) = { DEFINE_MODULE_INFO(module_loopback) = {
.name = "module-loopback", .name = "module-loopback",
.create = create_module_loopback, .prepare = module_loopback_prepare,
.load = module_loopback_load, .load = module_loopback_load,
.unload = module_loopback_unload, .unload = module_loopback_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_loopback_info), .properties = &SPA_DICT_INIT_ARRAY(module_loopback_info),

View file

@ -79,7 +79,7 @@ static const struct spa_dict_item module_native_protocol_tcp_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_native_protocol_tcp_data * const d = module->user_data;
struct pw_properties * const props = module->props; 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) = { DEFINE_MODULE_INFO(module_native_protocol_tcp) = {
.name = "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, .load = module_native_protocol_tcp_load,
.unload = module_native_protocol_tcp_unload, .unload = module_native_protocol_tcp_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_native_protocol_tcp_info), .properties = &SPA_DICT_INIT_ARRAY(module_native_protocol_tcp_info),

View file

@ -158,7 +158,7 @@ static const struct spa_dict_item module_null_sink_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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; struct pw_properties * const props = module->props;
const char *str; const char *str;
@ -220,7 +220,7 @@ int create_module_null_sink(struct module * const module)
DEFINE_MODULE_INFO(module_null_sink) = { DEFINE_MODULE_INFO(module_null_sink) = {
.name = "module-null-sink", .name = "module-null-sink",
.create = create_module_null_sink, .prepare = module_null_sink_prepare,
.load = module_null_sink_load, .load = module_null_sink_load,
.unload = module_null_sink_unload, .unload = module_null_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_null_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_null_sink_info),

View file

@ -218,7 +218,7 @@ static const struct spa_dict_item module_pipe_sink_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_pipesink_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -324,7 +324,7 @@ out:
DEFINE_MODULE_INFO(module_pipe_sink) = { DEFINE_MODULE_INFO(module_pipe_sink) = {
.name = "module-pipe-sink", .name = "module-pipe-sink",
.create = create_module_pipe_sink, .prepare = module_pipe_sink_prepare,
.load = module_pipe_sink_load, .load = module_pipe_sink_load,
.unload = module_pipe_sink_unload, .unload = module_pipe_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_pipe_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_pipe_sink_info),

View file

@ -238,7 +238,7 @@ static const struct spa_dict_item module_pipe_source_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_pipesrc_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -382,7 +382,7 @@ out:
DEFINE_MODULE_INFO(module_pipe_source) = { DEFINE_MODULE_INFO(module_pipe_source) = {
.name = "module-pipe-source", .name = "module-pipe-source",
.create = create_module_pipe_source, .prepare = module_pipe_source_prepare,
.load = module_pipe_source_load, .load = module_pipe_source_load,
.unload = module_pipe_source_unload, .unload = module_pipe_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_pipe_source_info), .properties = &SPA_DICT_INIT_ARRAY(module_pipe_source_info),

View file

@ -92,7 +92,7 @@ static const struct spa_dict_item module_raop_discover_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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); 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) = { DEFINE_MODULE_INFO(module_raop_discover) = {
.name = "module-raop-discover", .name = "module-raop-discover",
.load_once = true, .load_once = true,
.create = create_module_raop_discover, .prepare = module_raop_discover_prepare,
.load = module_raop_discover_load, .load = module_raop_discover_load,
.unload = module_raop_discover_unload, .unload = module_raop_discover_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_raop_discover_info), .properties = &SPA_DICT_INIT_ARRAY(module_raop_discover_info),

View file

@ -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); 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 module_remap_sink_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -246,7 +246,7 @@ out:
DEFINE_MODULE_INFO(module_remap_sink) = { DEFINE_MODULE_INFO(module_remap_sink) = {
.name = "module-remap-sink", .name = "module-remap-sink",
.create = create_module_remap_sink, .prepare = module_remap_sink_prepare,
.load = module_remap_sink_load, .load = module_remap_sink_load,
.unload = module_remap_sink_unload, .unload = module_remap_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_remap_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_remap_sink_info),

View file

@ -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); 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 module_remap_source_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -246,7 +246,7 @@ out:
DEFINE_MODULE_INFO(module_remap_source) = { DEFINE_MODULE_INFO(module_remap_source) = {
.name = "module-remap-source", .name = "module-remap-source",
.create = create_module_remap_source, .prepare = module_remap_source_prepare,
.load = module_remap_source_load, .load = module_remap_source_load,
.unload = module_remap_source_unload, .unload = module_remap_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_remap_source_info), .properties = &SPA_DICT_INIT_ARRAY(module_remap_source_info),

View file

@ -124,7 +124,7 @@ static const struct spa_dict_item module_roc_sink_input_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_roc_sink_input_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -194,7 +194,7 @@ out:
DEFINE_MODULE_INFO(module_roc_sink_input) = { DEFINE_MODULE_INFO(module_roc_sink_input) = {
.name = "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, .load = module_roc_sink_input_load,
.unload = module_roc_sink_input_unload, .unload = module_roc_sink_input_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_input_info), .properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_input_info),

View file

@ -123,7 +123,7 @@ static const struct spa_dict_item module_roc_sink_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_roc_sink_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -196,7 +196,7 @@ out:
DEFINE_MODULE_INFO(module_roc_sink) = { DEFINE_MODULE_INFO(module_roc_sink) = {
.name = "module-roc-sink", .name = "module-roc-sink",
.create = create_module_roc_sink, .prepare = module_roc_sink_prepare,
.load = module_roc_sink_load, .load = module_roc_sink_load,
.unload = module_roc_sink_unload, .unload = module_roc_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_info),

View file

@ -124,7 +124,7 @@ static const struct spa_dict_item module_roc_source_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_roc_source_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -199,7 +199,7 @@ out:
DEFINE_MODULE_INFO(module_roc_source) = { DEFINE_MODULE_INFO(module_roc_source) = {
.name = "module-roc-source", .name = "module-roc-source",
.create = create_module_roc_source, .prepare = module_roc_source_prepare,
.load = module_roc_source_load, .load = module_roc_source_load,
.unload = module_roc_source_unload, .unload = module_roc_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_roc_source_info), .properties = &SPA_DICT_INIT_ARRAY(module_roc_source_info),

View file

@ -130,7 +130,7 @@ static const struct spa_dict_item module_simple_protocol_tcp_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_simple_protocol_tcp_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -202,7 +202,7 @@ out:
DEFINE_MODULE_INFO(module_simple_protocol_tcp) = { DEFINE_MODULE_INFO(module_simple_protocol_tcp) = {
.name = "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, .load = module_simple_protocol_tcp_load,
.unload = module_simple_protocol_tcp_unload, .unload = module_simple_protocol_tcp_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_simple_protocol_tcp_info), .properties = &SPA_DICT_INIT_ARRAY(module_simple_protocol_tcp_info),

View file

@ -245,7 +245,7 @@ static const struct spa_dict_item module_switch_on_connect_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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 module_switch_on_connect_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -307,7 +307,7 @@ out:
DEFINE_MODULE_INFO(module_switch_on_connect) = { DEFINE_MODULE_INFO(module_switch_on_connect) = {
.name = "module-switch-on-connect", .name = "module-switch-on-connect",
.load_once = true, .load_once = true,
.create = create_module_switch_on_connect, .prepare = module_switch_on_connect_prepare,
.load = module_switch_on_connect_load, .load = module_switch_on_connect_load,
.unload = module_switch_on_connect_unload, .unload = module_switch_on_connect_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_switch_on_connect_info), .properties = &SPA_DICT_INIT_ARRAY(module_switch_on_connect_info),

View file

@ -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); 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 module_tunnel_sink_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -223,7 +223,7 @@ out:
DEFINE_MODULE_INFO(module_tunnel_sink) = { DEFINE_MODULE_INFO(module_tunnel_sink) = {
.name = "module-tunnel-sink", .name = "module-tunnel-sink",
.create = create_module_tunnel_sink, .prepare = module_tunnel_sink_prepare,
.load = module_tunnel_sink_load, .load = module_tunnel_sink_load,
.unload = module_tunnel_sink_unload, .unload = module_tunnel_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_tunnel_sink_info), .properties = &SPA_DICT_INIT_ARRAY(module_tunnel_sink_info),

View file

@ -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); 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 module_tunnel_source_data * const d = module->user_data;
struct pw_properties * const props = module->props; struct pw_properties * const props = module->props;
@ -213,7 +213,7 @@ out:
DEFINE_MODULE_INFO(module_tunnel_source) = { DEFINE_MODULE_INFO(module_tunnel_source) = {
.name = "module-tunnel-source", .name = "module-tunnel-source",
.create = create_module_tunnel_source, .prepare = module_tunnel_source_prepare,
.load = module_tunnel_source_load, .load = module_tunnel_source_load,
.unload = module_tunnel_source_unload, .unload = module_tunnel_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_tunnel_source_info), .properties = &SPA_DICT_INIT_ARRAY(module_tunnel_source_info),

View file

@ -100,6 +100,16 @@ static int module_x11_bell_unload(struct module *module)
return 0; 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[] = { static const struct spa_dict_item module_x11_bell_info[] = {
{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" }, { PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
{ PW_KEY_MODULE_DESCRIPTION, "X11 bell interceptor" }, { 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 }, { 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) = { DEFINE_MODULE_INFO(module_x11_bell) = {
.name = "module-x11-bell", .name = "module-x11-bell",
.create = create_module_x11_bell, .prepare = module_x11_bell_prepare,
.load = module_x11_bell_load, .load = module_x11_bell_load,
.unload = module_x11_bell_unload, .unload = module_x11_bell_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_x11_bell_info), .properties = &SPA_DICT_INIT_ARRAY(module_x11_bell_info),

View file

@ -92,7 +92,7 @@ static const struct spa_dict_item module_zeroconf_discover_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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); 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) = { DEFINE_MODULE_INFO(module_zeroconf_discover) = {
.name = "module-zeroconf-discover", .name = "module-zeroconf-discover",
.load_once = true, .load_once = true,
.create = create_module_zeroconf_discover, .prepare = module_zeroconf_discover_prepare,
.load = module_zeroconf_discover_load, .load = module_zeroconf_discover_load,
.unload = module_zeroconf_discover_unload, .unload = module_zeroconf_discover_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_discover_info), .properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_discover_info),

View file

@ -647,7 +647,7 @@ static const struct spa_dict_item module_zeroconf_publish_info[] = {
{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION }, { 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); 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) = { DEFINE_MODULE_INFO(module_zeroconf_publish) = {
.name = "module-zeroconf-publish", .name = "module-zeroconf-publish",
.create = create_module_zeroconf_publish, .prepare = module_zeroconf_publish_prepare,
.load = module_zeroconf_publish_load, .load = module_zeroconf_publish_load,
.unload = module_zeroconf_publish_unload, .unload = module_zeroconf_publish_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_publish_info), .properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_publish_info),