From a6035dc4c0375019370e4b88876143ca956aa847 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 13 Feb 2022 09:55:36 +0100 Subject: [PATCH] pulse-server: convert node id to index in sample reply See #2129 --- src/modules/module-protocol-pulse/pulse-server.c | 3 ++- src/modules/module-protocol-pulse/sample-play.c | 4 ++-- src/modules/module-protocol-pulse/sample-play.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c index 1801474a2..4c8ed8b1b 100644 --- a/src/modules/module-protocol-pulse/pulse-server.c +++ b/src/modules/module-protocol-pulse/pulse-server.c @@ -2324,11 +2324,12 @@ static struct pw_manager_object *find_device(struct client *client, return o; } -static void sample_play_ready(void *data, uint32_t index) +static void sample_play_ready(void *data, uint32_t id) { struct pending_sample *ps = data; struct client *client = ps->client; struct message *reply; + uint32_t index = id_to_index(client->manager, id); pw_log_info("[%s] PLAY_SAMPLE tag:%u index:%u", client->name, ps->tag, index); diff --git a/src/modules/module-protocol-pulse/sample-play.c b/src/modules/module-protocol-pulse/sample-play.c index b0554912c..d18131943 100644 --- a/src/modules/module-protocol-pulse/sample-play.c +++ b/src/modules/module-protocol-pulse/sample-play.c @@ -53,8 +53,8 @@ static void sample_play_stream_state_changed(void *data, enum pw_stream_state ol sample_play_emit_done(p, -EIO); break; case PW_STREAM_STATE_PAUSED: - p->index = pw_stream_get_node_id(p->stream); - sample_play_emit_ready(p, p->index); + p->id = pw_stream_get_node_id(p->stream); + sample_play_emit_ready(p, p->id); break; default: break; diff --git a/src/modules/module-protocol-pulse/sample-play.h b/src/modules/module-protocol-pulse/sample-play.h index 9d0f10f57..7b7f24463 100644 --- a/src/modules/module-protocol-pulse/sample-play.h +++ b/src/modules/module-protocol-pulse/sample-play.h @@ -56,7 +56,7 @@ struct sample_play { struct sample *sample; struct pw_stream *stream; struct spa_io_rate_match *rate_match; - uint32_t index; + uint32_t id; struct spa_hook listener; struct pw_context *context; struct pw_loop *main_loop;