aboutsummaryrefslogtreecommitdiff
path: root/hw/audio
diff options
context:
space:
mode:
authorVolker Rümelin <vr_qemu@t-online.de>2023-11-05 18:25:52 +0100
committerMichael S. Tsirkin <mst@redhat.com>2023-12-02 15:56:49 -0500
commite60bdfb78e41b0cee8beb21bc9c2bb2749f4ef6b (patch)
tree476c8319c5460e053daf82fa956fdfb124fcfdaf /hw/audio
parent74e8593e7e51d6b11ae9c56a3f4e7bb714bac4ec (diff)
downloadqemu-e60bdfb78e41b0cee8beb21bc9c2bb2749f4ef6b.zip
qemu-e60bdfb78e41b0cee8beb21bc9c2bb2749f4ef6b.tar.gz
qemu-e60bdfb78e41b0cee8beb21bc9c2bb2749f4ef6b.tar.bz2
hw/audio/hda-codec: reenable the audio mixer
Commit b7639b7dd0 ("hw/audio: Simplify hda audio init") inverted the sense of hda codec property mixer during initialization. Change the code so that mixer=on enables the hda mixer emulation and mixer=off disables the hda mixer emulation. With this change audio playback and recording streams don't start muted by default. Fixes: b7639b7dd0 ("hw/audio: Simplify hda audio init") Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> Message-Id: <20231105172552.8405-2-vr_qemu@t-online.de> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/audio')
-rw-r--r--hw/audio/hda-codec.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index f756e41..0bc20d4 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -868,10 +868,10 @@ static Property hda_audio_properties[] = {
static void hda_audio_init_output(HDACodecDevice *hda, Error **errp)
{
HDAAudioState *a = HDA_AUDIO(hda);
- const struct desc_codec *desc = &output_nomixemu;
+ const struct desc_codec *desc = &output_mixemu;
if (!a->mixer) {
- desc = &output_mixemu;
+ desc = &output_nomixemu;
}
hda_audio_init(hda, desc, errp);
@@ -880,10 +880,10 @@ static void hda_audio_init_output(HDACodecDevice *hda, Error **errp)
static void hda_audio_init_duplex(HDACodecDevice *hda, Error **errp)
{
HDAAudioState *a = HDA_AUDIO(hda);
- const struct desc_codec *desc = &duplex_nomixemu;
+ const struct desc_codec *desc = &duplex_mixemu;
if (!a->mixer) {
- desc = &duplex_mixemu;
+ desc = &duplex_nomixemu;
}
hda_audio_init(hda, desc, errp);
@@ -892,10 +892,10 @@ static void hda_audio_init_duplex(HDACodecDevice *hda, Error **errp)
static void hda_audio_init_micro(HDACodecDevice *hda, Error **errp)
{
HDAAudioState *a = HDA_AUDIO(hda);
- const struct desc_codec *desc = &micro_nomixemu;
+ const struct desc_codec *desc = &micro_mixemu;
if (!a->mixer) {
- desc = &micro_mixemu;
+ desc = &micro_nomixemu;
}
hda_audio_init(hda, desc, errp);