From patchwork Thu Jan 14 13:45:28 2016 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: 567437 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 3EDDB14029E for ; Fri, 15 Jan 2016 00:53:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=F+DUczNv; dkim-atps=neutral Received: from localhost ([::1]:42578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiLR-0004cE-1E for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 08:53:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEJ-0001FH-Id for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEH-0003Qt-WC for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:23 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEH-0003Qo-Nj for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:21 -0500 Received: by mail-wm0-x243.google.com with SMTP id u188so43609084wmu.0 for ; Thu, 14 Jan 2016 05:46:21 -0800 (PST) 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=FvHkt9OVfWeYk/UnIcU2dojKsCnh7kF9zh80GrVpwEw=; b=F+DUczNvj3bVUMG7qMqKHYaJOzCUsCv15MqKghAzn45BzgjYRxKnaEaPWj04Byxz3z TPO+2mzWOMBxBcOfn/To+42jzRKJNoUkLVjFl7j3bdb8aTIAco5recWJNNfF90lLf6nP oD2Cz7hQ5kJQ08ZFY6/jsyvUsqS8PUI4Zplzv8egXVgOfVj9Z9nrG/udtQinwYst4rWV fYDaDsEt7Eh95yxoVa8disxgeO/TBSEgz6GeKY5G3G9ElqMQvAs8bBJMFDHmWPHb7dMu gEHUNilwZTLOQ7mvm6E4ZwEjgRukxSY6TYmulZ3tbjgvUTm1Xo6uBMDYV7GcQr1u8AbM sZRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=FvHkt9OVfWeYk/UnIcU2dojKsCnh7kF9zh80GrVpwEw=; b=jipaQzYTVWS2WbLucRkpb3dxg0dYkZG+jn+Hogx8SrVw1axZLfT25WFTABurlY63eM A4gQEALWMRQfILuCT3nI39D8zpKtEHhpArEuwqPq9poTUWoWEKDm987UHk3GUHqvnMEr cIOK0SCFvKpZKqwtKJUapyeVRKlZaZsFBZfCtzfFXF9FIFhuTKK/o+5RWl8DdORpkTgX UVslQDRRnagv1QzypNNideym1MNohVGhSXJElW35gOjqe46vZmjJNv0fK4MH4chSF5uT 2Avw3Uds5gg5UMlOT0AVCOP8ApHVgrYF2TeeL5TJcxe8rnPjlDySydA6fHq17lnY4QDn pK/w== X-Gm-Message-State: ALoCoQnlbo6GbgdOihXJAVYuFelmJWQY9+GxMuHRfgzH//S8L2WoaTUd7AkyNsfQohobX3EcGpGzTchBfckLwX2tvy4G2lD9MA== X-Received: by 10.28.15.210 with SMTP id 201mr30257239wmp.79.1452779181226; Thu, 14 Jan 2016 05:46:21 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:20 -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: Thu, 14 Jan 2016 14:45:28 +0100 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 15/51] wavaudio: 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 | 10 +++++++++ audio/wavaudio.c | 58 ++++++++-------------------------------------------- 2 files changed, 19 insertions(+), 49 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index 4d8e2b9..2004097 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -105,6 +105,14 @@ SimpleEnvMap sdl_map[] = { { /* End of list */ } }; +SimpleEnvMap wav_map[] = { + { "QEMU_WAV_FREQUENCY", "out.frequency" }, + { "QEMU_WAV_FORMAT", "out.format", ENV_TRANSFORM_FMT }, + { "QEMU_WAV_DAC_FIXED_CHANNELS", "out.channels" }, + { "QEMU_WAV_PATH", "path" }, + { /* End of list */ } +}; + static unsigned long long toull(const char *str) { unsigned long long ret; @@ -285,6 +293,8 @@ static void legacy_opt(const char *drv) handle_env_opts(opts, pa_map); } else if (strcmp(drv, "sdl") == 0) { handle_env_opts(opts, sdl_map); + } else if (strcmp(drv, "wav") == 0) { + handle_env_opts(opts, wav_map); } } diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 8b0ba91..b1a3b1d 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -23,6 +23,7 @@ */ #include "hw/hw.h" #include "qemu/timer.h" +#include "qapi-visit.h" #include "audio.h" #define AUDIO_CAP "wav" @@ -36,11 +37,6 @@ typedef struct WAVVoiceOut { int total_samples; } WAVVoiceOut; -typedef struct { - struct audsettings settings; - const char *wav_path; -} WAVConf; - static int wav_run_out (HWVoiceOut *hw, int live) { WAVVoiceOut *wav = (WAVVoiceOut *) hw; @@ -111,8 +107,10 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, 0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00 }; - WAVConf *conf = drv_opaque; - struct audsettings wav_as = conf->settings; + Audiodev *dev = drv_opaque; + AudiodevWavOptions *wopts = dev->u.wav; + struct audsettings wav_as = audiodev_to_audsettings(dev->out); + const char *wav_path = wopts->has_path ? wopts->path : "qemu.wav"; stereo = wav_as.nchannels == 2; switch (wav_as.fmt) { @@ -153,10 +151,10 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4); le_store (hdr + 32, 1 << (bits16 + stereo), 2); - wav->f = fopen (conf->wav_path, "wb"); + wav->f = fopen(wav_path, "wb"); if (!wav->f) { dolog ("Failed to open wave file `%s'\nReason: %s\n", - conf->wav_path, strerror (errno)); + wav_path, strerror(errno)); g_free (wav->pcm_buf); wav->pcm_buf = NULL; return -1; @@ -224,54 +222,17 @@ static int wav_ctl_out (HWVoiceOut *hw, int cmd, ...) return 0; } -static WAVConf glob_conf = { - .settings.freq = 44100, - .settings.nchannels = 2, - .settings.fmt = AUDIO_FORMAT_S16, - .wav_path = "qemu.wav" -}; - static void *wav_audio_init(Audiodev *dev) { - WAVConf *conf = g_malloc(sizeof(WAVConf)); - *conf = glob_conf; - return conf; + assert(dev->driver == AUDIODEV_DRIVER_WAV); + return dev; } static void wav_audio_fini (void *opaque) { ldebug ("wav_fini"); - g_free(opaque); } -static struct audio_option wav_options[] = { - { - .name = "FREQUENCY", - .tag = AUD_OPT_INT, - .valp = &glob_conf.settings.freq, - .descr = "Frequency" - }, - { - .name = "FORMAT", - .tag = AUD_OPT_FMT, - .valp = &glob_conf.settings.fmt, - .descr = "Format" - }, - { - .name = "DAC_FIXED_CHANNELS", - .tag = AUD_OPT_INT, - .valp = &glob_conf.settings.nchannels, - .descr = "Number of channels (1 - mono, 2 - stereo)" - }, - { - .name = "PATH", - .tag = AUD_OPT_STR, - .valp = &glob_conf.wav_path, - .descr = "Path to wave file" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops wav_pcm_ops = { .init_out = wav_init_out, .fini_out = wav_fini_out, @@ -283,7 +244,6 @@ static struct audio_pcm_ops wav_pcm_ops = { struct audio_driver wav_audio_driver = { .name = "wav", .descr = "WAV renderer http://wikipedia.org/wiki/WAV", - .options = wav_options, .init = wav_audio_init, .fini = wav_audio_fini, .pcm_ops = &wav_pcm_ops,