diff --git a/pipewire-pulseaudio b/pipewire-pulseaudio index 491a7679f..0de0de299 160000 --- a/pipewire-pulseaudio +++ b/pipewire-pulseaudio @@ -1 +1 @@ -Subproject commit 491a7679f884f30a845e05b279abbd9ef66ae328 +Subproject commit 0de0de299a53fe8ab561d3eefffbe6bc66645777 diff --git a/src/examples/media-session.c b/src/examples/media-session.c index c2a200722..23c010fb4 100644 --- a/src/examples/media-session.c +++ b/src/examples/media-session.c @@ -336,7 +336,7 @@ static int on_node_running(struct impl *impl, struct node *node) return 0; } -static void node_event_info(void *object, struct pw_node_info *info) +static void node_event_info(void *object, const struct pw_node_info *info) { struct node *n = object; struct impl *impl = n->obj.impl; @@ -568,7 +568,7 @@ handle_node(struct impl *impl, uint32_t id, uint32_t parent_id, return 1; } -static void port_event_info(void *object, struct pw_port_info *info) +static void port_event_info(void *object, const struct pw_port_info *info) { struct port *p = object; pw_log_debug(NAME" %p: info for port %d", p->obj.impl, p->obj.id); @@ -686,7 +686,7 @@ handle_port(struct impl *impl, uint32_t id, uint32_t parent_id, uint32_t type, return 0; } -static void client_event_info(void *object, struct pw_client_info *info) +static void client_event_info(void *object, const struct pw_client_info *info) { struct client *c = object; uint32_t i; @@ -1177,7 +1177,7 @@ do_link: return 1; } -static void dsp_node_event_info(void *object, struct pw_node_info *info) +static void dsp_node_event_info(void *object, const struct pw_node_info *info) { struct session *s = object; struct node *dsp; diff --git a/src/gst/gstpipewiredeviceprovider.c b/src/gst/gstpipewiredeviceprovider.c index 9ba63cb58..e2e51f152 100644 --- a/src/gst/gstpipewiredeviceprovider.c +++ b/src/gst/gstpipewiredeviceprovider.c @@ -362,7 +362,7 @@ on_state_changed (void *data, enum pw_remote_state old, enum pw_remote_state sta pw_thread_loop_signal (self->main_loop, FALSE); } -static void port_event_info(void *data, struct pw_port_info *info) +static void port_event_info(void *data, const struct pw_port_info *info) { struct port_data *port_data = data; pw_log_debug("%p", port_data); @@ -389,7 +389,7 @@ static const struct pw_port_proxy_events port_events = { .param = port_event_param }; -static void node_event_info(void *data, struct pw_node_info *info) +static void node_event_info(void *data, const struct pw_node_info *info) { struct node_data *node_data = data; pw_log_debug("%p", node_data); diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c index a640f5744..104407b2b 100644 --- a/src/modules/module-protocol-native/protocol-native.c +++ b/src/modules/module-protocol-native/protocol-native.c @@ -244,7 +244,7 @@ static int core_demarshal_remove_id(void *object, void *data, size_t size) return 0; } -static void core_marshal_info(void *object, struct pw_core_info *info) +static void core_marshal_info(void *object, const struct pw_core_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; @@ -534,7 +534,7 @@ static int registry_demarshal_destroy(void *object, void *data, size_t size) return 0; } -static void module_marshal_info(void *object, struct pw_module_info *info) +static void module_marshal_info(void *object, const struct pw_module_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; @@ -593,7 +593,7 @@ static int module_demarshal_info(void *object, void *data, size_t size) return 0; } -static void device_marshal_info(void *object, struct pw_device_info *info) +static void device_marshal_info(void *object, const struct pw_device_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; @@ -749,7 +749,7 @@ static int device_demarshal_set_param(void *object, void *data, size_t size) return 0; } -static void factory_marshal_info(void *object, struct pw_factory_info *info) +static void factory_marshal_info(void *object, const struct pw_factory_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; @@ -809,7 +809,7 @@ static int factory_demarshal_info(void *object, void *data, size_t size) return 0; } -static void node_marshal_info(void *object, struct pw_node_info *info) +static void node_marshal_info(void *object, const struct pw_node_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; @@ -1003,7 +1003,7 @@ static int node_demarshal_send_command(void *object, void *data, size_t size) return 0; } -static void port_marshal_info(void *object, struct pw_port_info *info) +static void port_marshal_info(void *object, const struct pw_port_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; @@ -1127,7 +1127,7 @@ static int port_demarshal_enum_params(void *object, void *data, size_t size) return 0; } -static void client_marshal_info(void *object, struct pw_client_info *info) +static void client_marshal_info(void *object, const struct pw_client_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; @@ -1334,7 +1334,7 @@ static int client_demarshal_update_permissions(void *object, void *data, size_t return 0; } -static void link_marshal_info(void *object, struct pw_link_info *info) +static void link_marshal_info(void *object, const struct pw_link_info *info) { struct pw_resource *resource = object; struct spa_pod_builder *b; diff --git a/src/pipewire/interfaces.h b/src/pipewire/interfaces.h index c48fb101f..c4d790dde 100644 --- a/src/pipewire/interfaces.h +++ b/src/pipewire/interfaces.h @@ -265,7 +265,7 @@ struct pw_core_proxy_events { * * \param info new core info */ - void (*info) (void *object, struct pw_core_info *info); + void (*info) (void *object, const struct pw_core_info *info); }; static inline void @@ -439,7 +439,7 @@ struct pw_module_proxy_events { * * \param info info about the module */ - void (*info) (void *object, struct pw_module_info *info); + void (*info) (void *object, const struct pw_module_info *info); }; static inline void @@ -517,7 +517,7 @@ struct pw_device_proxy_events { * * \param info info about the device */ - void (*info) (void *object, struct pw_device_info *info); + void (*info) (void *object, const struct pw_device_info *info); /** * Notify a device param * @@ -625,7 +625,7 @@ struct pw_node_proxy_events { * * \param info info about the node */ - void (*info) (void *object, struct pw_node_info *info); + void (*info) (void *object, const struct pw_node_info *info); /** * Notify a node param * @@ -700,7 +700,7 @@ struct pw_port_proxy_events { * * \param info info about the port */ - void (*info) (void *object, struct pw_port_info *info); + void (*info) (void *object, const struct pw_port_info *info); /** * Notify a port param * @@ -750,7 +750,7 @@ struct pw_factory_proxy_events { * * \param info info about the factory */ - void (*info) (void *object, struct pw_factory_info *info); + void (*info) (void *object, const struct pw_factory_info *info); }; /** Factory */ @@ -839,7 +839,7 @@ struct pw_client_proxy_events { * * \param info info about the client */ - void (*info) (void *object, struct pw_client_info *info); + void (*info) (void *object, const struct pw_client_info *info); /** * Notify a client permission * @@ -891,7 +891,7 @@ struct pw_link_proxy_events { * * \param info info about the link */ - void (*info) (void *object, struct pw_link_info *info); + void (*info) (void *object, const struct pw_link_info *info); }; /** Link */ diff --git a/src/pipewire/remote.c b/src/pipewire/remote.c index fc4e28749..dba17651c 100644 --- a/src/pipewire/remote.c +++ b/src/pipewire/remote.c @@ -170,7 +170,7 @@ pw_remote_update_state(struct pw_remote *remote, enum pw_remote_state state, con return 0; } -static void core_event_info(void *data, struct pw_core_info *info) +static void core_event_info(void *data, const struct pw_core_info *info) { struct pw_remote *this = data; diff --git a/src/tools/pipewire-cli.c b/src/tools/pipewire-cli.c index 6704ee44f..03deb64ee 100644 --- a/src/tools/pipewire-cli.c +++ b/src/tools/pipewire-cli.c @@ -614,7 +614,7 @@ static void info_device(struct proxy_data *pd) info->change_mask = 0; } -static void core_event_info(void *object, struct pw_core_info *info) +static void core_event_info(void *object, const struct pw_core_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; @@ -635,7 +635,7 @@ static const struct pw_core_proxy_events core_events = { }; -static void module_event_info(void *object, struct pw_module_info *info) +static void module_event_info(void *object, const struct pw_module_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; @@ -655,7 +655,7 @@ static const struct pw_module_proxy_events module_events = { .info = module_event_info }; -static void node_event_info(void *object, struct pw_node_info *info) +static void node_event_info(void *object, const struct pw_node_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; @@ -692,7 +692,7 @@ static const struct pw_node_proxy_events node_events = { }; -static void port_event_info(void *object, struct pw_port_info *info) +static void port_event_info(void *object, const struct pw_port_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; @@ -728,7 +728,7 @@ static const struct pw_port_proxy_events port_events = { .param = port_event_param }; -static void factory_event_info(void *object, struct pw_factory_info *info) +static void factory_event_info(void *object, const struct pw_factory_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; @@ -748,7 +748,7 @@ static const struct pw_factory_proxy_events factory_events = { .info = factory_event_info }; -static void client_event_info(void *object, struct pw_client_info *info) +static void client_event_info(void *object, const struct pw_client_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; @@ -768,7 +768,7 @@ static const struct pw_client_proxy_events client_events = { .info = client_event_info }; -static void link_event_info(void *object, struct pw_link_info *info) +static void link_event_info(void *object, const struct pw_link_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; @@ -789,7 +789,7 @@ static const struct pw_link_proxy_events link_events = { }; -static void device_event_info(void *object, struct pw_device_info *info) +static void device_event_info(void *object, const struct pw_device_info *info) { struct proxy_data *pd = object; struct remote_data *rd = pd->rd; diff --git a/src/tools/pipewire-monitor.c b/src/tools/pipewire-monitor.c index 2ed211872..8e145e0ab 100644 --- a/src/tools/pipewire-monitor.c +++ b/src/tools/pipewire-monitor.c @@ -158,7 +158,7 @@ static void on_info_changed(void *data, const struct pw_core_info *info) } } -static void module_event_info(void *object, struct pw_module_info *info) +static void module_event_info(void *object, const struct pw_module_info *info) { struct proxy_data *data = object; bool print_all, print_mark; @@ -244,7 +244,7 @@ static void print_node(struct proxy_data *data) } } -static void node_event_info(void *object, struct pw_node_info *info) +static void node_event_info(void *object, const struct pw_node_info *info) { struct proxy_data *data = object; bool is_new = data->info == NULL; @@ -310,7 +310,7 @@ static void print_port(struct proxy_data *data) } } -static void port_event_info(void *object, struct pw_port_info *info) +static void port_event_info(void *object, const struct pw_port_info *info) { struct proxy_data *data = object; @@ -340,7 +340,7 @@ static const struct pw_port_proxy_events port_events = { .param = port_event_param }; -static void factory_event_info(void *object, struct pw_factory_info *info) +static void factory_event_info(void *object, const struct pw_factory_info *info) { struct proxy_data *data = object; bool print_all, print_mark; @@ -376,7 +376,7 @@ static const struct pw_factory_proxy_events factory_events = { .info = factory_event_info }; -static void client_event_info(void *object, struct pw_client_info *info) +static void client_event_info(void *object, const struct pw_client_info *info) { struct proxy_data *data = object; bool print_all, print_mark; @@ -410,7 +410,7 @@ static const struct pw_client_proxy_events client_events = { .info = client_event_info }; -static void link_event_info(void *object, struct pw_link_info *info) +static void link_event_info(void *object, const struct pw_link_info *info) { struct proxy_data *data = object; bool print_all, print_mark; @@ -460,7 +460,7 @@ static const struct pw_link_proxy_events link_events = { -static void device_event_info(void *object, struct pw_device_info *info) +static void device_event_info(void *object, const struct pw_device_info *info) { struct proxy_data *data = object; bool print_all, print_mark;