Changeset 31855 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Aug 23, 2010 11:34:18 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: fixes input/output volume control.

File:

• trunk/src/VBox/Devices/Audio/DevCodec.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DevCodec.cpp

@@ -251 +251 @@
             codecToAudVolume(pAmplifier, AUD_MIXER_VOLUME);
         if (CODEC_NID(cmd) == 0x17) /* Microphone */
-            codecToAudVolume(pAmplifier, AUD_MIXER_PCM);
+            codecToAudVolume(pAmplifier, AUD_MIXER_LINE_IN);
     }
     return VINF_SUCCESS;
@@ -1120 +1120 @@
     {
         case AUD_MIXER_VOLUME:
+        case AUD_MIXER_PCM:
             dir = AMPLIFIER_OUT;
             break;
-        case AUD_MIXER_PCM:
         case AUD_MIXER_LINE_IN:
             dir = AMPLIFIER_IN;
@@ -1263 +1263 @@
         LogRel (("HDAcodec: WARNING: Unable to open PCM OUT!\n"));
     codecToAudVolume(&pState->pNodes[2].dac.B_params, AUD_MIXER_VOLUME);
-    codecToAudVolume(&pState->pNodes[0x17].adcvol.B_params, AUD_MIXER_PCM);
+    codecToAudVolume(&pState->pNodes[0x17].adcvol.B_params, AUD_MIXER_LINE_IN);
     return VINF_SUCCESS;
 }
@@ -1281 +1281 @@
     SSMR3GetMem (pSSMHandle, pCodecState->pNodes, sizeof(CODECNODE) * STAC9220_NODE_COUNT);
     codecToAudVolume(&pCodecState->pNodes[2].dac.B_params, AUD_MIXER_VOLUME);
-    codecToAudVolume(&pCodecState->pNodes[0x17].adcvol.B_params, AUD_MIXER_PCM);
-    return VINF_SUCCESS;
-}
+    codecToAudVolume(&pCodecState->pNodes[0x17].adcvol.B_params, AUD_MIXER_LINE_IN);
+    return VINF_SUCCESS;
+}