diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
| commit | 62a5715c0af49b62b331c2538025a8ab5ce6c6e5 (patch) | |
| tree | d4ddd30e61ba20eca4a3ba0f63f2e33c8573dfa0 /src/VBox/Devices/Config.kmk | |
| parent | Releasing progress-linux version 7.0.18-dfsg-2~progress7.99u1. (diff) | |
| download | virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.tar.xz virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.zip | |
Merging upstream version 7.0.20-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/VBox/Devices/Config.kmk')
| -rw-r--r-- | src/VBox/Devices/Config.kmk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/VBox/Devices/Config.kmk b/src/VBox/Devices/Config.kmk index f24024f8..335a83eb 100644 --- a/src/VBox/Devices/Config.kmk +++ b/src/VBox/Devices/Config.kmk @@ -112,7 +112,7 @@ TEMPLATE_VBoxBios32Lib_POST_CMDS = $(NO_SUCH_VARIABLE) # VBOX_AUDIO_DEFS := if 0 # Not stable yet. - # Enable microphone-in support for HDA. Otherwise only line-in is supported. + # Enable dedicated microphone-in support for HDA. Otherwise only line-in is supported. VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_HDA_MIC_IN # Enable interleavig streams support for HDA. Needed for 5.1 surround support. @@ -123,6 +123,16 @@ if 0 # Not stable yet. VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_HDA_51_SURROUND endif +# If dedicated microphone-in support for HDA isn't enabled, treat mic-in as line-in to +# propagate the volume (+ mute) settings appropriately. +ifndef VBOX_WITH_AUDIO_HDA_MIC_IN + VBOX_AUDIO_DEFS += VBOX_AUDIO_HDA_MIC_IN_AS_LINE_IN +endif + +if defined(VBOX_WITH_AUDIO_HDA_MIC_IN) && defined(VBOX_AUDIO_HDA_MIC_IN_AS_LINE_IN) + $(error Defining VBOX_WITH_AUDIO_HDA_MIC_IN and VBOX_AUDIO_HDA_MIC_IN_AS_LINE_IN at the same time makes no sense!) +endif + # Enable backend-independent device enumeration support. VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_ENUM |