From patchwork Fri Aug 21 15:37:15 2015 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: 509536 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9CADC140187 for ; Sat, 22 Aug 2015 01:47:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PyyLwRp8; dkim-atps=neutral Received: from localhost ([::1]:42215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoX7-0007lt-Ot for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2015 11:47:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOE-0002Q8-1F for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSoOC-000255-T2 for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:37:57 -0400 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:38651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOC-00024w-N1 for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:37:56 -0400 Received: by wicja10 with SMTP id ja10so19172180wic.1 for ; Fri, 21 Aug 2015 08:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=4pfr1rCbaSd5KX2xCcJIyup4JRbF7krjxtz3V+itnPM=; b=PyyLwRp8YMfmAYmvGoDr45NqGy6JMJSlwSULJm/SKgwkFzY0J9MuY3m77FxNbHO1G2 vIG4rj7zLt+pypdu/1AkRiZU8L1BI1Mg3DsI1SPuOCD6huh4x+yuprkS3SXHlJ6z2SZm +Ef/w768jf6HAMxAFSYuFMEFVSJwm8qmjjPxEd+9q/yyFiaK09n9+qW3trwFCwHQ8loT AklkqrfEIy9dOLNamL0OF3gpotPgU6qrg4tv66WVO5mxNb7yC1FV6cMonC+nlcgrcRAG jDZcosLmjPq2NcHV38nySPTJ4vLkRg05nGdsW84OG9JBXx+mnd2laZNyp2R67QtOGapc z+AQ== X-Received: by 10.194.93.166 with SMTP id cv6mr16810384wjb.63.1440171476149; Fri, 21 Aug 2015 08:37:56 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (178-164-172-216.pool.digikabel.hu. [178.164.172.216]) by smtp.gmail.com with ESMTPSA id v8sm10479895wjr.15.2015.08.21.08.37.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Aug 2015 08:37:55 -0700 (PDT) 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: Fri, 21 Aug 2015 17:37:15 +0200 Message-Id: <51ecdb67eb34332fea3d9f2e42bcf3fdb9571252.1440171025.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::230 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 19/49] sdlaudio: port to -audiodev config X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Kővágó, Zoltán --- audio/audio_legacy.c | 7 +++++++ audio/sdlaudio.c | 22 ++++------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index 3eab2b9..4d8e2b9 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -100,6 +100,11 @@ SimpleEnvMap pa_map[] = { { /* End of list */ } }; +SimpleEnvMap sdl_map[] = { + { "QEMU_SDL_SAMPLES", "buffer-len", ENV_TRANSFORM_SAMPLES_TO_USECS_OUT }, + { /* End of list */ } +}; + static unsigned long long toull(const char *str) { unsigned long long ret; @@ -278,6 +283,8 @@ static void legacy_opt(const char *drv) handle_env_opts(opts, oss_map); } else if (strcmp(drv, "pa") == 0) { handle_env_opts(opts, pa_map); + } else if (strcmp(drv, "sdl") == 0) { + handle_env_opts(opts, sdl_map); } } diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index 580c613..796238a 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -44,18 +44,13 @@ typedef struct SDLVoiceOut { int decr; } SDLVoiceOut; -static struct { - int nb_samples; -} conf = { - .nb_samples = 1024 -}; - static struct SDLAudioState { int exit; SDL_mutex *mutex; SDL_sem *sem; int initialized; bool driver_created; + Audiodev *dev; } glob_sdl; typedef struct SDLAudioState SDLAudioState; @@ -347,7 +342,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->out, as, 11610); req.callback = sdl_callback; req.userdata = sdl; @@ -420,6 +415,7 @@ static void *sdl_audio_init(Audiodev *dev) } s->driver_created = true; + s->dev = dev; return s; } @@ -431,18 +427,9 @@ static void sdl_audio_fini (void *opaque) SDL_DestroyMutex (s->mutex); 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, @@ -454,7 +441,6 @@ static struct audio_pcm_ops sdl_pcm_ops = { 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,