From patchwork Fri Mar 8 22:34:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1053756 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="teFF2G8a"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44GMx90TFJz9s7h for ; Sat, 9 Mar 2019 09:43:57 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2ODb-0006kO-11 for incoming@patchwork.ozlabs.org; Fri, 08 Mar 2019 17:43:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2O4h-0007lV-L5 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 17:34:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2O4f-0002gB-O6 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 17:34:43 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38359) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2O4d-0002eb-Qq for qemu-devel@nongnu.org; Fri, 08 Mar 2019 17:34:40 -0500 Received: by mail-wr1-x444.google.com with SMTP id g12so22947698wrm.5 for ; Fri, 08 Mar 2019 14:34:38 -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=m3RSlMV5oUljuFlOQoyWqtjNmJ2slIs3aaMjFOehxJ4=; b=teFF2G8auRzeOpuHyCGOdX12EyxjGMEXCttS3+gsLkcUcR8i3M+RSzr/WC1P5h1zgv 2rIRxPPgNJ4dfjLgmxescvZxZrcM3JVENyinIvvc+KQtkvdPAn8XMr1i8jQrNBndIbef RIda9qsPrAghArLnsbyeNylOpER2YQtzc1MlwP6EHoqD1wWrf1VC+ZOYj9rEuZNP2voW WY59kbKauW/B568Sod1sh9pASkJE8C8mBFFXm7YrmjOhoGOUtD0KnDWZKhp0U+5ChZiS LvCm8NpYW1uvAOWMWXPW3ndFvj4TZSeDvKsT6YNk0JutaJA3avPQbUVFrBenKsdRB9Yg kXVg== 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=m3RSlMV5oUljuFlOQoyWqtjNmJ2slIs3aaMjFOehxJ4=; b=PDE7YmNdhrSQXJX4E3HQa78bA9qMw5ndbVWg+TyYIMVO9HChJ74i30jXrprsPVyJZa 2m8S9+EbmNWpJPW1gRxkAh1AA4cjfz3RntW2RoCX29x6fdYyKIj3KyKYcN7kdbal1dD7 hZ0aXcN+Avsp+YwPJgC24mAYKFYvo/TJZ46QvkEWUT2yHUFNK2294wcRQ21oUFHqSgD/ wectHldpb0GOTIBMTvOYFGynkBAvzbNYCV+25HEueVupCdtumMtz33WupNLB+XSHG4bt X3i94m7cF+FbvgEgw/OAsJ9lG0br7d/mLSHy9aL0lgWFaycM6nK4TfVo26k3rBAbjs9i PsdQ== X-Gm-Message-State: APjAAAUC6rQYZ4YPFrm6bZNPZh2uqhXdF9Jq+P0dFwyEob83XG7CFOUf vdssrq0CslZNqb2ZJRLgGLr9/7njZb4= X-Google-Smtp-Source: APXvYqzt71Wy+Rgtir1ggSyKmLEkZbkYbwnLmBwHTdBck6TDfk7JXewS+CyO/ppIji6GxMIeqi2qGQ== X-Received: by 2002:a5d:4090:: with SMTP id o16mr12219733wrp.208.1552084477851; Fri, 08 Mar 2019 14:34:37 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-6af5-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:6af5::5]) by smtp.gmail.com with ESMTPSA id v2sm15269144wme.29.2019.03.08.14.34.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 14:34:37 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 23:34:22 +0100 Message-Id: <1dc596cba39378df862582a0b952e497a16c6c31.1552083282.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v6 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Kővágó, Zoltán --- 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 8d7f1475b5..478cf76d5f 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -281,6 +281,14 @@ static void handle_pa(Audiodev *dev) get_str("QEMU_PA_SERVER", &dev->u.pa.server, &dev->u.pa.has_server); } +/* SDL */ +static void handle_sdl(Audiodev *dev) +{ + /* SDL is output only */ + get_samples_to_usecs("QEMU_SDL_SAMPLES", &dev->u.sdl.out->buffer_length, + &dev->u.sdl.out->has_buffer_length, dev->u.sdl.out); +} + /* general */ static void handle_per_direction( AudiodevPerDirectionOptions *pdo, const char *prefix) @@ -342,6 +350,10 @@ static AudiodevListEntry *legacy_opt(const char *drvname) handle_pa(e->dev); break; + case AUDIODEV_DRIVER_SDL: + handle_sdl(e->dev); + break; + default: break; } diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index b9ae506a56..ff9248ba68 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -44,16 +44,11 @@ typedef struct SDLVoiceOut { int decr; } SDLVoiceOut; -static struct { - int nb_samples; -} conf = { - .nb_samples = 1024 -}; - static struct SDLAudioState { int exit; int initialized; bool driver_created; + Audiodev *dev; } glob_sdl; typedef struct SDLAudioState SDLAudioState; @@ -271,7 +266,7 @@ static int sdl_init_out(HWVoiceOut *hw, struct audsettings *as, req.freq = as->freq; req.format = aud_to_sdlfmt (as->fmt); req.channels = as->nchannels; - req.samples = conf.nb_samples; + req.samples = audio_buffer_samples(s->dev->u.sdl.out, as, 11610); req.callback = sdl_callback; req.userdata = sdl; @@ -329,6 +324,7 @@ static void *sdl_audio_init(Audiodev *dev) } s->driver_created = true; + s->dev = dev; return s; } @@ -338,18 +334,9 @@ static void sdl_audio_fini (void *opaque) sdl_close (s); SDL_QuitSubSystem (SDL_INIT_AUDIO); s->driver_created = false; + s->dev = NULL; } -static struct audio_option sdl_options[] = { - { - .name = "SAMPLES", - .tag = AUD_OPT_INT, - .valp = &conf.nb_samples, - .descr = "Size of SDL buffer in samples" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops sdl_pcm_ops = { .init_out = sdl_init_out, .fini_out = sdl_fini_out, @@ -361,7 +348,6 @@ static struct audio_pcm_ops sdl_pcm_ops = { static struct audio_driver sdl_audio_driver = { .name = "sdl", .descr = "SDL http://www.libsdl.org", - .options = sdl_options, .init = sdl_audio_init, .fini = sdl_audio_fini, .pcm_ops = &sdl_pcm_ops,