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 1545599353028174.37349078770978; Sun, 23 Dec 2018 13:09:13 -0800 (PST) Received: from localhost ([127.0.0.1]:59771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAzn-0003UB-9P for importer@patchew.org; Sun, 23 Dec 2018 16:09:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAkB-0008Da-Ae for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAk8-0003E0-UE for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:03 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAk8-00035c-Jh for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:53:00 -0500 Received: by mail-wm1-x32d.google.com with SMTP id y139so9809607wmc.5 for ; Sun, 23 Dec 2018 12:52:59 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:52:57 -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=c/Coow8G0mqpkiOlGU70gKsvP+kyigQWe3fXpD82mw0=; b=fXf34VUC8UbYfoXYUUfIbOAO8Km3VPEKoemHjYF6I0oKFvz1i6lc4OYdnTgMpRT6Lc 623NuXRMqald0WP/F4nBdK3jvCHRIpPztxxSkddYBNoNuePFyCQA+FBPkzluO06ccyXz SRU12ErxBEeDi/coXPFkhVazTxYgTR2Ko76ICIDg5L8EqbSpdNDXRtGnC8qU7fXQqWns EQr7Tf8x8CqFKPa2zLQVnQ4HAOhf75Ns6cb/WZ6XwcJhrIpotEixa75m+/cXlJQnOwNT n6FOlQEv/Zucl3l/LVrja1sS2Iy/aCtEQ/yO8Q28cr5csLEIEaJUNSuHLLDsYs4hey/h q97A== 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=c/Coow8G0mqpkiOlGU70gKsvP+kyigQWe3fXpD82mw0=; b=K3Rh+XpNbKnx41d2asdoq+IYHcylXDCQcAdjeXnjXOa/YuaaELoqRQVL7j7Tzxf4wX qHsGbQkdzRt7nqvM674ULZxRb8gbJtFFc0uuVBmVS0aFjwQ8N5xF97FFFa6i5YSGFzXt HbU3EICZylq7ngTBE+Fw9oQ5DlktpXTz6Nn2F1EA3Lm/ye6zkVcFTw1R/fNV4AMx0UV4 zfa0kTPYHasY7Mv88uFeSYCT0NQfJBv0ve+2rNoY9CYCEH2TcGgZ7l8A0b0gafaeBBxG Xlifr+fsbVER+dy4vkXO7N10Lvv/SLEDAFFDbHciR9/YvQs3i8+IOdln/12HipXkjTjZ Bh3w== X-Gm-Message-State: AJcUukcYBYQdjbl82eDRU/7B4/Ly7SNMEv63gvNyMBmy9kS9uHA2+FUT qLvKKdUwmFXwGQr5kpwlSwXvVEjknF4= X-Google-Smtp-Source: AFSGD/U+LRC1Gzp2U25FiJZ2tm4q5+0zAsWAbUgcWgEuxDQUbh+F0tfcse2Vj49KwHrjDOdjhXstOg== X-Received: by 2002:a1c:5656:: with SMTP id k83mr10180590wmb.125.1545598377944; Sun, 23 Dec 2018 12:52:57 -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:52:10 +0100 Message-Id: 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::32d Subject: [Qemu-devel] [PATCH v2 34/52] paaudio: port to the new audio backend api 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) Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/Makefile.objs | 1 - audio/audio_pt_int.c | 174 -------------------- audio/audio_pt_int.h | 22 --- audio/paaudio.c | 372 ++++++------------------------------------- configure | 5 - 5 files changed, 45 insertions(+), 529 deletions(-) delete mode 100644 audio/audio_pt_int.c delete mode 100644 audio/audio_pt_int.h diff --git a/audio/Makefile.objs b/audio/Makefile.objs index dca87f6347..d7490a379f 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -2,7 +2,6 @@ common-obj-y =3D audio.o audio_legacy.o noaudio.o wavaudio.= o mixeng.o common-obj-$(CONFIG_SPICE) +=3D spiceaudio.o common-obj-$(CONFIG_AUDIO_COREAUDIO) +=3D coreaudio.o common-obj-$(CONFIG_AUDIO_DSOUND) +=3D dsoundaudio.o -common-obj-$(CONFIG_AUDIO_PT_INT) +=3D audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) +=3D audio_win_int.o common-obj-y +=3D wavcapture.o =20 diff --git a/audio/audio_pt_int.c b/audio/audio_pt_int.c deleted file mode 100644 index 3fe56d8514..0000000000 --- a/audio/audio_pt_int.c +++ /dev/null @@ -1,174 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "audio.h" - -#define AUDIO_CAP "audio-pt" - -#include "audio_int.h" -#include "audio_pt_int.h" - -static void GCC_FMT_ATTR(3, 4) logerr (struct audio_pt *pt, int err, - const char *fmt, ...) -{ - va_list ap; - - va_start (ap, fmt); - AUD_vlog (pt->drv, fmt, ap); - va_end (ap); - - AUD_log (NULL, "\n"); - AUD_log (pt->drv, "Reason: %s\n", strerror (err)); -} - -int audio_pt_init (struct audio_pt *p, void *(*func) (void *), - void *opaque, const char *drv, const char *cap) -{ - int err, err2; - const char *efunc; - sigset_t set, old_set; - - p->drv =3D drv; - - err =3D sigfillset (&set); - if (err) { - logerr(p, errno, "%s(%s): sigfillset failed", cap, __func__); - return -1; - } - - err =3D pthread_mutex_init (&p->mutex, NULL); - if (err) { - efunc =3D "pthread_mutex_init"; - goto err0; - } - - err =3D pthread_cond_init (&p->cond, NULL); - if (err) { - efunc =3D "pthread_cond_init"; - goto err1; - } - - err =3D pthread_sigmask (SIG_BLOCK, &set, &old_set); - if (err) { - efunc =3D "pthread_sigmask"; - goto err2; - } - - err =3D pthread_create (&p->thread, NULL, func, opaque); - - err2 =3D pthread_sigmask (SIG_SETMASK, &old_set, NULL); - if (err2) { - logerr(p, err2, "%s(%s): pthread_sigmask (restore) failed", - cap, __func__); - /* We have failed to restore original signal mask, all bets are of= f, - so terminate the process */ - exit (EXIT_FAILURE); - } - - if (err) { - efunc =3D "pthread_create"; - goto err2; - } - - return 0; - - err2: - err2 =3D pthread_cond_destroy (&p->cond); - if (err2) { - logerr(p, err2, "%s(%s): pthread_cond_destroy failed", cap, __func= __); - } - - err1: - err2 =3D pthread_mutex_destroy (&p->mutex); - if (err2) { - logerr(p, err2, "%s(%s): pthread_mutex_destroy failed", cap, __fun= c__); - } - - err0: - logerr(p, err, "%s(%s): %s failed", cap, __func__, efunc); - return -1; -} - -int audio_pt_fini (struct audio_pt *p, const char *cap) -{ - int err, ret =3D 0; - - err =3D pthread_cond_destroy (&p->cond); - if (err) { - logerr(p, err, "%s(%s): pthread_cond_destroy failed", cap, __func_= _); - ret =3D -1; - } - - err =3D pthread_mutex_destroy (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_destroy failed", cap, __func= __); - ret =3D -1; - } - return ret; -} - -int audio_pt_lock (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_mutex_lock (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_lock failed", cap, __func__); - return -1; - } - return 0; -} - -int audio_pt_unlock (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_mutex_unlock (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func_= _); - return -1; - } - return 0; -} - -int audio_pt_wait (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_cond_wait (&p->cond, &p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_cond_wait failed", cap, __func__); - return -1; - } - return 0; -} - -int audio_pt_unlock_and_signal (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_mutex_unlock (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func_= _); - return -1; - } - err =3D pthread_cond_signal (&p->cond); - if (err) { - logerr(p, err, "%s(%s): pthread_cond_signal failed", cap, __func__= ); - return -1; - } - return 0; -} - -int audio_pt_join (struct audio_pt *p, void **arg, const char *cap) -{ - int err; - void *ret; - - err =3D pthread_join (p->thread, &ret); - if (err) { - logerr(p, err, "%s(%s): pthread_join failed", cap, __func__); - return -1; - } - *arg =3D ret; - return 0; -} diff --git a/audio/audio_pt_int.h b/audio/audio_pt_int.h deleted file mode 100644 index 4c0c15b9af..0000000000 --- a/audio/audio_pt_int.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef QEMU_AUDIO_PT_INT_H -#define QEMU_AUDIO_PT_INT_H - -#include - -struct audio_pt { - const char *drv; - pthread_t thread; - pthread_cond_t cond; - pthread_mutex_t mutex; -}; - -int audio_pt_init (struct audio_pt *, void *(*) (void *), void *, - const char *, const char *); -int audio_pt_fini (struct audio_pt *, const char *); -int audio_pt_lock (struct audio_pt *, const char *); -int audio_pt_unlock (struct audio_pt *, const char *); -int audio_pt_wait (struct audio_pt *, const char *); -int audio_pt_unlock_and_signal (struct audio_pt *, const char *); -int audio_pt_join (struct audio_pt *, void **, const char *); - -#endif /* QEMU_AUDIO_PT_INT_H */ diff --git a/audio/paaudio.c b/audio/paaudio.c index 251b087a74..392225c875 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -8,7 +8,6 @@ =20 #define AUDIO_CAP "pulseaudio" #include "audio_int.h" -#include "audio_pt_int.h" =20 typedef struct PAConnection { char *server; @@ -29,28 +28,16 @@ typedef struct { =20 typedef struct { HWVoiceOut hw; - int done; - int live; - int decr; - int rpos; pa_stream *stream; - void *pcm_buf; - struct audio_pt pt; paaudio *g; int samples; } PAVoiceOut; =20 typedef struct { HWVoiceIn hw; - int done; - int dead; - int incr; - int wpos; pa_stream *stream; - void *pcm_buf; - struct audio_pt pt; const void *read_data; - size_t read_index, read_length; + size_t read_length; paaudio *g; int samples; } PAVoiceIn; @@ -88,298 +75,96 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t = x) } #endif =20 -#define CHECK_SUCCESS_GOTO(c, rerror, expression, label) \ +#define CHECK_SUCCESS_GOTO(c, expression, label, msg) \ do { \ if (!(expression)) { \ - if (rerror) { \ - *(rerror) =3D pa_context_errno ((c)->context); \ - } \ + qpa_logerr(pa_context_errno((c)->context), msg); \ goto label; \ } \ } while (0) =20 -#define CHECK_DEAD_GOTO(c, stream, rerror, label) \ +#define CHECK_DEAD_GOTO(c, stream, label, msg) \ do { \ if (!(c)->context || !PA_CONTEXT_IS_GOOD (pa_context_get_state((c)= ->context)) || \ !(stream) || !PA_STREAM_IS_GOOD (pa_stream_get_state ((stream)= ))) { \ if (((c)->context && pa_context_get_state ((c)->context) =3D= =3D PA_CONTEXT_FAILED) || \ ((stream) && pa_stream_get_state ((stream)) =3D=3D PA_STRE= AM_FAILED)) { \ - if (rerror) { \ - *(rerror) =3D pa_context_errno ((c)->context); \ - } \ + qpa_logerr(pa_context_errno((c)->context), msg); \ } else { \ - if (rerror) { \ - *(rerror) =3D PA_ERR_BADSTATE; \ - } \ + qpa_logerr(PA_ERR_BADSTATE, msg); \ } \ goto label; \ } \ } while (0) =20 -static int qpa_simple_read (PAVoiceIn *p, void *data, size_t length, int *= rerror) +static size_t qpa_read(HWVoiceIn *hw, void *data, size_t length) { + PAVoiceIn *p =3D (PAVoiceIn *) hw; PAConnection *c =3D p->g->conn; + size_t l; + int r; =20 pa_threaded_mainloop_lock(c->mainloop); =20 - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); + CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail, + "pa_threaded_mainloop_lock failed\n"); =20 - while (length > 0) { - size_t l; - - while (!p->read_data) { - int r; - - r =3D pa_stream_peek (p->stream, &p->read_data, &p->read_lengt= h); - CHECK_SUCCESS_GOTO(c, rerror, r =3D=3D 0, unlock_and_fail); - - if (!p->read_data) { - pa_threaded_mainloop_wait(c->mainloop); - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); - } else { - p->read_index =3D 0; - } - } - - l =3D p->read_length < length ? p->read_length : length; - memcpy (data, (const uint8_t *) p->read_data+p->read_index, l); - - data =3D (uint8_t *) data + l; - length -=3D l; - - p->read_index +=3D l; - p->read_length -=3D l; + if (!p->read_length) { + r =3D pa_stream_peek (p->stream, &p->read_data, &p->read_length); + CHECK_SUCCESS_GOTO(c, r =3D=3D 0, unlock_and_fail, + "pa_stream_peek failed\n"); + } =20 - if (!p->read_length) { - int r; + l =3D MIN(p->read_length, length); + memcpy(data, p->read_data, l); =20 - r =3D pa_stream_drop (p->stream); - p->read_data =3D NULL; - p->read_length =3D 0; - p->read_index =3D 0; + p->read_data +=3D l; + p->read_length -=3D l; =20 - CHECK_SUCCESS_GOTO(c, rerror, r =3D=3D 0, unlock_and_fail); - } + if (!p->read_length) { + r =3D pa_stream_drop(p->stream); + CHECK_SUCCESS_GOTO(c, r =3D=3D 0, unlock_and_fail, + "pa_stream_drop failed\n"); } =20 pa_threaded_mainloop_unlock(c->mainloop); - return 0; + return l; =20 unlock_and_fail: pa_threaded_mainloop_unlock(c->mainloop); - return -1; + return 0; } =20 -static int qpa_simple_write (PAVoiceOut *p, const void *data, size_t lengt= h, int *rerror) +static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length) { + PAVoiceOut *p =3D (PAVoiceOut *) hw; PAConnection *c =3D p->g->conn; + size_t l; + int r; =20 pa_threaded_mainloop_lock(c->mainloop); =20 - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); + CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail, + "pa_threaded_mainloop_lock failed\n"); =20 - while (length > 0) { - size_t l; - int r; + l =3D pa_stream_writable_size(p->stream); =20 - while (!(l =3D pa_stream_writable_size (p->stream))) { - pa_threaded_mainloop_wait(c->mainloop); - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); - } + CHECK_SUCCESS_GOTO(c, l !=3D (size_t) -1, unlock_and_fail, + "pa_stream_writable_size failed\n"); =20 - CHECK_SUCCESS_GOTO(c, rerror, l !=3D (size_t) -1, unlock_and_fail); - - if (l > length) { - l =3D length; - } - - r =3D pa_stream_write (p->stream, data, l, NULL, 0LL, PA_SEEK_RELA= TIVE); - CHECK_SUCCESS_GOTO(c, rerror, r >=3D 0, unlock_and_fail); - - data =3D (const uint8_t *) data + l; - length -=3D l; + if (l > length) { + l =3D length; } =20 + r =3D pa_stream_write(p->stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE); + CHECK_SUCCESS_GOTO(c, r >=3D 0, unlock_and_fail, "pa_stream_write fail= ed\n"); + pa_threaded_mainloop_unlock(c->mainloop); - return 0; + return l; =20 unlock_and_fail: pa_threaded_mainloop_unlock(c->mainloop); - return -1; -} - -static void *qpa_thread_out (void *arg) -{ - PAVoiceOut *pa =3D arg; - HWVoiceOut *hw =3D &pa->hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - for (;;) { - int decr, to_mix, rpos; - - for (;;) { - if (pa->done) { - goto exit; - } - - if (pa->live > 0) { - break; - } - - if (audio_pt_wait(&pa->pt, __func__)) { - goto exit; - } - } - - decr =3D to_mix =3D MIN(pa->live, pa->samples >> 5); - rpos =3D pa->rpos; - - if (audio_pt_unlock(&pa->pt, __func__)) { - return NULL; - } - - while (to_mix) { - int error; - int chunk =3D MIN (to_mix, hw->samples - rpos); - struct st_sample *src =3D hw->mix_buf + rpos; - - hw->clip (pa->pcm_buf, src, chunk); - - if (qpa_simple_write (pa, pa->pcm_buf, - chunk << hw->info.shift, &error) < 0) { - qpa_logerr (error, "pa_simple_write failed\n"); - return NULL; - } - - rpos =3D (rpos + chunk) % hw->samples; - to_mix -=3D chunk; - } - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - pa->rpos =3D rpos; - pa->live -=3D decr; - pa->decr +=3D decr; - } - - exit: - audio_pt_unlock(&pa->pt, __func__); - return NULL; -} - -static int qpa_run_out (HWVoiceOut *hw, int live) -{ - int decr; - PAVoiceOut *pa =3D (PAVoiceOut *) hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return 0; - } - - decr =3D MIN (live, pa->decr); - pa->decr -=3D decr; - pa->live =3D live - decr; - hw->rpos =3D pa->rpos; - if (pa->live > 0) { - audio_pt_unlock_and_signal(&pa->pt, __func__); - } - else { - audio_pt_unlock(&pa->pt, __func__); - } - return decr; -} - -/* capture */ -static void *qpa_thread_in (void *arg) -{ - PAVoiceIn *pa =3D arg; - HWVoiceIn *hw =3D &pa->hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - for (;;) { - int incr, to_grab, wpos; - - for (;;) { - if (pa->done) { - goto exit; - } - - if (pa->dead > 0) { - break; - } - - if (audio_pt_wait(&pa->pt, __func__)) { - goto exit; - } - } - - incr =3D to_grab =3D MIN(pa->dead, pa->samples >> 5); - wpos =3D pa->wpos; - - if (audio_pt_unlock(&pa->pt, __func__)) { - return NULL; - } - - while (to_grab) { - int error; - int chunk =3D MIN (to_grab, hw->samples - wpos); - void *buf =3D advance (pa->pcm_buf, wpos); - - if (qpa_simple_read (pa, buf, - chunk << hw->info.shift, &error) < 0) { - qpa_logerr (error, "pa_simple_read failed\n"); - return NULL; - } - - hw->conv (hw->conv_buf + wpos, buf, chunk); - wpos =3D (wpos + chunk) % hw->samples; - to_grab -=3D chunk; - } - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - pa->wpos =3D wpos; - pa->dead -=3D incr; - pa->incr +=3D incr; - } - - exit: - audio_pt_unlock(&pa->pt, __func__); - return NULL; -} - -static int qpa_run_in (HWVoiceIn *hw) -{ - int live, incr, dead; - PAVoiceIn *pa =3D (PAVoiceIn *) hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return 0; - } - - live =3D audio_pcm_hw_get_live_in (hw); - dead =3D hw->samples - live; - incr =3D MIN (dead, pa->incr); - pa->incr -=3D incr; - pa->dead =3D dead - incr; - hw->wpos =3D pa->wpos; - if (pa->dead > 0) { - audio_pt_unlock_and_signal(&pa->pt, __func__); - } - else { - audio_pt_unlock(&pa->pt, __func__); - } - return incr; + return 0; } =20 static pa_sample_format_t audfmt_to_pa (AudioFormat afmt, int endianness) @@ -467,13 +252,6 @@ static void stream_state_cb (pa_stream *s, void * user= data) } } =20 -static void stream_request_cb (pa_stream *s, size_t length, void *userdata) -{ - PAConnection *c =3D userdata; - - pa_threaded_mainloop_signal(c->mainloop, 0); -} - static pa_stream *qpa_simple_new ( PAConnection *c, const char *name, @@ -496,8 +274,6 @@ static pa_stream *qpa_simple_new ( } =20 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); =20 flags =3D PA_STREAM_INTERPOLATE_TIMING @@ -581,28 +357,9 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsett= ings *as, audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D pa->samples =3D audio_buffer_samples(g->dev->out, &obt= _as, 46440); - pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); - pa->rpos =3D hw->rpos; - if (!pa->pcm_buf) { - dolog("Could not allocate buffer (%zu bytes)\n", - hw->samples << hw->info.shift); - goto fail2; - } - - if (audio_pt_init(&pa->pt, qpa_thread_out, hw, AUDIO_CAP, __func__)) { - goto fail3; - } =20 return 0; =20 - fail3: - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; - fail2: - if (pa->stream) { - pa_stream_unref (pa->stream); - pa->stream =3D NULL; - } fail1: return -1; } @@ -642,28 +399,9 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettin= gs *as, void *drv_opaque) audio_pcm_init_info (&hw->info, &obt_as); hw->samples =3D pa->samples =3D audio_buffer_samples(g->dev->in, &obt_= as, 46440); - pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); - pa->wpos =3D hw->wpos; - if (!pa->pcm_buf) { - dolog("Could not allocate buffer (%zu bytes)\n", - hw->samples << hw->info.shift); - goto fail2; - } - - if (audio_pt_init(&pa->pt, qpa_thread_in, hw, AUDIO_CAP, __func__)) { - goto fail3; - } =20 return 0; =20 - fail3: - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; - fail2: - if (pa->stream) { - pa_stream_unref (pa->stream); - pa->stream =3D NULL; - } fail1: return -1; } @@ -691,42 +429,22 @@ static void qpa_simple_disconnect(PAConnection *c, pa= _stream *stream) =20 static void qpa_fini_out (HWVoiceOut *hw) { - void *ret; PAVoiceOut *pa =3D (PAVoiceOut *) hw; =20 - audio_pt_lock(&pa->pt, __func__); - pa->done =3D 1; - audio_pt_unlock_and_signal(&pa->pt, __func__); - audio_pt_join(&pa->pt, &ret, __func__); - if (pa->stream) { qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream =3D NULL; } - - audio_pt_fini(&pa->pt, __func__); - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; } =20 static void qpa_fini_in (HWVoiceIn *hw) { - void *ret; PAVoiceIn *pa =3D (PAVoiceIn *) hw; =20 - audio_pt_lock(&pa->pt, __func__); - pa->done =3D 1; - audio_pt_unlock_and_signal(&pa->pt, __func__); - audio_pt_join(&pa->pt, &ret, __func__); - if (pa->stream) { qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream =3D NULL; } - - audio_pt_fini(&pa->pt, __func__); - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; } =20 static int qpa_ctl_out (HWVoiceOut *hw, int cmd, ...) @@ -964,12 +682,12 @@ static void qpa_audio_fini (void *opaque) static struct audio_pcm_ops qpa_pcm_ops =3D { .init_out =3D qpa_init_out, .fini_out =3D qpa_fini_out, - .run_out =3D qpa_run_out, + .write =3D qpa_write, .ctl_out =3D qpa_ctl_out, =20 .init_in =3D qpa_init_in, .fini_in =3D qpa_fini_in, - .run_in =3D qpa_run_in, + .read =3D qpa_read, .ctl_in =3D qpa_ctl_in }; =20 diff --git a/configure b/configure index 224d3071ac..872a5efb3b 100755 --- a/configure +++ b/configure @@ -286,7 +286,6 @@ block_drv_ro_whitelist=3D"" host_cc=3D"cc" libs_softmmu=3D"" libs_tools=3D"" -audio_pt_int=3D"" audio_win_int=3D"" libs_qga=3D"" debug_info=3D"yes" @@ -3339,7 +3338,6 @@ for drv in $audio_drv_list; do audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \ "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL); r= eturn 0;" pulse_libs=3D"-lpulse" - audio_pt_int=3D"yes" ;; =20 sdl) @@ -6304,9 +6302,6 @@ echo "PULSE_LIBS=3D$pulse_libs" >> $config_host_mak echo "COREAUDIO_LIBS=3D$coreaudio_libs" >> $config_host_mak echo "DSOUND_LIBS=3D$dsound_libs" >> $config_host_mak echo "OSS_LIBS=3D$oss_libs" >> $config_host_mak -if test "$audio_pt_int" =3D "yes" ; then - echo "CONFIG_AUDIO_PT_INT=3Dy" >> $config_host_mak -fi if test "$audio_win_int" =3D "yes" ; then echo "CONFIG_AUDIO_WIN_INT=3Dy" >> $config_host_mak fi --=20 2.20.1