From nobody Fri Nov 7 04:14:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545601151528545.1749352033997; Sun, 23 Dec 2018 13:39:11 -0800 (PST) Received: from localhost ([127.0.0.1]:60096 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbBSo-0003Sj-1v for importer@patchew.org; Sun, 23 Dec 2018 16:39:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAk0-0007tJ-Ma for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAjy-0002Vb-2E for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:52 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45126) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAjx-0002Nt-Lw for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:49 -0500 Received: by mail-wr1-x441.google.com with SMTP id t6so10090838wrr.12 for ; Sun, 23 Dec 2018 12:52:48 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-24a3-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:24a3::5]) by smtp.gmail.com with ESMTPSA id g198sm25456920wmd.23.2018.12.23.12.52.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mpFI0pWpKGS2O5X/JOf1VN9iV30kQWaTVUXR6lMMvu8=; b=Ag30ew5mmtiEUcYpRKGSkFVGQojOJjLz6ULI9LKoWfTJhNJ9ATqseTnOUG7SZR+f/g sDf69u8icU6R7kSIihhhY/SvEHpkOAiMiLBNMWBvkxlp2qyu/f2Q9MCL1zyN9j6+F+1i KYt3SDIArzLe3RkIFhwlUcHumyJVENOEYjS8SrhztJ8Gkos1uG00NPPQV62zxmH2y4Go U3R3+S0QaQ834psvMDveFcldzn+c9WXcUXaNvNXKkRIYkR1pmyMo0+WkVwyt14naTP9O uMI4OiwcLWColtPuvcmHd1CC/2kS9K36UuixmKHO5Mw2Bnb2oh97ImoCIhUlhZoNBtLW umnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mpFI0pWpKGS2O5X/JOf1VN9iV30kQWaTVUXR6lMMvu8=; b=N5Wi+CjlEDLBq1rHzIhExxZevEIPELH2Q82FaqvgS+k6JVV5FHcDmLiyosWA4/Uayy +sA6XMx0lTwAwhXau0CmBHoao1fXx0ZAy96xCoD6IW+XpF0M/nEcG10eThakoc3/qEno tARRukPl39LLIunSYwsM3NmeMi7QjGXqkBHjtkMUC5VtVWVz+G7hVHCyTTYBESVsXsfZ DbBtafNlEz1w0mKHmOII4hnab3hHc0+hOQZsvfeLBXx4QL9YcM9/s6PSe9dxNiM7vJ/w CyekrRP1wOH2eHPTS5j/iN9n5QgrUJPDIGLfdWJ/8n3l4S0cHu3yL9FGMlpLxJqy8eGn a1xA== X-Gm-Message-State: AJcUukcpUrtyrUhIkjQsgt3Fh5VD7c3BEyBGez20NNGi2X0DNRbcOiox Ag1FoY9n9Fu8FRWdKRAE5nNK+C7xwgw= X-Google-Smtp-Source: ALg8bN4spB/i3/opPZ3dSMvXjie+NZ7R6DvMUbR2C/URBCtuukeSi6HtQNrNgJIA3xXQRx+vQ3PrIQ== X-Received: by 2002:adf:891a:: with SMTP id s26mr9542732wrs.44.1545598367141; Sun, 23 Dec 2018 12:52:47 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Sun, 23 Dec 2018 21:51:56 +0100 Message-Id: <5262d91b3c72117da7cdc3c45c8685ae8b19c211.1545598229.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v2 20/52] audio: audiodev= parameters no longer optional when -audiodev present X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This means you should probably stop using -soundhw (as it doesn't allow you to specify any options) and add the device manually with -device. The exception is pcspk, it's currently not possible to manually add it. To use it with audiodev, use something like this: -audiodev id=3Dfoo,... -global isa-pcspk.audiodev=3Dfoo -soundhw pcspk Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/audio.c | 24 ++-- audio/paaudio.c | 303 +++++++++++++++++++++++++++--------------------- 2 files changed, 189 insertions(+), 138 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 92fa170b46..a7f79f3929 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -100,6 +100,8 @@ const struct mixeng_volume nominal_volume =3D { #endif }; =20 +static bool legacy_config =3D true; + #ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED #error No its not #else @@ -1381,7 +1383,7 @@ static Audiodev *parse_option(QemuOpts *opts, Error *= *errp); * if dev =3D=3D NULL =3D> legacy implicit initialization, return the alre= ady created * state or create a new one */ -static AudioState *audio_init(Audiodev *dev) +static AudioState *audio_init(Audiodev *dev, const char *name) { static bool atexit_registered; size_t i; @@ -1395,12 +1397,13 @@ static AudioState *audio_init(Audiodev *dev) =20 if (dev) { /* -audiodev option */ + legacy_config =3D false; drvname =3D AudiodevDriver_str(dev->driver); } else if (!QTAILQ_EMPTY(&audio_states)) { - /* - * todo: check for -audiodev once we have normal audiodev selection - * support - */ + if (!legacy_config) { + dolog("You must specify an audiodev=3D for the device %s\n", n= ame); + exit(1); + } return QTAILQ_FIRST(&audio_states); } else { /* legacy implicit initialization */ @@ -1497,7 +1500,7 @@ static AudioState *audio_init(Audiodev *dev) void AUD_register_card (const char *name, QEMUSoundCard *card) { if (!card->state) { - card->state =3D audio_init(NULL); + card->state =3D audio_init(NULL, name); } =20 card->name =3D g_strdup (name); @@ -1523,8 +1526,11 @@ CaptureVoiceOut *AUD_add_capture( struct capture_callback *cb; =20 if (!s) { - /* todo: remove when we have normal audiodev selection support */ - s =3D audio_init(NULL); + if (!legacy_config) { + dolog("You must specify audiodev when trying to capture\n"); + goto err0; + } + s =3D audio_init(NULL, NULL); } =20 if (audio_validate_settings (as)) { @@ -1763,7 +1769,7 @@ static int each_option(void *opaque, QemuOpts *opts, = Error **errp) if (!dev) { return -1; } - return audio_init(dev) ? 0 : -1; + return audio_init(dev, NULL) ? 0 : -1; } =20 void audio_set_options(void) diff --git a/audio/paaudio.c b/audio/paaudio.c index 6de6ed97fc..24b75ca503 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -10,10 +10,21 @@ #include "audio_int.h" #include "audio_pt_int.h" =20 -typedef struct { - Audiodev *dev; +typedef struct PAConnection { + char *server; + int refcount; + QTAILQ_ENTRY(PAConnection) list; + pa_threaded_mainloop *mainloop; pa_context *context; +} PAConnection; + +static QTAILQ_HEAD(PAConnectionHead, PAConnection) pa_conns =3D + QTAILQ_HEAD_INITIALIZER(pa_conns); + +typedef struct { + Audiodev *dev; + PAConnection *conn; } paaudio; =20 typedef struct { @@ -44,7 +55,7 @@ typedef struct { int samples; } PAVoiceIn; =20 -static void qpa_audio_fini(void *opaque); +static void qpa_conn_fini(PAConnection *c); =20 static void GCC_FMT_ATTR (2, 3) qpa_logerr (int err, const char *fmt, ...) { @@ -107,11 +118,11 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t= x) =20 static int qpa_simple_read (PAVoiceIn *p, void *data, size_t length, int *= rerror) { - paaudio *g =3D p->g; + PAConnection *c =3D p->g->conn; =20 - pa_threaded_mainloop_lock (g->mainloop); + pa_threaded_mainloop_lock(c->mainloop); =20 - CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); =20 while (length > 0) { size_t l; @@ -120,11 +131,11 @@ static int qpa_simple_read (PAVoiceIn *p, void *data,= size_t length, int *rerror int r; =20 r =3D pa_stream_peek (p->stream, &p->read_data, &p->read_lengt= h); - CHECK_SUCCESS_GOTO (g, rerror, r =3D=3D 0, unlock_and_fail); + CHECK_SUCCESS_GOTO(c, rerror, r =3D=3D 0, unlock_and_fail); =20 if (!p->read_data) { - pa_threaded_mainloop_wait (g->mainloop); - CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + pa_threaded_mainloop_wait(c->mainloop); + CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); } else { p->read_index =3D 0; } @@ -147,53 +158,53 @@ static int qpa_simple_read (PAVoiceIn *p, void *data,= size_t length, int *rerror p->read_length =3D 0; p->read_index =3D 0; =20 - CHECK_SUCCESS_GOTO (g, rerror, r =3D=3D 0, unlock_and_fail); + CHECK_SUCCESS_GOTO(c, rerror, r =3D=3D 0, unlock_and_fail); } } =20 - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); return 0; =20 unlock_and_fail: - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); return -1; } =20 static int qpa_simple_write (PAVoiceOut *p, const void *data, size_t lengt= h, int *rerror) { - paaudio *g =3D p->g; + PAConnection *c =3D p->g->conn; =20 - pa_threaded_mainloop_lock (g->mainloop); + pa_threaded_mainloop_lock(c->mainloop); =20 - CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); =20 while (length > 0) { size_t l; int r; =20 while (!(l =3D pa_stream_writable_size (p->stream))) { - pa_threaded_mainloop_wait (g->mainloop); - CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + pa_threaded_mainloop_wait(c->mainloop); + CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); } =20 - CHECK_SUCCESS_GOTO (g, rerror, l !=3D (size_t) -1, unlock_and_fail= ); + CHECK_SUCCESS_GOTO(c, rerror, l !=3D (size_t) -1, unlock_and_fail); =20 if (l > length) { l =3D length; } =20 r =3D pa_stream_write (p->stream, data, l, NULL, 0LL, PA_SEEK_RELA= TIVE); - CHECK_SUCCESS_GOTO (g, rerror, r >=3D 0, unlock_and_fail); + CHECK_SUCCESS_GOTO(c, rerror, r >=3D 0, unlock_and_fail); =20 data =3D (const uint8_t *) data + l; length -=3D l; } =20 - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); return 0; =20 unlock_and_fail: - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); return -1; } =20 @@ -431,13 +442,13 @@ static AudioFormat pa_to_audfmt (pa_sample_format_t f= mt, int *endianness) =20 static void context_state_cb (pa_context *c, void *userdata) { - paaudio *g =3D userdata; + PAConnection *conn =3D userdata; =20 switch (pa_context_get_state(c)) { case PA_CONTEXT_READY: case PA_CONTEXT_TERMINATED: case PA_CONTEXT_FAILED: - pa_threaded_mainloop_signal (g->mainloop, 0); + pa_threaded_mainloop_signal(conn->mainloop, 0); break; =20 case PA_CONTEXT_UNCONNECTED: @@ -450,14 +461,14 @@ static void context_state_cb (pa_context *c, void *us= erdata) =20 static void stream_state_cb (pa_stream *s, void * userdata) { - paaudio *g =3D userdata; + PAConnection *c =3D userdata; =20 switch (pa_stream_get_state (s)) { =20 case PA_STREAM_READY: case PA_STREAM_FAILED: case PA_STREAM_TERMINATED: - pa_threaded_mainloop_signal (g->mainloop, 0); + pa_threaded_mainloop_signal(c->mainloop, 0); break; =20 case PA_STREAM_UNCONNECTED: @@ -468,13 +479,13 @@ static void stream_state_cb (pa_stream *s, void * use= rdata) =20 static void stream_request_cb (pa_stream *s, size_t length, void *userdata) { - paaudio *g =3D userdata; + PAConnection *c =3D userdata; =20 - pa_threaded_mainloop_signal (g->mainloop, 0); + pa_threaded_mainloop_signal(c->mainloop, 0); } =20 static pa_stream *qpa_simple_new ( - paaudio *g, + PAConnection *c, const char *name, pa_stream_direction_t dir, const char *dev, @@ -485,50 +496,48 @@ static pa_stream *qpa_simple_new ( { int r; pa_stream *stream; + pa_stream_flags_t flags; =20 - pa_threaded_mainloop_lock (g->mainloop); + pa_threaded_mainloop_lock(c->mainloop); =20 - stream =3D pa_stream_new (g->context, name, ss, map); + stream =3D pa_stream_new(c->context, name, ss, map); if (!stream) { goto fail; } =20 - pa_stream_set_state_callback (stream, stream_state_cb, g); - pa_stream_set_read_callback (stream, stream_request_cb, g); - pa_stream_set_write_callback (stream, stream_request_cb, g); + pa_stream_set_state_callback (stream, stream_state_cb, c); + pa_stream_set_read_callback (stream, stream_request_cb, c); + pa_stream_set_write_callback (stream, stream_request_cb, c); + + flags =3D + PA_STREAM_INTERPOLATE_TIMING +#ifdef PA_STREAM_ADJUST_LATENCY + |PA_STREAM_ADJUST_LATENCY +#endif + |PA_STREAM_AUTO_TIMING_UPDATE; =20 if (dir =3D=3D PA_STREAM_PLAYBACK) { - r =3D pa_stream_connect_playback (stream, dev, attr, - PA_STREAM_INTERPOLATE_TIMING -#ifdef PA_STREAM_ADJUST_LATENCY - |PA_STREAM_ADJUST_LATENCY -#endif - |PA_STREAM_AUTO_TIMING_UPDATE, NUL= L, NULL); + r =3D pa_stream_connect_playback(stream, dev, attr, flags, NULL, N= ULL); } else { - r =3D pa_stream_connect_record (stream, dev, attr, - PA_STREAM_INTERPOLATE_TIMING -#ifdef PA_STREAM_ADJUST_LATENCY - |PA_STREAM_ADJUST_LATENCY -#endif - |PA_STREAM_AUTO_TIMING_UPDATE); + r =3D pa_stream_connect_record(stream, dev, attr, flags); } =20 if (r < 0) { goto fail; } =20 - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); =20 return stream; =20 fail: - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); =20 if (stream) { pa_stream_unref (stream); } =20 - *rerror =3D pa_context_errno (g->context); + *rerror =3D pa_context_errno(c->context); =20 return NULL; } @@ -544,6 +553,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, paaudio *g =3D pa->g =3D drv_opaque; AudiodevPaOptions *popts =3D &g->dev->u.pa; AudiodevPaPerDirectionOptions *ppdo =3D popts->sink; + PAConnection *c =3D g->conn; =20 ss.format =3D audfmt_to_pa (as->fmt, as->endianness); ss.channels =3D as->nchannels; @@ -561,7 +571,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, obt_as.fmt =3D pa_to_audfmt (ss.format, &obt_as.endianness); =20 pa->stream =3D qpa_simple_new ( - g, + c, "qemu", PA_STREAM_PLAYBACK, ppdo->has_name ? ppdo->name : NULL, @@ -613,6 +623,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) paaudio *g =3D pa->g =3D drv_opaque; AudiodevPaOptions *popts =3D &g->dev->u.pa; AudiodevPaPerDirectionOptions *ppdo =3D popts->source; + PAConnection *c =3D g->conn; =20 ss.format =3D audfmt_to_pa (as->fmt, as->endianness); ss.channels =3D as->nchannels; @@ -621,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) obt_as.fmt =3D pa_to_audfmt (ss.format, &obt_as.endianness); =20 pa->stream =3D qpa_simple_new ( - g, + c, "qemu", PA_STREAM_RECORD, ppdo->has_name ? ppdo->name : NULL, @@ -709,7 +720,7 @@ static int qpa_ctl_out (HWVoiceOut *hw, int cmd, ...) PAVoiceOut *pa =3D (PAVoiceOut *) hw; pa_operation *op; pa_cvolume v; - paaudio *g =3D pa->g; + PAConnection *c =3D pa->g->conn; =20 #ifdef PA_CHECK_VERSION /* macro is present in 0.9.16+ */ pa_cvolume_init (&v); /* function is present in 0.9.13+ */ @@ -729,28 +740,28 @@ static int qpa_ctl_out (HWVoiceOut *hw, int cmd, ...) v.values[0] =3D ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.= l) / UINT32_MAX; v.values[1] =3D ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.= r) / UINT32_MAX; =20 - pa_threaded_mainloop_lock (g->mainloop); + pa_threaded_mainloop_lock(c->mainloop); =20 - op =3D pa_context_set_sink_input_volume (g->context, + op =3D pa_context_set_sink_input_volume(c->context, pa_stream_get_index (pa->stream), &v, NULL, NULL); if (!op) - qpa_logerr (pa_context_errno (g->context), + qpa_logerr (pa_context_errno(c->context), "set_sink_input_volume() failed\n"); else pa_operation_unref (op); =20 - op =3D pa_context_set_sink_input_mute (g->context, + op =3D pa_context_set_sink_input_mute(c->context, pa_stream_get_index (pa->stream), sw->vol.mute, NULL, NULL); if (!op) { - qpa_logerr (pa_context_errno (g->context), + qpa_logerr (pa_context_errno(c->context), "set_sink_input_mute() failed\n"); } else { pa_operation_unref (op); } =20 - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); } } return 0; @@ -761,7 +772,7 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...) PAVoiceIn *pa =3D (PAVoiceIn *) hw; pa_operation *op; pa_cvolume v; - paaudio *g =3D pa->g; + PAConnection *c =3D pa->g->conn; =20 #ifdef PA_CHECK_VERSION pa_cvolume_init (&v); @@ -781,122 +792,156 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...) v.values[0] =3D ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.= l) / UINT32_MAX; v.values[1] =3D ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.= r) / UINT32_MAX; =20 - pa_threaded_mainloop_lock (g->mainloop); + pa_threaded_mainloop_lock(c->mainloop); =20 - op =3D pa_context_set_source_output_volume (g->context, - pa_stream_get_index (pa->stream), + op =3D pa_context_set_source_output_volume(c->context, + pa_stream_get_index(pa->stream), &v, NULL, NULL); if (!op) { - qpa_logerr (pa_context_errno (g->context), - "set_source_output_volume() failed\n"); + qpa_logerr(pa_context_errno(c->context), + "set_source_output_volume() failed\n"); } else { pa_operation_unref(op); } =20 - op =3D pa_context_set_source_output_mute (g->context, + op =3D pa_context_set_source_output_mute(c->context, pa_stream_get_index (pa->stream), sw->vol.mute, NULL, NULL); if (!op) { - qpa_logerr (pa_context_errno (g->context), - "set_source_output_mute() failed\n"); + qpa_logerr(pa_context_errno(c->context), + "set_source_output_mute() failed\n"); } else { pa_operation_unref (op); } =20 - pa_threaded_mainloop_unlock (g->mainloop); + pa_threaded_mainloop_unlock(c->mainloop); } } return 0; } =20 /* common */ +static void *qpa_conn_init(const char *server) +{ + PAConnection *c =3D g_malloc0(sizeof(PAConnection)); + QTAILQ_INSERT_TAIL(&pa_conns, c, list); + + c->mainloop =3D pa_threaded_mainloop_new(); + if (!c->mainloop) { + goto fail; + } + + c->context =3D pa_context_new(pa_threaded_mainloop_get_api(c->mainloop= ), + server); + if (!c->context) { + goto fail; + } + + pa_context_set_state_callback(c->context, context_state_cb, c); + + if (pa_context_connect(c->context, server, 0, NULL) < 0) { + qpa_logerr(pa_context_errno(c->context), + "pa_context_connect() failed\n"); + goto fail; + } + + pa_threaded_mainloop_lock(c->mainloop); + + if (pa_threaded_mainloop_start(c->mainloop) < 0) { + goto unlock_and_fail; + } + + for (;;) { + pa_context_state_t state; + + state =3D pa_context_get_state(c->context); + + if (state =3D=3D PA_CONTEXT_READY) { + break; + } + + if (!PA_CONTEXT_IS_GOOD (state)) { + qpa_logerr(pa_context_errno(c->context), + "Wrong context state\n"); + goto unlock_and_fail; + } + + /* Wait until the context is ready */ + pa_threaded_mainloop_wait(c->mainloop); + } + + pa_threaded_mainloop_unlock(c->mainloop); + return c; + +unlock_and_fail: + pa_threaded_mainloop_unlock(c->mainloop); +fail: + AUD_log (AUDIO_CAP, "Failed to initialize PA context"); + qpa_conn_fini(c); + return NULL; +} + static void *qpa_audio_init(Audiodev *dev) { paaudio *g; AudiodevPaOptions *popts; const char *server; + PAConnection *c; =20 assert(dev->driver =3D=3D AUDIODEV_DRIVER_PA); =20 - g =3D g_malloc(sizeof(paaudio)); + g =3D g_malloc0(sizeof(paaudio)); popts =3D &dev->u.pa; server =3D popts->has_server ? popts->server : NULL; =20 g->dev =3D dev; - g->mainloop =3D NULL; - g->context =3D NULL; =20 - g->mainloop =3D pa_threaded_mainloop_new (); - if (!g->mainloop) { - goto fail; - } - - g->context =3D pa_context_new (pa_threaded_mainloop_get_api (g->mainlo= op), - server); - if (!g->context) { - goto fail; - } - - pa_context_set_state_callback (g->context, context_state_cb, g); - - if (pa_context_connect (g->context, server, 0, NULL) < 0) { - qpa_logerr (pa_context_errno (g->context), - "pa_context_connect() failed\n"); - goto fail; - } - - pa_threaded_mainloop_lock (g->mainloop); - - if (pa_threaded_mainloop_start (g->mainloop) < 0) { - goto unlock_and_fail; - } - - for (;;) { - pa_context_state_t state; - - state =3D pa_context_get_state (g->context); - - if (state =3D=3D PA_CONTEXT_READY) { + QTAILQ_FOREACH(c, &pa_conns, list) { + if (server =3D=3D NULL || c->server =3D=3D NULL ? + server =3D=3D c->server : + strcmp(server, c->server) =3D=3D 0) { + g->conn =3D c; break; } - - if (!PA_CONTEXT_IS_GOOD (state)) { - qpa_logerr (pa_context_errno (g->context), - "Wrong context state\n"); - goto unlock_and_fail; - } - - /* Wait until the context is ready */ - pa_threaded_mainloop_wait (g->mainloop); + } + if (!g->conn) { + g->conn =3D qpa_conn_init(server); + } + if (!g->conn) { + g_free(g); + return NULL; } =20 - pa_threaded_mainloop_unlock (g->mainloop); - + ++g->conn->refcount; return g; +} =20 -unlock_and_fail: - pa_threaded_mainloop_unlock (g->mainloop); -fail: - AUD_log (AUDIO_CAP, "Failed to initialize PA context"); - qpa_audio_fini(g); - return NULL; +static void qpa_conn_fini(PAConnection *c) +{ + if (c->mainloop) { + pa_threaded_mainloop_stop(c->mainloop); + } + + if (c->context) { + pa_context_disconnect(c->context); + pa_context_unref(c->context); + } + + if (c->mainloop) { + pa_threaded_mainloop_free(c->mainloop); + } + + QTAILQ_REMOVE(&pa_conns, c, list); + g_free(c); } =20 static void qpa_audio_fini (void *opaque) { paaudio *g =3D opaque; + PAConnection *c =3D g->conn; =20 - if (g->mainloop) { - pa_threaded_mainloop_stop (g->mainloop); - } - - if (g->context) { - pa_context_disconnect (g->context); - pa_context_unref (g->context); - } - - if (g->mainloop) { - pa_threaded_mainloop_free (g->mainloop); + if (--c->refcount =3D=3D 0) { + qpa_conn_fini(c); } =20 g_free(g); --=20 2.20.1