[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/50] audio: -audiodev command line option: clea
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v3 14/50] audio: -audiodev command line option: cleanup |
Date: |
Thu, 17 Jan 2019 00:36:47 +0100 |
Remove no longer needed code.
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
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 @@
struct audio_pcm_ops;
-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);
}
-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 defval,
- int *defaultp)
-{
- if (!strcasecmp (s, "u8")) {
- *defaultp = 0;
- return AUDIO_FORMAT_U8;
- }
- else if (!strcasecmp (s, "u16")) {
- *defaultp = 0;
- return AUDIO_FORMAT_U16;
- }
- else if (!strcasecmp (s, "u32")) {
- *defaultp = 0;
- return AUDIO_FORMAT_U32;
- }
- else if (!strcasecmp (s, "s8")) {
- *defaultp = 0;
- return AUDIO_FORMAT_S8;
- }
- else if (!strcasecmp (s, "s16")) {
- *defaultp = 0;
- return AUDIO_FORMAT_S16;
- }
- else if (!strcasecmp (s, "s32")) {
- *defaultp = 0;
- return AUDIO_FORMAT_S32;
- }
- else {
- dolog ("Bogus audio format `%s' using %s\n",
- s, audio_audfmt_to_string (defval));
- *defaultp = 1;
- return defval;
- }
-}
-
-static AudioFormat audio_get_conf_fmt (const char *envname,
- AudioFormat defval,
- int *defaultp)
-{
- const char *var = getenv (envname);
- if (!var) {
- *defaultp = 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 = getenv (key);
- if (strval && !qemu_strtoi(strval, NULL, 10, &val)) {
- *defaultp = 0;
- return val;
- }
- else {
- *defaultp = 1;
- return defval;
- }
-}
-
-static const char *audio_get_conf_str (const char *key,
- const char *defval,
- int *defaultp)
-{
- const char *val = getenv (key);
- if (!val) {
- *defaultp = 1;
- return defval;
- }
- else {
- *defaultp = 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);
}
-static void audio_process_options (const char *prefix,
- struct audio_option *opt)
-{
- char *optname;
- const char qemu_prefix[] = "QEMU_";
- size_t preflen, optlen;
-
- if (audio_bug(__func__, !prefix)) {
- dolog ("prefix = NULL\n");
- return;
- }
-
- if (audio_bug(__func__, !opt)) {
- dolog ("opt = NULL\n");
- return;
- }
-
- preflen = 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 = strlen (opt->name);
- /* len of opt->name + len of prefix + size of qemu_prefix
- * (includes trailing zero) + zero + underscore (on behalf of
- * sizeof) */
- optlen = len + preflen + sizeof (qemu_prefix) + 1;
- optname = g_malloc (optlen);
-
- pstrcpy (optname, optlen, qemu_prefix);
-
- /* copy while upper-casing, including trailing zero */
- for (i = 0; i <= preflen; ++i) {
- optname[i + sizeof (qemu_prefix) - 1] = qemu_toupper(prefix[i]);
- }
- pstrcat (optname, optlen, "_");
- pstrcat (optname, optlen, opt->name);
-
- def = 1;
- switch (opt->tag) {
- case AUD_OPT_BOOL:
- case AUD_OPT_INT:
- {
- int *intp = opt->valp;
- *intp = audio_get_conf_int (optname, *intp, &def);
- }
- break;
-
- case AUD_OPT_FMT:
- {
- AudioFormat *fmtp = opt->valp;
- *fmtp = audio_get_conf_fmt (optname, *fmtp, &def);
- }
- break;
-
- case AUD_OPT_STR:
- {
- const char **strp = opt->valp;
- *strp = 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 = &opt->overridden;
- }
- *opt->overriddenp = !def;
- g_free (optname);
- }
-}
-
static void audio_print_settings (struct audsettings *as)
{
dolog ("frequency=%d nchannels=%d fmt=", as->freq, as->nchannels);
@@ -1092,7 +902,7 @@ void AUD_set_active_out (SWVoiceOut *sw, int on)
if (!hw->enabled) {
hw->enabled = 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 = 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 = drv->init(dev);
if (s->drv_opaque) {
@@ -1488,11 +1295,11 @@ static void audio_vm_change_state_handler (void
*opaque, int running,
s->vm_running = running;
while ((hwo = audio_pcm_hw_find_any_enabled_out (hwo))) {
- hwo->pcm_ops->ctl_out(hwo, op, true /* todo */);
+ hwo->pcm_ops->ctl_out(hwo, op);
}
while ((hwi = 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);
}
--
2.20.1
- [Qemu-devel] [PATCH v3 15/50] audio: reduce glob_audio_state usage, (continued)
- [Qemu-devel] [PATCH v3 15/50] audio: reduce glob_audio_state usage, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 09/50] ossaudio: port to -audiodev config, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 19/50] paaudio: do not move stream when sink/source name is specified, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 01/50] qapi: qapi for audio backends, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 13/50] wavaudio: port to -audiodev config, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 22/50] audio: do not run each backend in audio_run, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 10/50] paaudio: port to -audiodev config, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 07/50] dsoundaudio: port to -audiodev config, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 14/50] audio: -audiodev command line option: cleanup,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v3 12/50] spiceaudio: port to -audiodev config, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 20/50] paaudio: properly disconnect streams in fini_*, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 11/50] sdlaudio: port to -audiodev config, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 16/50] audio: basic support for multi backend audio, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 18/50] audio: audiodev= parameters no longer optional when -audiodev present, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 21/50] audio: remove audio_MIN, audio_MAX, Kővágó, Zoltán, 2019/01/16
- [Qemu-devel] [PATCH v3 30/50] noaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/01/16