pulse-server: serve module properties from static list

None of the modules really need a dynamic property list,
so serve the properties from a static list.
This commit is contained in:
Barnabás Pőcze 2022-06-01 17:42:12 +02:00
parent 774ade1467
commit c9f632da9f
25 changed files with 26 additions and 1 deletions

View file

@ -43,6 +43,8 @@ struct module_info {
struct module *(*create) (struct impl *impl, const char *args);
int (*load) (struct client *client, struct module *module);
int (*unload) (struct module *module);
const struct spa_dict *properties;
};
#define DEFINE_MODULE_INFO(name) \

View file

@ -137,4 +137,5 @@ DEFINE_MODULE_INFO(module_always_sink) = {
.create = create_module_always_sink,
.load = module_always_sink_load,
.unload = module_always_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_always_sink_info),
};

View file

@ -579,4 +579,5 @@ DEFINE_MODULE_INFO(module_combine_sink) = {
.create = create_module_combine_sink,
.load = module_combine_sink_load,
.unload = module_combine_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_combine_sink_info),
};

View file

@ -263,4 +263,5 @@ DEFINE_MODULE_INFO(module_echo_cancel) = {
.create = create_module_echo_cancel,
.load = module_echo_cancel_load,
.unload = module_echo_cancel_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_echo_cancel_info),
};

View file

@ -264,4 +264,5 @@ DEFINE_MODULE_INFO(module_ladspa_sink) = {
.create = create_module_ladspa_sink,
.load = module_ladspa_sink_load,
.unload = module_ladspa_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_ladspa_sink_info),
};

View file

@ -264,4 +264,5 @@ DEFINE_MODULE_INFO(module_ladspa_source) = {
.create = create_module_ladspa_source,
.load = module_ladspa_source_load,
.unload = module_ladspa_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_ladspa_source_info),
};

View file

@ -255,4 +255,5 @@ DEFINE_MODULE_INFO(module_loopback) = {
.create = create_module_loopback,
.load = module_loopback_load,
.unload = module_loopback_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_loopback_info),
};

View file

@ -146,4 +146,5 @@ DEFINE_MODULE_INFO(module_native_protocol_tcp) = {
.create = create_module_native_protocol_tcp,
.load = module_native_protocol_tcp_load,
.unload = module_native_protocol_tcp_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_native_protocol_tcp_info),
};

View file

@ -246,4 +246,5 @@ DEFINE_MODULE_INFO(module_null_sink) = {
.create = create_module_null_sink,
.load = module_null_sink_load,
.unload = module_null_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_null_sink_info),
};

View file

@ -340,4 +340,5 @@ DEFINE_MODULE_INFO(module_pipe_sink) = {
.create = create_module_pipe_sink,
.load = module_pipe_sink_load,
.unload = module_pipe_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_pipe_sink_info),
};

View file

@ -398,4 +398,5 @@ DEFINE_MODULE_INFO(module_pipe_source) = {
.create = create_module_pipe_source,
.load = module_pipe_source_load,
.unload = module_pipe_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_pipe_source_info),
};

View file

@ -132,4 +132,5 @@ DEFINE_MODULE_INFO(module_raop_discover) = {
.create = create_module_raop_discover,
.load = module_raop_discover_load,
.unload = module_raop_discover_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_raop_discover_info),
};

View file

@ -261,4 +261,5 @@ DEFINE_MODULE_INFO(module_remap_sink) = {
.create = create_module_remap_sink,
.load = module_remap_sink_load,
.unload = module_remap_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_remap_sink_info),
};

View file

@ -261,4 +261,5 @@ DEFINE_MODULE_INFO(module_remap_source) = {
.create = create_module_remap_source,
.load = module_remap_source_load,
.unload = module_remap_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_remap_source_info),
};

View file

@ -210,4 +210,5 @@ DEFINE_MODULE_INFO(module_roc_sink_input) = {
.create = create_module_roc_sink_input,
.load = module_roc_sink_input_load,
.unload = module_roc_sink_input_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_input_info),
};

View file

@ -211,4 +211,5 @@ DEFINE_MODULE_INFO(module_roc_sink) = {
.create = create_module_roc_sink,
.load = module_roc_sink_load,
.unload = module_roc_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_roc_sink_info),
};

View file

@ -215,4 +215,5 @@ DEFINE_MODULE_INFO(module_roc_source) = {
.create = create_module_roc_source,
.load = module_roc_source_load,
.unload = module_roc_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_roc_source_info),
};

View file

@ -222,4 +222,5 @@ DEFINE_MODULE_INFO(module_simple_protocol_tcp) = {
.create = create_module_simple_protocol_tcp,
.load = module_simple_protocol_tcp_load,
.unload = module_simple_protocol_tcp_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_simple_protocol_tcp_info),
};

View file

@ -329,4 +329,5 @@ DEFINE_MODULE_INFO(module_switch_on_connect) = {
.create = create_module_switch_on_connect,
.load = module_switch_on_connect_load,
.unload = module_switch_on_connect_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_switch_on_connect_info),
};

View file

@ -238,4 +238,5 @@ DEFINE_MODULE_INFO(module_tunnel_sink) = {
.create = create_module_tunnel_sink,
.load = module_tunnel_sink_load,
.unload = module_tunnel_sink_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_tunnel_sink_info),
};

View file

@ -228,4 +228,5 @@ DEFINE_MODULE_INFO(module_tunnel_source) = {
.create = create_module_tunnel_source,
.load = module_tunnel_source_load,
.unload = module_tunnel_source_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_tunnel_source_info),
};

View file

@ -149,4 +149,5 @@ DEFINE_MODULE_INFO(module_x11_bell) = {
.create = create_module_x11_bell,
.load = module_x11_bell_load,
.unload = module_x11_bell_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_x11_bell_info),
};

View file

@ -132,4 +132,5 @@ DEFINE_MODULE_INFO(module_zeroconf_discover) = {
.create = create_module_zeroconf_discover,
.load = module_zeroconf_discover_load,
.unload = module_zeroconf_discover_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_discover_info),
};

View file

@ -689,4 +689,5 @@ DEFINE_MODULE_INFO(module_zeroconf_publish) = {
.create = create_module_zeroconf_publish,
.load = module_zeroconf_publish_load,
.unload = module_zeroconf_publish_unload,
.properties = &SPA_DICT_INIT_ARRAY(module_zeroconf_publish_info),
};

View file

@ -3464,7 +3464,7 @@ static int fill_ext_module_info(struct client *client, struct message *m,
}
if (client->version >= 15) {
message_put(m,
TAG_PROPLIST, module->props,
TAG_PROPLIST, module->info->properties,
TAG_INVALID);
}
return 0;