Changeset 54235 in vbox

Timestamp:

Feb 17, 2015 3:08:51 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Remove unused code.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchAc97.cpp (modified) (3 diffs)
• DevIchHda.cpp (modified) (3 diffs)

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

@@ -260 +260 @@
     /** Stream for output. */
     AC97OUTPUTSTREAM                   Out;
-    /** Number of samples to play (output), needed
-     *  for the timer routine. */
-    uint32_t                           cSamplesLive;
 } AC97DRIVER, *PAC97DRIVER;
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
@@ -1289 +1286 @@
     LogFlowFuncEnter();
 
+    uint32_t cbIn, cbOut, cSamplesLive;
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
     {
-        uint32_t cbIn, cbOut;
         rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                              &cbIn, &cbOut, &pDrv->cSamplesLive);
+                                              &cbIn, &cbOut, &cSamplesLive);
         if (RT_SUCCESS(rc))
         {
             LogFlowFunc(("\tLUN#%RU8: [1] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
 
-            if (pDrv->cSamplesLive)
+            if (cSamplesLive)
             {
                 uint32_t cSamplesPlayed;
                 int rc2 = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, &cSamplesPlayed);
                 if (RT_SUCCESS(rc2))
-                {
                     LogFlowFunc(("LUN#%RU8: cSamplesLive=%RU32, cSamplesPlayed=%RU32\n",
-                                 pDrv->uLUN, pDrv->cSamplesLive, cSamplesPlayed));
-                    Assert(pDrv->cSamplesLive >= cSamplesPlayed);
-                    pDrv->cSamplesLive -= cSamplesPlayed;
-                }
+                                 pDrv->uLUN, cSamplesLive, cSamplesPlayed));
 
                 rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                                      &cbIn, &cbOut, &pDrv->cSamplesLive);
+                                                      &cbIn, &cbOut, &cSamplesLive);
                 if (RT_SUCCESS(rc))
                     LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
@@ -1319 +1312 @@
             cbOutMin = RT_MIN(cbOutMin, cbOut);
         }
-        else
-            pDrv->cSamplesLive = 0;
     }
 

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

@@ -605 +605 @@
     /** Stream for output. */
     HDAOUTPUTSTREAM                    Out;
-    /** Number of samples to play (output), needed
-     *  for the timer routine. */
-    uint32_t                           cSamplesLive;
 } HDADRIVER, *PHDADRIVER;
 #endif /* VBOX_WITH_PDM_AUDIO_DRIVER */
@@ -2550 +2547 @@
     LogFlowFuncEnter();
 
+    uint32_t cbIn, cbOut, cSamplesLive;
     RTListForEach(&pThis->lstDrv, pDrv, HDADRIVER, Node)
     {
-        uint32_t cbIn, cbOut;
         rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                              &cbIn, &cbOut, &pDrv->cSamplesLive);
+                                              &cbIn, &cbOut, &cSamplesLive);
         if (RT_SUCCESS(rc))
         {
             LogFlowFunc(("\tLUN#%RU8: [1] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
 
-            if (pDrv->cSamplesLive)
+            if (cSamplesLive)
             {
                 uint32_t cSamplesPlayed;
                 int rc2 = pDrv->pConnector->pfnPlayOut(pDrv->pConnector, &cSamplesPlayed);
                 if (RT_SUCCESS(rc2))
-                {
                     LogFlowFunc(("LUN#%RU8: cSamplesLive=%RU32, cSamplesPlayed=%RU32\n",
-                                 pDrv->uLUN, pDrv->cSamplesLive, cSamplesPlayed));
-                    Assert(pDrv->cSamplesLive >= cSamplesPlayed);
-                    pDrv->cSamplesLive -= cSamplesPlayed;
-                }
+                                 pDrv->uLUN, cSamplesLive, cSamplesPlayed));
 
                 rc = pDrv->pConnector->pfnQueryStatus(pDrv->pConnector,
-                                                      &cbIn, &cbOut, &pDrv->cSamplesLive);
+                                                      &cbIn, &cbOut, &cSamplesLive);
                 if (RT_SUCCESS(rc))
                     LogFlowFunc(("\tLUN#%RU8: [2] cbIn=%RU32, cbOut=%RU32\n", pDrv->uLUN, cbIn, cbOut));
@@ -2580 +2573 @@
             cbOutMin = RT_MIN(cbOutMin, cbOut);
         }
-        else
-            pDrv->cSamplesLive = 0;
     }