From 5299677f8826d05cc700711154aff12d848afbd0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 28 May 2019 13:51:12 +0200 Subject: [PATCH] add const to spa_event and spa_command --- spa/include/spa/monitor/device.h | 2 +- spa/include/spa/monitor/monitor.h | 2 +- spa/include/spa/node/node.h | 2 +- spa/tools/spa-monitor.c | 2 +- src/extensions/client-node.h | 2 +- src/modules/module-client-node/client-node.c | 2 +- src/modules/module-client-node/protocol-native.c | 4 ++-- src/modules/module-protocol-native/protocol-native.c | 2 +- src/modules/spa/spa-monitor.c | 2 +- src/pipewire/node.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spa/include/spa/monitor/device.h b/spa/include/spa/monitor/device.h index 615acf788..c7cad2887 100644 --- a/spa/include/spa/monitor/device.h +++ b/spa/include/spa/monitor/device.h @@ -100,7 +100,7 @@ struct spa_device_events { void (*result) (void *data, int seq, int res, const void *result); /** a device event */ - void (*event) (void *data, struct spa_event *event); + void (*event) (void *data, const struct spa_event *event); /** info changed for an object managed by the device, info is NULL when * the object is removed */ diff --git a/spa/include/spa/monitor/monitor.h b/spa/include/spa/monitor/monitor.h index 4d80827bb..fe696085c 100644 --- a/spa/include/spa/monitor/monitor.h +++ b/spa/include/spa/monitor/monitor.h @@ -84,7 +84,7 @@ struct spa_monitor_callbacks { int (*info) (void *data, const struct spa_dict *info); /** an item is added/removed/changed on the monitor */ - int (*event) (void *data, struct spa_event *event); + int (*event) (void *data, const struct spa_event *event); }; /** diff --git a/spa/include/spa/node/node.h b/spa/include/spa/node/node.h index 45533d474..5f94ab363 100644 --- a/spa/include/spa/node/node.h +++ b/spa/include/spa/node/node.h @@ -168,7 +168,7 @@ struct spa_node_events { * This will be called when an out-of-bound event is notified * on \a node. */ - void (*event) (void *data, struct spa_event *event); + void (*event) (void *data, const struct spa_event *event); }; /** Node callbacks diff --git a/spa/tools/spa-monitor.c b/spa/tools/spa-monitor.c index 07444ecf9..10edd8d78 100644 --- a/spa/tools/spa-monitor.c +++ b/spa/tools/spa-monitor.c @@ -67,7 +67,7 @@ static int on_monitor_info(void *_data, const struct spa_dict *info) return 0; } -static int on_monitor_event(void *_data, struct spa_event *event) +static int on_monitor_event(void *_data, const struct spa_event *event) { struct data *data = _data; diff --git a/src/extensions/client-node.h b/src/extensions/client-node.h index b8f2c3c6f..c727c2047 100644 --- a/src/extensions/client-node.h +++ b/src/extensions/client-node.h @@ -284,7 +284,7 @@ struct pw_client_node_proxy_methods { * Send an event to the node * \param event the event to send */ - int (*event) (void *object, struct spa_event *event); + int (*event) (void *object, const struct spa_event *event); }; diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c index c8db04b57..bc2f59a03 100644 --- a/src/modules/module-client-node/client-node.c +++ b/src/modules/module-client-node/client-node.c @@ -1089,7 +1089,7 @@ static int client_node_set_active(void *data, bool active) return pw_node_set_active(impl->this.node, active); } -static int client_node_event(void *data, struct spa_event *event) +static int client_node_event(void *data, const struct spa_event *event) { struct impl *impl = data; struct node *this = &impl->node; diff --git a/src/modules/module-client-node/protocol-native.c b/src/modules/module-client-node/protocol-native.c index 8e55b1188..0dac7c214 100644 --- a/src/modules/module-client-node/protocol-native.c +++ b/src/modules/module-client-node/protocol-native.c @@ -223,7 +223,7 @@ static int client_node_marshal_set_active(void *object, bool active) return pw_protocol_native_end_proxy(proxy, b); } -static int client_node_marshal_event_method(void *object, struct spa_event *event) +static int client_node_marshal_event_method(void *object, const struct spa_event *event) { struct pw_proxy *proxy = object; struct spa_pod_builder *b; @@ -1007,7 +1007,7 @@ static int client_node_demarshal_event_method(void *object, const struct pw_prot { struct pw_resource *resource = object; struct spa_pod_parser prs; - struct spa_event *event; + const struct spa_event *event; spa_pod_parser_init(&prs, msg->data, msg->size); if (spa_pod_parser_get_struct(&prs, diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c index da618d9dc..58c47b7c6 100644 --- a/src/modules/module-protocol-native/protocol-native.c +++ b/src/modules/module-protocol-native/protocol-native.c @@ -1186,7 +1186,7 @@ static int node_demarshal_send_command(void *object, const struct pw_protocol_na { struct pw_resource *resource = object; struct spa_pod_parser prs; - struct spa_command *command; + const struct spa_command *command; spa_pod_parser_init(&prs, msg->data, msg->size); if (spa_pod_parser_get_struct(&prs, diff --git a/src/modules/spa/spa-monitor.c b/src/modules/spa/spa-monitor.c index 3a9cfa6e6..a4d79dc4a 100644 --- a/src/modules/spa/spa-monitor.c +++ b/src/modules/spa/spa-monitor.c @@ -264,7 +264,7 @@ static void change_item(struct pw_spa_monitor *this, struct spa_pod *item, uint6 } } -static int on_monitor_event(void *data, struct spa_event *event) +static int on_monitor_event(void *data, const struct spa_event *event) { struct impl *impl = data; struct pw_spa_monitor *this = &impl->this; diff --git a/src/pipewire/node.c b/src/pipewire/node.c index 4abeead3a..a7b25f1e6 100644 --- a/src/pipewire/node.c +++ b/src/pipewire/node.c @@ -997,7 +997,7 @@ static void node_result(void *data, int seq, int res, const void *result) pw_node_emit_result(node, seq, res, result); } -static void node_event(void *data, struct spa_event *event) +static void node_event(void *data, const struct spa_event *event) { struct pw_node *node = data; struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);