- we need the QEMU_HDA_AMP_CAPS for Spice to handle the volume of HDA - without MIXEMU, volume control on the guest just feels wrong because it has no effect (when it is not applied by the guest)
- after all, it's the role of qemu to emulate devices, and volume effect shouldn't be excluded --- audio/mixeng.c | 6 ------ configure | 8 -------- hw/hda-audio.c | 4 ---- 3 files changed, 0 insertions(+), 18 deletions(-) diff --git a/audio/mixeng.c b/audio/mixeng.c index 5446be6..0b060e3 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -336,7 +336,6 @@ void mixeng_clear (struct st_sample *buf, int len) void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol) { -#ifdef CONFIG_MIXEMU if (vol->mute) { mixeng_clear (buf, len); return; @@ -352,9 +351,4 @@ void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol) #endif buf += 1; } -#else - (void) buf; - (void) len; - (void) vol; -#endif } diff --git a/configure b/configure index 4278eb1..eadea22 100755 --- a/configure +++ b/configure @@ -165,7 +165,6 @@ darwin_user="no" bsd_user="no" guest_base="" uname_release="" -mixemu="no" aix="no" blobs="yes" pkgversion="" @@ -716,8 +715,6 @@ for opt do ;; --enable-nptl) nptl="yes" ;; - --enable-mixemu) mixemu="yes" - ;; --disable-linux-aio) linux_aio="no" ;; --enable-linux-aio) linux_aio="yes" @@ -967,7 +964,6 @@ echo " --audio-card-list=LIST set list of emulated audio cards [$audio_card_l echo " Available cards: $audio_possible_cards" echo " --block-drv-whitelist=L set block driver whitelist" echo " (affects only QEMU, not qemu-img)" -echo " --enable-mixemu enable mixer emulation" echo " --disable-xen disable xen backend driver support" echo " --enable-xen enable xen backend driver support" echo " --disable-brlapi disable BrlAPI" @@ -2687,7 +2683,6 @@ echo "mingw32 support $mingw32" echo "Audio drivers $audio_drv_list" echo "Extra audio cards $audio_card_list" echo "Block whitelist $block_drv_whitelist" -echo "Mixer emulation $mixemu" echo "VNC support $vnc" if test "$vnc" = "yes" ; then echo "VNC TLS support $vnc_tls" @@ -2848,9 +2843,6 @@ if test "$audio_win_int" = "yes" ; then echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak fi echo "CONFIG_BDRV_WHITELIST=$block_drv_whitelist" >> $config_host_mak -if test "$mixemu" = "yes" ; then - echo "CONFIG_MIXEMU=y" >> $config_host_mak -fi if test "$vnc" = "yes" ; then echo "CONFIG_VNC=y" >> $config_host_mak fi diff --git a/hw/hda-audio.c b/hw/hda-audio.c index c699d6f..03c0a24 100644 --- a/hw/hda-audio.c +++ b/hw/hda-audio.c @@ -121,15 +121,11 @@ static void hda_codec_parse_fmt(uint32_t format, struct audsettings *as) #define QEMU_HDA_AMP_NONE (0) #define QEMU_HDA_AMP_STEPS 0x4a -#ifdef CONFIG_MIXEMU #define QEMU_HDA_AMP_CAPS \ (AC_AMPCAP_MUTE | \ (QEMU_HDA_AMP_STEPS << AC_AMPCAP_OFFSET_SHIFT) | \ (QEMU_HDA_AMP_STEPS << AC_AMPCAP_NUM_STEPS_SHIFT) | \ (3 << AC_AMPCAP_STEP_SIZE_SHIFT)) -#else -#define QEMU_HDA_AMP_CAPS QEMU_HDA_AMP_NONE -#endif /* common: audio output widget */ static const desc_param common_params_audio_dac[] = { -- 1.7.6.2