From 99ae7738af60c370c1974cc0183ed80002853e17 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 12 Dec 2023 13:39:11 -0500 Subject: [PATCH] MT#55283 use g_auto for mix_buffer_ssrc_source Change-Id: I7dde1b36e7d9aeb4c82f1fdb5c83ec9fe3c2d3da --- lib/mix_buffer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/mix_buffer.c b/lib/mix_buffer.c index f20664780..927e9abeb 100644 --- a/lib/mix_buffer.c +++ b/lib/mix_buffer.c @@ -139,11 +139,12 @@ void mix_buffer_read_slow(struct mix_buffer *mb, void *outbuf, unsigned int samp } -static void mix_ssrc_put(mix_buffer_ssrc_source **s) { - if (*s) - obj_put(&(*s)->h); +static void mix_ssrc_put(mix_buffer_ssrc_source *s) { + obj_put(&s->h); } +G_DEFINE_AUTOPTR_CLEANUP_FUNC(mix_buffer_ssrc_source, mix_ssrc_put) + // write at the write-head, direct copy without mixing // must be locked already @@ -269,8 +270,7 @@ bool mix_buffer_write_delay(struct mix_buffer *mb, uint32_t ssrc, const void *bu LOCK(&mb->lock); bool created; - AUTO_CLEANUP(mix_buffer_ssrc_source *src, mix_ssrc_put) - = get_ssrc_full(ssrc, mb->ssrc_hash, &created); + g_autoptr(mix_buffer_ssrc_source) src = get_ssrc_full(ssrc, mb->ssrc_hash, &created); if (!src) return false; if (created)