From nobody Wed Feb 11 05:11:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683391156; cv=none; d=zohomail.com; s=zohoarc; b=GpkwDwS9PScFc1zp2avy04sQcqIwnOz4uxjzDo4jOXqlXwAF7eMOKMrx8QWspFhIhvT0EU5j1MHV4ij4I0m46/539kurBhvJtKuFJ0W1tJhjaOtH7yjxPFliX/g8d2YdYcrj2+BdL1oWSNLRxOHgPaDTTTXVxCsn3bz6cVl65pg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683391156; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DSiBYtkg23qajy6CBc1hd0LBHS3qyBtHW1cfIuhjnB0=; b=cdYanacx51MxQ/OfVNr9c6m5UxI0YMvZfPas0ZdGT+Z8aXPP/UkhjhsiShj6ONW6jyE/ay71Xoul8jmlALEGi7rDe6lwZMqsqE5n2KTNIHAwsAm2yqBCacAPPBLAo4BoSg7wc5acAPtB2FUwlkRQLwMQER9UYA8gX3JUuFWZZ0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683391156401591.2611313650076; Sat, 6 May 2023 09:39:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvKvP-0000tQ-Hz; Sat, 06 May 2023 12:38:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvKvN-0000t4-7l for qemu-devel@nongnu.org; Sat, 06 May 2023 12:38:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvKvL-00041L-IB for qemu-devel@nongnu.org; Sat, 06 May 2023 12:38:20 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-tbh9k-5kNvWTolnBhgRtJg-1; Sat, 06 May 2023 12:38:14 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DEFD1185A79C; Sat, 6 May 2023 16:38:13 +0000 (UTC) Received: from localhost (unknown [10.39.208.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7133492B07; Sat, 6 May 2023 16:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683391098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DSiBYtkg23qajy6CBc1hd0LBHS3qyBtHW1cfIuhjnB0=; b=GyUwnjm6QCxUNXjJIV8iVZLk6BtVrV0ltqeCgHdBlAgbn88w4CGZ7ZQou1PZlPAcGOEdN7 0jh+zP6LST18zLDA6lE0pbsEHefaTRm8h+aj1/DEHhXpmdAXd5V2Cq7Te8IfrYNS2KTx74 vYAkL1Vw/kBmcS1PEuUY9zTxhszkCyg= X-MC-Unique: tbh9k-5kNvWTolnBhgRtJg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , dbassey@redhat.com, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eric Blake , Paolo Bonzini Subject: [PATCH 08/12] audio/pw: factorize some common code Date: Sat, 6 May 2023 20:37:31 +0400 Message-Id: <20230506163735.3481387-9-marcandre.lureau@redhat.com> In-Reply-To: <20230506163735.3481387-1-marcandre.lureau@redhat.com> References: <20230506163735.3481387-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683391157677100001 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Volker R=C3=BCmelin --- audio/pwaudio.c | 85 ++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/audio/pwaudio.c b/audio/pwaudio.c index d0bc4680a6..67df53948c 100644 --- a/audio/pwaudio.c +++ b/audio/pwaudio.c @@ -66,6 +66,9 @@ typedef struct PWVoiceIn { PWVoice v; } PWVoiceIn; =20 +#define PW_VOICE_IN(v) ((PWVoiceIn*)v) +#define PW_VOICE_OUT(v) ((PWVoiceOut*)v) + static void stream_destroy(void *data) { @@ -630,62 +633,55 @@ qpw_init_in(HWVoiceIn *hw, struct audsettings *as, vo= id *drv_opaque) } =20 static void -qpw_fini_out(HWVoiceOut *hw) +qpw_voice_fini(PWVoice *v) { - PWVoiceOut *pw =3D (PWVoiceOut *) hw; - PWVoice *v =3D &pw->v; + pwaudio *c =3D v->g; =20 - if (v->stream) { - pwaudio *c =3D v->g; - pw_thread_loop_lock(c->thread_loop); - pw_stream_destroy(v->stream); - v->stream =3D NULL; - pw_thread_loop_unlock(c->thread_loop); + if (!v->stream) { + return; } + pw_thread_loop_lock(c->thread_loop); + pw_stream_destroy(v->stream); + v->stream =3D NULL; + pw_thread_loop_unlock(c->thread_loop); } =20 static void -qpw_fini_in(HWVoiceIn *hw) +qpw_fini_out(HWVoiceOut *hw) { - PWVoiceIn *pw =3D (PWVoiceIn *) hw; - PWVoice *v =3D &pw->v; + qpw_voice_fini(&PW_VOICE_OUT(hw)->v); +} =20 - if (v->stream) { - pwaudio *c =3D v->g; - pw_thread_loop_lock(c->thread_loop); - pw_stream_destroy(v->stream); - v->stream =3D NULL; - pw_thread_loop_unlock(c->thread_loop); - } +static void +qpw_fini_in(HWVoiceIn *hw) +{ + qpw_voice_fini(&PW_VOICE_IN(hw)->v); } =20 static void -qpw_enable_out(HWVoiceOut *hw, bool enable) +qpw_voice_set_enabled(PWVoice *v, bool enable) { - PWVoiceOut *po =3D (PWVoiceOut *) hw; - PWVoice *v =3D &po->v; pwaudio *c =3D v->g; pw_thread_loop_lock(c->thread_loop); pw_stream_set_active(v->stream, enable); pw_thread_loop_unlock(c->thread_loop); } =20 +static void +qpw_enable_out(HWVoiceOut *hw, bool enable) +{ + qpw_voice_set_enabled(&PW_VOICE_OUT(hw)->v, enable); +} + static void qpw_enable_in(HWVoiceIn *hw, bool enable) { - PWVoiceIn *pi =3D (PWVoiceIn *) hw; - PWVoice *v =3D &pi->v; - pwaudio *c =3D v->g; - pw_thread_loop_lock(c->thread_loop); - pw_stream_set_active(v->stream, enable); - pw_thread_loop_unlock(c->thread_loop); + qpw_voice_set_enabled(&PW_VOICE_IN(hw)->v, enable); } =20 static void -qpw_volume_out(HWVoiceOut *hw, Volume *vol) +qpw_voice_set_volume(PWVoice *v, Volume *vol) { - PWVoiceOut *pw =3D (PWVoiceOut *) hw; - PWVoice *v =3D &pw->v; pwaudio *c =3D v->g; int i, ret; =20 @@ -707,28 +703,15 @@ qpw_volume_out(HWVoiceOut *hw, Volume *vol) } =20 static void -qpw_volume_in(HWVoiceIn *hw, Volume *vol) +qpw_volume_out(HWVoiceOut *hw, Volume *vol) { - PWVoiceIn *pw =3D (PWVoiceIn *) hw; - PWVoice *v =3D &pw->v; - pwaudio *c =3D v->g; - int i, ret; - - pw_thread_loop_lock(c->thread_loop); - v->volume.channels =3D vol->channels; - - for (i =3D 0; i < vol->channels; ++i) { - v->volume.values[i] =3D (float)vol->vol[i] / 255; - } - - ret =3D pw_stream_set_control(v->stream, - SPA_PROP_channelVolumes, v->volume.channels, v->volume.values, 0); - trace_pw_vol(ret =3D=3D 0 ? "success" : "failed"); + qpw_voice_set_volume(&PW_VOICE_OUT(hw)->v, vol); +} =20 - v->muted =3D vol->mute; - float val =3D v->muted ? 1.f : 0.f; - ret =3D pw_stream_set_control(v->stream, SPA_PROP_mute, 1, &val, 0); - pw_thread_loop_unlock(c->thread_loop); +static void +qpw_volume_in(HWVoiceIn *hw, Volume *vol) +{ + qpw_voice_set_volume(&PW_VOICE_IN(hw)->v, vol); } =20 static int wait_resync(pwaudio *pw) --=20 2.40.1