diff --git a/src/context.c b/src/context.c index 0df4a0c0e..066f6da62 100644 --- a/src/context.c +++ b/src/context.c @@ -287,7 +287,7 @@ static int set_mask(pa_context *c, struct global *g) return 1; } -static int registry_event_global(void *data, uint32_t id, uint32_t parent_id, +static void registry_event_global(void *data, uint32_t id, uint32_t parent_id, uint32_t permissions, uint32_t type, uint32_t version, const struct spa_dict *props) { @@ -304,28 +304,26 @@ static int registry_event_global(void *data, uint32_t id, uint32_t parent_id, if (set_mask(c, g) == 0) { global_free(g); - return 0; + return; } pw_log_debug("mask %d/%d", g->mask, g->event); emit_event(c, g, PA_SUBSCRIPTION_EVENT_NEW); - return 0; } -static int registry_event_global_remove(void *object, uint32_t id) +static void registry_event_global_remove(void *object, uint32_t id) { pa_context *c = object; struct global *g; pw_log_debug("context %p: remove %d", c, id); if ((g = pa_context_find_global(c, id)) == NULL) - return 0; + return; emit_event(c, g, PA_SUBSCRIPTION_EVENT_REMOVE); pw_log_debug("context %p: free %d %p", c, id, g); global_free(g); - return 0; } static const struct pw_registry_proxy_events registry_events = @@ -359,19 +357,17 @@ static void complete_operations(pa_context *c, int seq) } } -static int core_info(void *data, const struct pw_core_info *info) +static void core_info(void *data, const struct pw_core_info *info) { pa_context *c = data; c->core_info = pw_core_info_update(c->core_info, info); - return 0; } -static int core_done(void *data, uint32_t id, int seq) +static void core_done(void *data, uint32_t id, int seq) { pa_context *c = data; pw_log_debug("done %d", seq); complete_operations(c, seq); - return 0; } static const struct pw_core_proxy_events core_events = { diff --git a/src/introspect.c b/src/introspect.c index 3a762033a..106aa2bed 100644 --- a/src/introspect.c +++ b/src/introspect.c @@ -27,21 +27,19 @@ #include "internal.h" -static int node_event_info(void *object, const struct pw_node_info *info) +static void node_event_info(void *object, const struct pw_node_info *info) { struct global *g = object; pw_log_debug("update %d", g->id); g->info = pw_node_info_update(g->info, info); - return 0; } -static int node_event_param(void *object, int seq, +static void node_event_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param) { struct global *g = object; pw_log_debug("update param %d", g->id); - return 0; } static const struct pw_node_proxy_events node_events = { @@ -50,7 +48,7 @@ static const struct pw_node_proxy_events node_events = { .param = node_event_param, }; -static int module_event_info(void *object, const struct pw_module_info *info) +static void module_event_info(void *object, const struct pw_module_info *info) { struct global *g = object; pa_module_info *i = &g->module_info.info; @@ -73,7 +71,6 @@ static int module_event_info(void *object, const struct pw_module_info *info) i->argument = info->args; i->n_used = -1; i->auto_unload = false; - return 0; } static const struct pw_module_proxy_events module_events = { @@ -81,7 +78,7 @@ static const struct pw_module_proxy_events module_events = { .info = module_event_info, }; -static int client_event_info(void *object, const struct pw_client_info *info) +static void client_event_info(void *object, const struct pw_client_info *info) { struct global *g = object; pa_client_info *i = &g->client_info.info; @@ -102,7 +99,6 @@ static int client_event_info(void *object, const struct pw_client_info *info) i->driver = info->props ? spa_dict_lookup(info->props, PW_CLIENT_PROP_PROTOCOL) : NULL; } - return 0; } static const struct pw_client_proxy_events client_events = { @@ -110,7 +106,7 @@ static const struct pw_client_proxy_events client_events = { .info = client_event_info, }; -static int device_event_param(void *object, int seq, +static void device_event_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param) { @@ -127,7 +123,7 @@ static int device_event_param(void *object, int seq, SPA_PARAM_PROFILE_index, SPA_POD_Int(&id), SPA_PARAM_PROFILE_name, SPA_POD_String(&name)) < 0) { pw_log_warn("device %d: can't parse profile", g->id); - return -EINVAL; + return; } pw_array_add_ptr(&g->card_info.profiles, spa_pod_copy(param)); pw_log_debug("device %d: enum profile %d: \"%s\"", g->id, id, name); @@ -140,7 +136,7 @@ static int device_event_param(void *object, int seq, SPA_TYPE_OBJECT_ParamProfile, NULL, SPA_PARAM_PROFILE_index, SPA_POD_Int(&id)) < 0) { pw_log_warn("device %d: can't parse profile", g->id); - return -EINVAL; + return; } g->card_info.active_profile = id; pw_log_debug("device %d: current profile %d", g->id, id); @@ -149,10 +145,9 @@ static int device_event_param(void *object, int seq, default: break; } - return 0; } -static int device_event_info(void *object, const struct pw_device_info *info) +static void device_event_info(void *object, const struct pw_device_info *info) { struct global *g = object; pa_card_info *i = &g->card_info.info; @@ -171,7 +166,6 @@ static int device_event_info(void *object, const struct pw_device_info *info) else i->proplist = pa_proplist_new_dict(info->props); } - return 0; } static const struct pw_device_proxy_events device_events = {