diff --git a/src/modules/module-protocol-pulse/module.h b/src/modules/module-protocol-pulse/module.h index f75d8786c..5bf8febf3 100644 --- a/src/modules/module-protocol-pulse/module.h +++ b/src/modules/module-protocol-pulse/module.h @@ -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) \ 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 aade8ea81..743fe3aee 100644 --- a/src/modules/module-protocol-pulse/modules/module-always-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-always-sink.c @@ -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), }; 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 588d2c7ec..796fbc37f 100644 --- a/src/modules/module-protocol-pulse/modules/module-combine-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-combine-sink.c @@ -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), }; 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 fb4900fe0..e674a2224 100644 --- a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c +++ b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c @@ -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), }; 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 b4eeee428..6d22f03cc 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-sink.c @@ -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), }; 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 296b3bd9c..b2793420b 100644 --- a/src/modules/module-protocol-pulse/modules/module-ladspa-source.c +++ b/src/modules/module-protocol-pulse/modules/module-ladspa-source.c @@ -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), }; diff --git a/src/modules/module-protocol-pulse/modules/module-loopback.c b/src/modules/module-protocol-pulse/modules/module-loopback.c index 3c9b606c0..6364f5f3d 100644 --- a/src/modules/module-protocol-pulse/modules/module-loopback.c +++ b/src/modules/module-protocol-pulse/modules/module-loopback.c @@ -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), }; 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 e9c42cdc3..07a53e691 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 @@ -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), }; 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 058d38681..69d4f94f1 100644 --- a/src/modules/module-protocol-pulse/modules/module-null-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-null-sink.c @@ -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), }; 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 1c98c9841..b800ae7c6 100644 --- a/src/modules/module-protocol-pulse/modules/module-pipe-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-pipe-sink.c @@ -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), }; 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 60ca29b7c..d300b520b 100644 --- a/src/modules/module-protocol-pulse/modules/module-pipe-source.c +++ b/src/modules/module-protocol-pulse/modules/module-pipe-source.c @@ -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), }; 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 f20844385..115baeb8b 100644 --- a/src/modules/module-protocol-pulse/modules/module-raop-discover.c +++ b/src/modules/module-protocol-pulse/modules/module-raop-discover.c @@ -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), }; 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 970237395..8c1fc4675 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-sink.c @@ -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), }; 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 db57bcbd8..847e20632 100644 --- a/src/modules/module-protocol-pulse/modules/module-remap-source.c +++ b/src/modules/module-protocol-pulse/modules/module-remap-source.c @@ -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), }; 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 e3ec7b69d..01ab60153 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 @@ -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), }; 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 5c829b209..ce867d166 100644 --- a/src/modules/module-protocol-pulse/modules/module-roc-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-roc-sink.c @@ -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), }; 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 8d33313c0..e373e570d 100644 --- a/src/modules/module-protocol-pulse/modules/module-roc-source.c +++ b/src/modules/module-protocol-pulse/modules/module-roc-source.c @@ -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), }; 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 5f8ef8273..d053c7a01 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 @@ -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), }; 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 1970bd5b7..2cd40a59f 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 @@ -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), }; 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 064c09812..a01535d73 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-sink.c @@ -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), }; 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 04df23fac..56e471eb4 100644 --- a/src/modules/module-protocol-pulse/modules/module-tunnel-source.c +++ b/src/modules/module-protocol-pulse/modules/module-tunnel-source.c @@ -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), }; 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 efbafc2ec..66465ffc3 100644 --- a/src/modules/module-protocol-pulse/modules/module-x11-bell.c +++ b/src/modules/module-protocol-pulse/modules/module-x11-bell.c @@ -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), }; 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 12043dc82..0cacb9b5e 100644 --- a/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c +++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-discover.c @@ -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), }; 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 be61c6fd1..77aadbab1 100644 --- a/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c +++ b/src/modules/module-protocol-pulse/modules/module-zeroconf-publish.c @@ -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), }; diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c index cb9908e94..3dcf95c62 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -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;