From nobody Fri Nov 7 04:14:05 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547682946079220.8661962952965; Wed, 16 Jan 2019 15:55:46 -0800 (PST) Received: from localhost ([127.0.0.1]:35500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjv29-00017g-1t for importer@patchew.org; Wed, 16 Jan 2019 18:55:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjuks-00046x-4e for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjukk-0002ug-2M for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:52 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35798) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjukj-0002kz-JV for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:45 -0500 Received: by mail-wr1-x444.google.com with SMTP id 96so8979591wrb.2 for ; Wed, 16 Jan 2019 15:37:39 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e4b0-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e4b0::5]) by smtp.gmail.com with ESMTPSA id s66sm30760437wmf.34.2019.01.16.15.37.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:37:37 -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=+KLdYVHXyb++yJyEvEl+SHTMWf4MHgf4Ka8Rlav/6ss=; b=TIqUWPaEu5pGDSz5SIRG+80LnsfarZ6aY5xphWe+Hux4xmM0wIKruvkE5eUK5Xgg4n O110UwreMj29pqTwugjAhspsGAH/m6Nlztzq2JHg63ltFGjP3E/plFbRj3ae7P8RgJdy s7ONfCV4IF8+TT6k+beJc2o08UhgblGKgyNtVIjrBH43btTHVguGZrV9yD6FoEqwylT4 GnbAw656r+MCuhTHcycilzIkDMYrzgAnfLg+n4SVtdXLdfIXljTsu5LP4hXmphLgiX4B 98sF35LzYE4d/m0cOPd0cUaXaMWTVPvA7l85A4vlmC0MzenCiBOBynFjP3JoBqBEyL3P Yocw== 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=+KLdYVHXyb++yJyEvEl+SHTMWf4MHgf4Ka8Rlav/6ss=; b=RRwwsW8R6bTpt0WFeu5YYjLu2LXgOiMSnTgZ5pALANBuqpZaU1xkClmDRBNg+Zy8Y3 0IiutMHpaURJhGyDVlACAP0sbhcChpoONAqF8VykFBF0ZdQ0odEYblaqxMHIcDgo8k8/ D47l4fUAtpdvBrCZP7rVNYvfXHmUqruUELMnUiFQMCjGgeyUDCCxft0OCpw8216Eqcd6 j13tTEUH9uYj6KH4p0lwlqNesAa4YEjCA26+vFI0uExeozXkuFK4/8aOOQXJJP1k/iX6 hKBbpfjkWVoRryPWRUTwePc89HpB21tHeb0ghWLeluXqjyqjPVtSPxSoxMcgrU4jATLU N1Ng== X-Gm-Message-State: AJcUukdIR/0qnvnS1tKo8jNYBRuktEW3hA6g5CQJxZJf0iVqzgrOXfOV qJDmSQWrXQA001k0Sgp1Fs3caMGwMsw= X-Google-Smtp-Source: ALg8bN7hEH4kMb3uAH/HRPaeSZy7myi2qaHmyOehUEZSpHtl30xaoJEW96fY+RHLQGBuNZ17F+lr1A== X-Received: by 2002:adf:ca13:: with SMTP id o19mr9418210wrh.148.1547681857884; Wed, 16 Jan 2019 15:37:37 -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, 17 Jan 2019 00:36:47 +0100 Message-Id: <9b1d639f82f26aff6a87db6f195b6dc0c7b0f29e.1547681517.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::444 Subject: [Qemu-devel] [PATCH v3 14/50] audio: -audiodev command line option: cleanup 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) Remove no longer needed code. Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/audio_int.h | 17 ---- audio/audio.c | 201 +--------------------------------------------- 2 files changed, 4 insertions(+), 214 deletions(-) diff --git a/audio/audio_int.h b/audio/audio_int.h index 353467b505..66214199f0 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -33,22 +33,6 @@ =20 struct audio_pcm_ops; =20 -typedef enum { - AUD_OPT_INT, - AUD_OPT_FMT, - AUD_OPT_STR, - AUD_OPT_BOOL -} audio_option_tag_e; - -struct audio_option { - const char *name; - audio_option_tag_e tag; - void *valp; - const char *descr; - int *overriddenp; - int overridden; -}; - struct audio_callback { void *opaque; audio_callback_fn fn; @@ -145,7 +129,6 @@ typedef struct audio_driver audio_driver; struct audio_driver { const char *name; const char *descr; - struct audio_option *options; void *(*init) (Audiodev *); void (*fini) (void *); struct audio_pcm_ops *pcm_ops; diff --git a/audio/audio.c b/audio/audio.c index 159b049ceb..77bd8386d0 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -172,113 +172,6 @@ void *audio_calloc (const char *funcname, int nmemb, = size_t size) return g_malloc0 (len); } =20 -static const char *audio_audfmt_to_string (AudioFormat fmt) -{ - switch (fmt) { - case AUDIO_FORMAT_U8: - return "U8"; - - case AUDIO_FORMAT_U16: - return "U16"; - - case AUDIO_FORMAT_S8: - return "S8"; - - case AUDIO_FORMAT_S16: - return "S16"; - - case AUDIO_FORMAT_U32: - return "U32"; - - case AUDIO_FORMAT_S32: - return "S32"; - - default: - abort(); - } - - dolog ("Bogus audfmt %d returning S16\n", fmt); - return "S16"; -} - -static AudioFormat audio_string_to_audfmt (const char *s, AudioFormat defv= al, - int *defaultp) -{ - if (!strcasecmp (s, "u8")) { - *defaultp =3D 0; - return AUDIO_FORMAT_U8; - } - else if (!strcasecmp (s, "u16")) { - *defaultp =3D 0; - return AUDIO_FORMAT_U16; - } - else if (!strcasecmp (s, "u32")) { - *defaultp =3D 0; - return AUDIO_FORMAT_U32; - } - else if (!strcasecmp (s, "s8")) { - *defaultp =3D 0; - return AUDIO_FORMAT_S8; - } - else if (!strcasecmp (s, "s16")) { - *defaultp =3D 0; - return AUDIO_FORMAT_S16; - } - else if (!strcasecmp (s, "s32")) { - *defaultp =3D 0; - return AUDIO_FORMAT_S32; - } - else { - dolog ("Bogus audio format `%s' using %s\n", - s, audio_audfmt_to_string (defval)); - *defaultp =3D 1; - return defval; - } -} - -static AudioFormat audio_get_conf_fmt (const char *envname, - AudioFormat defval, - int *defaultp) -{ - const char *var =3D getenv (envname); - if (!var) { - *defaultp =3D 1; - return defval; - } - return audio_string_to_audfmt (var, defval, defaultp); -} - -static int audio_get_conf_int (const char *key, int defval, int *defaultp) -{ - int val; - char *strval; - - strval =3D getenv (key); - if (strval && !qemu_strtoi(strval, NULL, 10, &val)) { - *defaultp =3D 0; - return val; - } - else { - *defaultp =3D 1; - return defval; - } -} - -static const char *audio_get_conf_str (const char *key, - const char *defval, - int *defaultp) -{ - const char *val =3D getenv (key); - if (!val) { - *defaultp =3D 1; - return defval; - } - else { - *defaultp =3D 0; - return val; - } -} - void AUD_vlog (const char *cap, const char *fmt, va_list ap) { if (cap) { @@ -297,89 +190,6 @@ void AUD_log (const char *cap, const char *fmt, ...) va_end (ap); } =20 -static void audio_process_options (const char *prefix, - struct audio_option *opt) -{ - char *optname; - const char qemu_prefix[] =3D "QEMU_"; - size_t preflen, optlen; - - if (audio_bug(__func__, !prefix)) { - dolog ("prefix =3D NULL\n"); - return; - } - - if (audio_bug(__func__, !opt)) { - dolog ("opt =3D NULL\n"); - return; - } - - preflen =3D strlen (prefix); - - for (; opt->name; opt++) { - size_t len, i; - int def; - - if (!opt->valp) { - dolog ("Option value pointer for `%s' is not set\n", - opt->name); - continue; - } - - len =3D strlen (opt->name); - /* len of opt->name + len of prefix + size of qemu_prefix - * (includes trailing zero) + zero + underscore (on behalf of - * sizeof) */ - optlen =3D len + preflen + sizeof (qemu_prefix) + 1; - optname =3D g_malloc (optlen); - - pstrcpy (optname, optlen, qemu_prefix); - - /* copy while upper-casing, including trailing zero */ - for (i =3D 0; i <=3D preflen; ++i) { - optname[i + sizeof (qemu_prefix) - 1] =3D qemu_toupper(prefix[= i]); - } - pstrcat (optname, optlen, "_"); - pstrcat (optname, optlen, opt->name); - - def =3D 1; - switch (opt->tag) { - case AUD_OPT_BOOL: - case AUD_OPT_INT: - { - int *intp =3D opt->valp; - *intp =3D audio_get_conf_int (optname, *intp, &def); - } - break; - - case AUD_OPT_FMT: - { - AudioFormat *fmtp =3D opt->valp; - *fmtp =3D audio_get_conf_fmt (optname, *fmtp, &def); - } - break; - - case AUD_OPT_STR: - { - const char **strp =3D opt->valp; - *strp =3D audio_get_conf_str (optname, *strp, &def); - } - break; - - default: - dolog ("Bad value tag for option `%s' - %d\n", - optname, opt->tag); - break; - } - - if (!opt->overriddenp) { - opt->overriddenp =3D &opt->overridden; - } - *opt->overriddenp =3D !def; - g_free (optname); - } -} - static void audio_print_settings (struct audsettings *as) { dolog ("frequency=3D%d nchannels=3D%d fmt=3D", as->freq, as->nchannels= ); @@ -1092,7 +902,7 @@ void AUD_set_active_out (SWVoiceOut *sw, int on) if (!hw->enabled) { hw->enabled =3D 1; if (s->vm_running) { - hw->pcm_ops->ctl_out(hw, VOICE_ENABLE, true /* todo */= ); + hw->pcm_ops->ctl_out(hw, VOICE_ENABLE); audio_reset_timer (s); } } @@ -1137,7 +947,7 @@ void AUD_set_active_in (SWVoiceIn *sw, int on) if (!hw->enabled) { hw->enabled =3D 1; if (s->vm_running) { - hw->pcm_ops->ctl_in(hw, VOICE_ENABLE, true /* todo */); + hw->pcm_ops->ctl_in(hw, VOICE_ENABLE); audio_reset_timer (s); } } @@ -1461,9 +1271,6 @@ void audio_run (const char *msg) static int audio_driver_init(AudioState *s, struct audio_driver *drv, Audiodev *dev) { - if (drv->options) { - audio_process_options (drv->name, drv->options); - } s->drv_opaque =3D drv->init(dev); =20 if (s->drv_opaque) { @@ -1488,11 +1295,11 @@ static void audio_vm_change_state_handler (void *op= aque, int running, =20 s->vm_running =3D running; while ((hwo =3D audio_pcm_hw_find_any_enabled_out (hwo))) { - hwo->pcm_ops->ctl_out(hwo, op, true /* todo */); + hwo->pcm_ops->ctl_out(hwo, op); } =20 while ((hwi =3D audio_pcm_hw_find_any_enabled_in (hwi))) { - hwi->pcm_ops->ctl_in(hwi, op, true /* todo */); + hwi->pcm_ops->ctl_in(hwi, op); } audio_reset_timer (s); } --=20 2.20.1