Changeset 69876 in vbox

Timestamp:

Nov 30, 2017 9:49:32 AM (7 years ago)

Author:

vboxsync

Message:

Audio/SB16: Fixed volume handling.

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (7 diffs)

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

@@ -1214 +1214 @@
 }
 
-static void sb16SetMasterVolume(PSB16STATE pThis)
+/**
+ * Returns the device's current master volume.
+ *
+ * @param   pThis               SB16 state.
+ * @param   pVol                Where to store the master volume information.
+ */
+static void sb16GetMasterVolume(PSB16STATE pThis, PPDMAUDIOVOLUME pVol)
 {
     /* There's no mute switch, only volume controls. */
@@ -1220 +1226 @@
     uint8_t rvol = sb16MixRegToVol(pThis, 0x31);
 
-    PDMAUDIOVOLUME Vol = { false /* fMute */, lvol, rvol };
-
-    PSB16DRIVER pDrv;
-    RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
-    {
-        int rc2 = pDrv->pConnector->pfnStreamSetVolume(pDrv->pConnector, pDrv->Out.pStream, &Vol);
-        AssertRC(rc2);
-    }
-}
-
-static void sb16SetPcmOutVolume(PSB16STATE pThis)
+    pVol->fMuted = false;
+    pVol->uLeft  = lvol;
+    pVol->uRight = rvol;
+}
+
+/**
+ * Returns the device's current output stream volume.
+ *
+ * @param   pThis               SB16 state.
+ * @param   pVol                Where to store the output stream volume information.
+ */
+static void sb16GetPcmOutVolume(PSB16STATE pThis, PPDMAUDIOVOLUME pVol)
 {
     /* There's no mute switch, only volume controls. */
@@ -1236 +1243 @@
     uint8_t rvol = sb16MixRegToVol(pThis, 0x33);
 
-    PDMAUDIOVOLUME Vol = { false /* fMute */, lvol, rvol };
+    pVol->fMuted = false;
+    pVol->uLeft  = lvol;
+    pVol->uRight = rvol;
+}
+
+static void sb16UpdateVolume(PSB16STATE pThis)
+{
+    PDMAUDIOVOLUME VolMaster;
+    sb16GetMasterVolume(pThis, &VolMaster);
+
+    PDMAUDIOVOLUME VolOut;
+    sb16GetPcmOutVolume(pThis, &VolOut);
+
+    /* Combine the master + output stream volume. */
+    PDMAUDIOVOLUME VolCombined;
+    RT_ZERO(VolCombined);
+
+    VolCombined.fMuted = VolMaster.fMuted || VolOut.fMuted;
+    if (!VolCombined.fMuted)
+    {
+        VolCombined.uLeft  = (   (VolOut.uLeft    ? VolOut.uLeft     : 1)
+                               * (VolMaster.uLeft ? VolMaster.uLeft  : 1)) / PDMAUDIO_VOLUME_MAX;
+
+        VolCombined.uRight = (  (VolOut.uRight    ? VolOut.uRight    : 1)
+                              * (VolMaster.uRight ? VolMaster.uRight : 1)) / PDMAUDIO_VOLUME_MAX;
+    }
 
     PSB16DRIVER pDrv;
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
     {
-        int rc2 = pDrv->pConnector->pfnStreamSetVolume(pDrv->pConnector, pDrv->Out.pStream, &Vol);
+        int rc2 = pDrv->pConnector->pfnStreamSetVolume(pDrv->pConnector, pDrv->Out.pStream, &VolCombined);
         AssertRC(rc2);
     }
@@ -1511 +1543 @@
 
     /* Update the master (mixer) and PCM out volumes. */
-    sb16SetMasterVolume(pThis);
-    sb16SetPcmOutVolume(pThis);
+    sb16UpdateVolume(pThis);
 }
 
@@ -1686 +1717 @@
 
     /* Update the master (mixer) volume. */
-    if (fUpdateMaster)
-        sb16SetMasterVolume(pThis);
-
-    /* Update the stream (PCM) volume. */
-    if (fUpdateStream)
-        sb16SetPcmOutVolume(pThis);
+    if (   fUpdateMaster
+        || fUpdateStream)
+    {
+        sb16UpdateVolume(pThis);
+    }
 
     return VINF_SUCCESS;
@@ -2184 +2214 @@
 
     /* Update the master (mixer) and PCM out volumes. */
-    sb16SetMasterVolume(pThis);
-    sb16SetPcmOutVolume(pThis);
+    sb16UpdateVolume(pThis);
 
     return VINF_SUCCESS;
@@ -2342 +2371 @@
             rc = rc2;
     }
+
+    sb16UpdateVolume(pThis);
 
     LogFlowFuncLeaveRC(rc);