From nobody Wed Oct 1 04:56:12 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548716518185492.4450539946248; Mon, 28 Jan 2019 15:01:58 -0800 (PST) Received: from localhost ([127.0.0.1]:39880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goFua-0004aA-8O for importer@patchew.org; Mon, 28 Jan 2019 18:01:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goFdD-0007rh-Lm for qemu-devel@nongnu.org; Mon, 28 Jan 2019 17:43:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goFd9-0003Sh-6b for qemu-devel@nongnu.org; Mon, 28 Jan 2019 17:43:54 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36643) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goFd8-0003RV-Sa for qemu-devel@nongnu.org; Mon, 28 Jan 2019 17:43:51 -0500 Received: by mail-wr1-x443.google.com with SMTP id u4so19968666wrp.3 for ; Mon, 28 Jan 2019 14:43:50 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-2152-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:2152::5]) by smtp.gmail.com with ESMTPSA id k7sm100088187wrl.51.2019.01.28.14.43.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 14:43:48 -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=deAd8dOPwdCqLDQYNQLT4suKt6RwB9UGY3ls6YzM4WU=; b=m+bSl+AmZtNhy+t9a3V6Mx7XDZVg9T07+etPhnIwSzU3gvT3JAyhmBh90k2SHznBwM kF5AnrKCbTHNVu+92UeDHJ3CNnyicSlXINJrQYSd6yVfvrC03u21+hZ09xb/zO0uDC2D isMwISjr2wmaD+R1WxPr00UdomP3lWf2qqD0qZbeYUE1+vgH45EU75oLr4F7HkHQxaFm sM5lex6R1jYcwmRQod+3jsKY0RRe+qNuKpOTlH9m7+o9Eb/rcg1/WOEmUYVA2Rz7RWE6 t20jkhTzmZIax6159HO4epKNpZ+43senu7/Nx7P3MxT3Tn5SyTiF84WaIaS4o6p0HxEB U+6A== 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=deAd8dOPwdCqLDQYNQLT4suKt6RwB9UGY3ls6YzM4WU=; b=PFbXsP543YVkCd3sgbQgYfZmYx16kXQmlbqLX4W6j2YSd+FBw3xPXrhO8SdU6Ucd8b 2dUFas4mAKg5pBDh72KePpdPIwNMBlNmXg7j/Qjdb7vRsYocCztY2ha61zWgB0Ldr3pI lgZ3iS1G5Zpe6F15Mv0JsaEMrds9x/9MQuksbNeMXbpk9LLWjnzFPM7N3eKlz0mgzKsY whTwIEKWEym4npPui4j01PXbqz1LASkns/0XMm9JOVKq4xXLuY3iIAnMC8cju29NKLfV gTgr1shJEvfvQA64VR7QbNmNB2wzEsuKlnhh2heJw5i1zae4lGShoELA1Sngx8+CRjO0 hoJA== X-Gm-Message-State: AJcUuke/4ODK0rAvSN/8wn7bqCQaeJgp4y1GqvpxF4797OeQiNqEWV7G vrEtn3msGPrvNrCJPA7VknImjSziVmIYpg== X-Google-Smtp-Source: ALg8bN4JivzVQsDAec8hazqHW+/Xc4H9FWn2zg71bXA9bVOOL0ILB+puI84R9WIaT/vkdI0Cnkaj7g== X-Received: by 2002:adf:900f:: with SMTP id h15mr23461060wrh.18.1548715429374; Mon, 28 Jan 2019 14:43:49 -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: Mon, 28 Jan 2019 23:43:34 +0100 Message-Id: <0e99034cf5499c02bd66b80aa83774d0cb68dba7.1548714862.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::443 Subject: [Qemu-devel] [PATCH v4 11/14] sdlaudio: port to -audiodev config 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/audio_legacy.c | 12 ++++++++++++ audio/sdlaudio.c | 22 ++++------------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index d8cd5e27f6..214774b947 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -285,6 +285,14 @@ static void handle_pa(Audiodev *dev) get_str("QEMU_PA_SERVER", &dev->u.pa.server, &dev->u.pa.has_server); } =20 +/* SDL */ +static void handle_sdl(Audiodev *dev) +{ + /* SDL is output only */ + get_samples_to_usecs("QEMU_SDL_SAMPLES", &dev->out->buffer_len, + &dev->out->has_buffer_len, dev->out); +} + /* general */ static void handle_per_direction( AudiodevPerDirectionOptions *pdo, const char *prefix) @@ -348,6 +356,10 @@ static AudiodevListEntry *legacy_opt(const char *drvna= me) handle_pa(e->dev); break; =20 + case AUDIODEV_DRIVER_SDL: + handle_sdl(e->dev); + break; + default: break; } diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index 097841fde1..cf6ac19927 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -49,12 +49,6 @@ typedef struct SDLVoiceOut { int decr; } SDLVoiceOut; =20 -static struct { - int nb_samples; -} conf =3D { - .nb_samples =3D 1024 -}; - static struct SDLAudioState { int exit; #if USE_SEMAPHORE @@ -63,6 +57,7 @@ static struct SDLAudioState { #endif int initialized; bool driver_created; + Audiodev *dev; } glob_sdl; typedef struct SDLAudioState SDLAudioState; =20 @@ -392,7 +387,7 @@ static int sdl_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, req.freq =3D as->freq; req.format =3D aud_to_sdlfmt (as->fmt); req.channels =3D as->nchannels; - req.samples =3D conf.nb_samples; + req.samples =3D audio_buffer_samples(s->dev->out, as, 11610); req.callback =3D sdl_callback; req.userdata =3D sdl; =20 @@ -467,6 +462,7 @@ static void *sdl_audio_init(Audiodev *dev) #endif =20 s->driver_created =3D true; + s->dev =3D dev; return s; } =20 @@ -480,18 +476,9 @@ static void sdl_audio_fini (void *opaque) #endif SDL_QuitSubSystem (SDL_INIT_AUDIO); s->driver_created =3D false; + s->dev =3D NULL; } =20 -static struct audio_option sdl_options[] =3D { - { - .name =3D "SAMPLES", - .tag =3D AUD_OPT_INT, - .valp =3D &conf.nb_samples, - .descr =3D "Size of SDL buffer in samples" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops sdl_pcm_ops =3D { .init_out =3D sdl_init_out, .fini_out =3D sdl_fini_out, @@ -503,7 +490,6 @@ static struct audio_pcm_ops sdl_pcm_ops =3D { static struct audio_driver sdl_audio_driver =3D { .name =3D "sdl", .descr =3D "SDL http://www.libsdl.org", - .options =3D sdl_options, .init =3D sdl_audio_init, .fini =3D sdl_audio_fini, .pcm_ops =3D &sdl_pcm_ops, --=20 2.20.1