OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hda-audio: fix non-mixer codecs 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTX2rwAAoJEEy22O7T6HE4JLcP/1bqf2Sx+tGA0mgVtWgkgemA
 FHZLPmrtZOYe6WL1opcB7wgSmQPw+i4RHB8/tBg4t7h8d2d+3kb1zUFkAjpDaJkL
 x0veR4ulkGFskQNe0V6gEuo9jfhicunfUTtv3nnI1H3DwnqJ2dFG58nqzNpL1tQK
 Cu0lSaj0oLthUxtBkH8n+V0xW8vlUuRu2xamO+m4l2JLq4cCU1pmlNjbVpssngE3
 IsNgyCI6BXCWtxIk55Fn//eXWkDD42k5U1jRhX3Xg/Jc0x0cYlul37ZjJpWzio8m
 VmD2coPLQ6fDYFnNUWiv8VDSRqdQopBWL86/TK4ewTNCDA93Dy8oWvTdmXlLPQnG
 DjFa27xnbarwF+ezLbHauucW9MOBOk4/V40F/CmCfHbrYLzfe5vHKXdshmOFTJGX
 S9/6AqgjbVlBfDU8P/7V8W117pLK5Pz7zE2eqCoke5dOokoBCkLoXz1Dp0gvurg6
 8mMZwx4Q5SBhBY0edgaJquh/vP/kISafOEpMaBzOpYBNgoMeyBhp6Q1p4UyBDIzP
 qEiU+n30zTP+AiP88+YuQ4kh+epYUpE8DNLy5oZPsIuwgtRfFaaizZIUBD0+HwXi
 aVOF5PLW0YNAiow1lj4nyDmZcPRLHoAdlEZxpxoQkHgp6tD9Dwq8NGDnfm91YRLL
 QjQqmDg/GaXzWyjrTMkl
 =Utj1
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-4' into staging

hda-audio: fix non-mixer codecs

# gpg: Signature made Tue 29 Apr 2014 10:03:44 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-audio-4:
  hda-audio: fix non-mixer codecs

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-05-01 13:05:54 +01:00
parent b006f8162e 4843877e5d
commit 61e5b75c17
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/audio/hda-codec.c
View File

@ -261,6 +261,9 @@ static void hda_audio_set_amp(HDAAudioStream *st)
left = left * 255 / QEMU_HDA_AMP_STEPS;
right = right * 255 / QEMU_HDA_AMP_STEPS;
if (!st->state->mixer) {
return;
}
if (st->output) {
AUD_set_volume_out(st->voice.out, muted, left, right);
} else {