OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

audio: simplify flow in audio_init

Browse Source 
Merge two ifs into one.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-09-22 17:46:28 +02:00
parent 5c63d141dc
commit e329963172
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
audio/audio.c
View File

@ -1707,12 +1707,12 @@ static AudiodevListEntry *audiodev_find(
* if dev == NULL => legacy implicit initialization, return the already created * if dev == NULL => legacy implicit initialization, return the already created
* state or create a new one * state or create a new one
*/ */
static AudioState *audio_init(Audiodev *dev, const char *name) static AudioState *audio_init(Audiodev *dev)
{ {
static bool atexit_registered; static bool atexit_registered;
size_t i; size_t i;
int done = 0; int done = 0;
const char *drvname = NULL; const char *drvname;
VMChangeStateEntry *vmse; VMChangeStateEntry *vmse;
AudioState *s; AudioState *s;
struct audio_driver *driver; struct audio_driver *driver;
@ -1736,17 +1736,32 @@ static AudioState *audio_init(Audiodev *dev, const char *name)
} }
} }
s = g_new0(AudioState, 1);
QLIST_INIT (&s->hw_head_out);
QLIST_INIT (&s->hw_head_in);
QLIST_INIT (&s->cap_head);
if (!atexit_registered) {
atexit(audio_cleanup);
atexit_registered = true;
}
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
if (dev) { if (dev) {
/* -audiodev option */ /* -audiodev option */
legacy_config = false; s->dev = dev;
drvname = AudiodevDriver_str(dev->driver); drvname = AudiodevDriver_str(dev->driver);
} else if (!QTAILQ_EMPTY(&audio_states)) { driver = audio_driver_lookup(drvname);
if (!legacy_config) { if (driver) {
dolog("Device %s: audiodev default parameter is deprecated, please " done = !audio_driver_init(s, driver, true, dev);
"specify audiodev=%s\n", name, } else {
QTAILQ_FIRST(&audio_states)->dev->id); dolog ("Unknown audio driver `%s'\n", drvname);
}
if (!done) {
free_audio_state(s);
return NULL;
} }
return QTAILQ_FIRST(&audio_states);
} else { } else {
/* legacy implicit initialization */ /* legacy implicit initialization */
head = audio_handle_legacy_opts(); head = audio_handle_legacy_opts();
@ -1759,33 +1774,7 @@ static AudioState *audio_init(Audiodev *dev, const char *name)
*/ */
dev = QSIMPLEQ_FIRST(&head)->dev; dev = QSIMPLEQ_FIRST(&head)->dev;
audio_validate_opts(dev, &error_abort); audio_validate_opts(dev, &error_abort);
}
s = g_new0(AudioState, 1);
s->dev = dev;
QLIST_INIT (&s->hw_head_out);
QLIST_INIT (&s->hw_head_in);
QLIST_INIT (&s->cap_head);
if (!atexit_registered) {
atexit(audio_cleanup);
atexit_registered = true;
}
s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);
if (drvname) {
driver = audio_driver_lookup(drvname);
if (driver) {
done = !audio_driver_init(s, driver, true, dev);
} else {
dolog ("Unknown audio driver `%s'\n", drvname);
}
if (!done) {
free_audio_state(s);
return NULL;
}
} else {
for (i = 0; audio_prio_list[i]; i++) { for (i = 0; audio_prio_list[i]; i++) {
AudiodevListEntry *e = audiodev_find(&head, audio_prio_list[i]); AudiodevListEntry *e = audiodev_find(&head, audio_prio_list[i]);
driver = audio_driver_lookup(audio_prio_list[i]); driver = audio_driver_lookup(audio_prio_list[i]);
@ -1800,8 +1789,9 @@ static AudioState *audio_init(Audiodev *dev, const char *name)
} }
} }
} }
audio_free_audiodev_list(&head);
} }
audio_free_audiodev_list(&head);
if (!done) { if (!done) {
driver = audio_driver_lookup("none"); driver = audio_driver_lookup("none");
@ -1841,7 +1831,16 @@ void audio_free_audiodev_list(AudiodevListHead *head)
void AUD_register_card (const char *name, QEMUSoundCard *card) void AUD_register_card (const char *name, QEMUSoundCard *card)
{ {
if (!card->state) { if (!card->state) {
card->state = audio_init(NULL, name); if (!QTAILQ_EMPTY(&audio_states)) {
if (!legacy_config) {
dolog("Device %s: audiodev default parameter is deprecated, please "
"specify audiodev=%s\n", name,
QTAILQ_FIRST(&audio_states)->dev->id);
}
card->state = QTAILQ_FIRST(&audio_states);
} else {
card->state = audio_init(NULL);
}
} }
card->name = g_strdup (name); card->name = g_strdup (name);
@ -2171,6 +2170,7 @@ void audio_define(Audiodev *dev)
e = g_new0(AudiodevListEntry, 1); e = g_new0(AudiodevListEntry, 1);
e->dev = dev; e->dev = dev;
QSIMPLEQ_INSERT_TAIL(&audiodevs, e, next); QSIMPLEQ_INSERT_TAIL(&audiodevs, e, next);
legacy_config = false;
} }
bool audio_init_audiodevs(void) bool audio_init_audiodevs(void)
@ -2178,7 +2178,7 @@ bool audio_init_audiodevs(void)
AudiodevListEntry *e; AudiodevListEntry *e;
QSIMPLEQ_FOREACH(e, &audiodevs, next) { QSIMPLEQ_FOREACH(e, &audiodevs, next) {
if (!audio_init(e->dev, NULL)) { if (!audio_init(e->dev)) {
return false; return false;
} }
} }