mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: reintroduce default audio backend for VNC

Browse Source 
Make VNC use the default backend again if one is defined.
The recently introduced support for disabling the VNC audio
extension is still used, in case no default backend exists.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-10-05 18:42:54 +02:00
parent 22f84d4f78
commit 63a13c0805
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
audio/audio.c
View File

@ -1801,20 +1801,28 @@ out:
return NULL; return NULL;
} }
AudioState *audio_get_default_audio_state(Error **errp)
{
if (!default_audio_state) {
default_audio_state = audio_init(NULL, errp);
if (!default_audio_state) {
if (!QSIMPLEQ_EMPTY(&audiodevs)) {
error_append_hint(errp, "Perhaps you wanted to use -audio or set audiodev=%s?\n",
QSIMPLEQ_FIRST(&audiodevs)->dev->id);
}
}
}
return default_audio_state;
}
bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp) bool AUD_register_card (const char *name, QEMUSoundCard *card, Error **errp)
{ {
if (!card->state) { if (!card->state) {
if (!default_audio_state) { card->state = audio_get_default_audio_state(errp);
default_audio_state = audio_init(NULL, errp); if (!card->state) {
if (!default_audio_state) { return false;
if (!QSIMPLEQ_EMPTY(&audiodevs)) {
error_append_hint(errp, "Perhaps you wanted to use -audio or set audiodev=%s?\n",
QSIMPLEQ_FIRST(&audiodevs)->dev->id);
}
return false;
}
} }
card->state = default_audio_state;
} }
card->name = g_strdup (name); card->name = g_strdup (name);

1
audio/audio.h
View File

@ -176,6 +176,7 @@ void audio_init_audiodevs(void);
void audio_help(void); void audio_help(void);
AudioState *audio_state_by_name(const char *name, Error **errp); AudioState *audio_state_by_name(const char *name, Error **errp);
AudioState *audio_get_default_audio_state(Error **errp);
const char *audio_get_id(QEMUSoundCard *card); const char *audio_get_id(QEMUSoundCard *card);
#define DEFINE_AUDIO_PROPERTIES(_s, _f) \ #define DEFINE_AUDIO_PROPERTIES(_s, _f) \

6
docs/about/removed-features.rst
View File

@ -460,12 +460,6 @@ in this case.
Note that the default audio backend must be configured on the command Note that the default audio backend must be configured on the command
line if the ``-nodefaults`` options is used. line if the ``-nodefaults`` options is used.
Creating vnc without ``audiodev=`` property (removed in 8.2)
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
When using vnc, you should specify an ``audiodev=`` property if
you plan to transmit audio through the VNC protocol.
QEMU Machine Protocol (QMP) commands QEMU Machine Protocol (QMP) commands
------------------------------------ ------------------------------------

2
ui/vnc.c
View File

@ -4185,6 +4185,8 @@ void vnc_display_open(const char *id, Error **errp)
if (!vd->audio_state) { if (!vd->audio_state) {
goto fail; goto fail;
} }
} else {
vd->audio_state = audio_get_default_audio_state(NULL);
} }
device_id = qemu_opt_get(opts, "display"); device_id = qemu_opt_get(opts, "display");