From dd7c47bb3d0168a02119990af4c160b8872dded7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Sun, 7 May 2023 16:03:29 +0200 Subject: [PATCH] pulse-server: pending-sample: rename `ready` to `replied` Rename `pending_sample::ready` to `pending_sample::replied` because it is set when a reply is sent, not when the ready signal comes. --- src/modules/module-protocol-pulse/pending-sample.c | 5 ++--- src/modules/module-protocol-pulse/pending-sample.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/module-protocol-pulse/pending-sample.c b/src/modules/module-protocol-pulse/pending-sample.c index 33f9be100..c98af3d48 100644 --- a/src/modules/module-protocol-pulse/pending-sample.c +++ b/src/modules/module-protocol-pulse/pending-sample.c @@ -33,8 +33,6 @@ static void sample_play_ready_reply(void *data, struct client *client, uint32_t pw_log_info("[%s] PLAY_SAMPLE tag:%u index:%u", client->name, ps->tag, index); - ps->ready = true; - reply = reply_new(client, ps->tag); if (client->version >= 13) message_put(reply, @@ -42,6 +40,7 @@ static void sample_play_ready_reply(void *data, struct client *client, uint32_t TAG_INVALID); client_queue_message(client, reply); + ps->replied = true; if (ps->done) sample_play_finish(ps); @@ -58,7 +57,7 @@ static void on_sample_done(void *obj, void *data, int res, uint32_t id) { struct pending_sample *ps = obj; ps->done = true; - if (ps->ready) + if (ps->replied) sample_play_finish(ps); } diff --git a/src/modules/module-protocol-pulse/pending-sample.h b/src/modules/module-protocol-pulse/pending-sample.h index 94c284431..121f20fba 100644 --- a/src/modules/module-protocol-pulse/pending-sample.h +++ b/src/modules/module-protocol-pulse/pending-sample.h @@ -21,7 +21,7 @@ struct pending_sample { struct sample_play *play; struct spa_hook listener; uint32_t tag; - unsigned ready:1; + unsigned replied:1; unsigned done:1; };