[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] audio: extract audio_define_default
From: |
Paolo Bonzini |
Subject: |
[PATCH 3/7] audio: extract audio_define_default |
Date: |
Thu, 5 Oct 2023 14:58:11 +0200 |
It will be used soon to define a default audio device from the
command line.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
audio/audio.c | 19 ++++++++++++-------
audio/audio.h | 1 +
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 67a7e25254d..186cc4d336e 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1686,8 +1686,6 @@ static const VMStateDescription vmstate_audio = {
}
};
-static void audio_validate_opts(Audiodev *dev, Error **errp);
-
void audio_create_default_audiodevs(void)
{
const char *drvname = getenv("QEMU_AUDIO_DRV");
@@ -1706,7 +1704,6 @@ void audio_create_default_audiodevs(void)
if (audio_driver_lookup(audio_prio_list[i])) {
QDict *dict = qdict_new();
Audiodev *dev = NULL;
- AudiodevListEntry *e;
Visitor *v;
qdict_put_str(dict, "driver", audio_prio_list[i]);
@@ -1717,10 +1714,7 @@ void audio_create_default_audiodevs(void)
visit_type_Audiodev(v, NULL, &dev, &error_fatal);
visit_free(v);
- audio_validate_opts(dev, &error_abort);
- e = g_new0(AudiodevListEntry, 1);
- e->dev = dev;
- QSIMPLEQ_INSERT_TAIL(&default_audiodevs, e, next);
+ audio_define_default(dev, &error_abort);
}
}
}
@@ -2165,6 +2159,17 @@ void audio_define(Audiodev *dev)
QSIMPLEQ_INSERT_TAIL(&audiodevs, e, next);
}
+void audio_define_default(Audiodev *dev, Error **errp)
+{
+ AudiodevListEntry *e;
+
+ audio_validate_opts(dev, errp);
+
+ e = g_new0(AudiodevListEntry, 1);
+ e->dev = dev;
+ QSIMPLEQ_INSERT_TAIL(&default_audiodevs, e, next);
+}
+
void audio_init_audiodevs(void)
{
AudiodevListEntry *e;
diff --git a/audio/audio.h b/audio/audio.h
index 53b1d7e6227..6da5e8f6f0f 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -169,6 +169,7 @@ void audio_sample_from_uint64(void *samples, int pos,
uint64_t left, uint64_t right);
void audio_define(Audiodev *audio);
+void audio_define_default(Audiodev *dev, Error **errp);
void audio_parse_option(const char *opt);
void audio_create_default_audiodevs(void);
void audio_init_audiodevs(void);
--
2.41.0
- [PATCH 0/7] audio: redo default audio backend creation, Paolo Bonzini, 2023/10/05
- [PATCH 1/7] audio: error hints need a trailing \n, Paolo Bonzini, 2023/10/05
- [PATCH 5/7] audio: do not use first -audiodev as default audio device, Paolo Bonzini, 2023/10/05
- Re: [PATCH 5/7] audio: do not use first -audiodev as default audio device, BALATON Zoltan, 2023/10/05
- Re: [PATCH 5/7] audio: do not use first -audiodev as default audio device, BALATON Zoltan, 2023/10/05
- Re: [PATCH 5/7] audio: do not use first -audiodev as default audio device, Paolo Bonzini, 2023/10/05
- Re: [PATCH 5/7] audio: do not use first -audiodev as default audio device, BALATON Zoltan, 2023/10/05
- Re: [PATCH 5/7] audio: do not use first -audiodev as default audio device, Paolo Bonzini, 2023/10/05
- Re: [PATCH 5/7] audio: do not use first -audiodev as default audio device, BALATON Zoltan, 2023/10/05
[PATCH 2/7] audio: disable default backends if -audio/-audiodev is used, Paolo Bonzini, 2023/10/05
[PATCH 3/7] audio: extract audio_define_default,
Paolo Bonzini <=
[PATCH 4/7] audio: extend -audio to allow creating a default backend, Paolo Bonzini, 2023/10/05
[PATCH 7/7] audio, qtest: get rid of QEMU_AUDIO_DRV, Paolo Bonzini, 2023/10/05
[PATCH 6/7] audio: reintroduce default audio backend for VNC, Paolo Bonzini, 2023/10/05
Re: [PATCH 0/7] audio: redo default audio backend creation, Marc-André Lureau, 2023/10/09