From 83b2aca07236cd29a2f6d138cadd324571b1c8d0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 25 Feb 2019 17:16:14 +0100 Subject: [PATCH] pulse: update for seq change --- src/context.c | 4 ++-- src/internal.h | 2 +- src/introspect.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/context.c b/src/context.c index c6f285e2a..0df4a0c0e 100644 --- a/src/context.c +++ b/src/context.c @@ -346,7 +346,7 @@ static void on_ready(pa_operation *o, void *userdata) pa_context_set_state(d->context, PA_CONTEXT_READY); } -static void complete_operations(pa_context *c, uint32_t seq) +static void complete_operations(pa_context *c, int seq) { pa_operation *o, *t; spa_list_for_each_safe(o, t, &c->operations, link) { @@ -366,7 +366,7 @@ static int core_info(void *data, const struct pw_core_info *info) return 0; } -static int core_done(void *data, uint32_t id, uint32_t seq) +static int core_done(void *data, uint32_t id, int seq) { pa_context *c = data; pw_log_debug("done %d", seq); diff --git a/src/internal.h b/src/internal.h index 970969043..ea8413c20 100644 --- a/src/internal.h +++ b/src/internal.h @@ -389,7 +389,7 @@ struct pa_operation pa_context *context; pa_stream *stream; - uint32_t seq; + int seq; pa_operation_state_t state; pa_operation_cb_t callback; diff --git a/src/introspect.c b/src/introspect.c index 742e27978..3a762033a 100644 --- a/src/introspect.c +++ b/src/introspect.c @@ -35,7 +35,7 @@ static int node_event_info(void *object, const struct pw_node_info *info) return 0; } -static int node_event_param(void *object, uint32_t seq, +static int node_event_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param) { @@ -110,7 +110,7 @@ static const struct pw_client_proxy_events client_events = { .info = client_event_info, }; -static int device_event_param(void *object, uint32_t seq, +static int device_event_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param) { @@ -267,13 +267,13 @@ static int ensure_global(pa_context *c, struct global *g) switch (g->type) { case PW_TYPE_INTERFACE_Node: pw_node_proxy_enum_params((struct pw_node_proxy*)g->proxy, - SPA_PARAM_EnumFormat, 0, -1, NULL); + 0, SPA_PARAM_EnumFormat, 0, -1, NULL); break; case PW_TYPE_INTERFACE_Device: pw_device_proxy_enum_params((struct pw_device_proxy*)g->proxy, - SPA_PARAM_EnumProfile, 0, -1, NULL); + 0, SPA_PARAM_EnumProfile, 0, -1, NULL); pw_device_proxy_enum_params((struct pw_device_proxy*)g->proxy, - SPA_PARAM_Profile, 0, -1, NULL); + 0, SPA_PARAM_Profile, 0, -1, NULL); break; default: break;