[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 26/49] audio: audiodev= parameters no longer opti
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v2 26/49] audio: audiodev= parameters no longer optional when -audiodev present |
Date: |
Fri, 21 Aug 2015 17:37:22 +0200 |
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
Changes from v1:
* (probably) more clear error messages
audio/audio.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 88e04bf..d7e0533 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -69,6 +69,8 @@ const struct mixeng_volume nominal_volume = {
#endif
};
+static bool legacy_config;
+
#ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED
#error No its not
#else
@@ -1318,7 +1320,7 @@ static Audiodev *parse_option(QemuOpts *opts, Error
**errp);
* initialize a new state with it
* if dev == NULL => legacy implicit initialization, return the already created
* state or create a new one */
-static AudioState *audio_init(Audiodev *dev)
+static AudioState *audio_init(Audiodev *dev, const char *name)
{
static bool atexit_registered;
size_t i;
@@ -1332,9 +1334,13 @@ static AudioState *audio_init(Audiodev *dev)
if (dev) {
drvname = AudiodevDriver_lookup[dev->kind];
} else if (!QTAILQ_EMPTY(&audio_states)) {
- /* todo: chack for -audiodev we have normal audiodev selection support
*/
+ if (!legacy_config) {
+ dolog("You must specify an audiodev= for the device %s\n", name);
+ exit(1);
+ }
return QTAILQ_FIRST(&audio_states);
} else {
+ legacy_config = true;
audio_handle_legacy_opts();
list = qemu_find_opts("audiodev");
dev = parse_option(QTAILQ_FIRST(&list->head), &error_abort);
@@ -1440,7 +1446,7 @@ static AudioState *audio_init(Audiodev *dev)
void AUD_register_card (const char *name, QEMUSoundCard *card)
{
if (!card->state) {
- card->state = audio_init(NULL);
+ card->state = audio_init(NULL, name);
}
card->name = g_strdup (name);
@@ -1466,7 +1472,10 @@ CaptureVoiceOut *AUD_add_capture(
struct capture_callback *cb;
if (!s) {
- /* todo: remove when we have normal audiodev selection support */
+ if (!legacy_config) {
+ dolog("You must specify audiodev when trying to capture\n");
+ goto err0;
+ }
s = QTAILQ_FIRST(&audio_states);
}
@@ -1705,7 +1714,7 @@ static int each_option(void *opaque, QemuOpts *opts,
Error **errp)
if (!dev) {
return -1;
}
- return audio_init(dev) ? 0 : -1;
+ return audio_init(dev, NULL) ? 0 : -1;
}
void audio_set_options(void)
--
2.5.0
- [Qemu-devel] [PATCH v2 23/49] audio: reduce glob_audio_state usage, (continued)
- [Qemu-devel] [PATCH v2 23/49] audio: reduce glob_audio_state usage, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 18/49] paaudio: port to -audiodev config, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 25/49] audio: add audiodev properties to frontends, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 24/49] audio: basic support for multi backend audio, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 29/49] paaudio: properly disconnect streams in fini_*, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 27/49] paaudio: do not create multiple connections to the same server, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 28/49] paaudio: do not move stream when sink/source name is specified, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 31/49] audio: do not run each backend in audio_run, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 32/49] paaudio: fix playback glitches, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 33/49] audio: remove read and write pcm_ops, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 26/49] audio: audiodev= parameters no longer optional when -audiodev present,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v2 30/49] audio: remove audio_MIN, audio_MAX, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 35/49] audio: api for mixeng code free backends, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 37/49] coreaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 39/49] noaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 34/49] audio: use size_t where makes sense, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 38/49] dsoundaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 40/49] ossaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 42/49] sdlaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 44/49] wavaudio: port to the new audio backend api, Kővágó, Zoltán, 2015/08/21
- [Qemu-devel] [PATCH v2 45/49] audio: remove remains of the old backend api, Kővágó, Zoltán, 2015/08/21