Changeset 55920 in vbox for trunk/src/VBox/Devices/Audio/DevIchHda.cpp

Timestamp:

May 18, 2015 7:11:51 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: AudioMixBuffer documentation, renaming.

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (8 diffs)

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

@@ -2210 +2210 @@
     {
         uint32_t cbRead = 0;
-        rc = audioMixerProcessSinkIn(pSink, AUDMIXOP_BLEND, pBdle->au8HdaBuffer, cb2Copy, &cbRead);
+        rc = AudioMixerProcessSinkIn(pSink, AUDMIXOP_BLEND, pBdle->au8HdaBuffer, cb2Copy, &cbRead);
         if (RT_SUCCESS(rc))
         {
@@ -2475 +2475 @@
         if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
         {
-            audioMixerRemoveStream(pSink, pDrv->LineIn.phStrmIn);
-            rc = audioMixerAddStreamIn(pSink,
+            AudioMixerRemoveStream(pSink, pDrv->LineIn.phStrmIn);
+            rc = AudioMixerAddStreamIn(pSink,
                                        pDrv->pConnector, pDrv->LineIn.pStrmIn,
                                        0 /* uFlags */, &pDrv->LineIn.phStrmIn);
@@ -2507 +2507 @@
         if (rc == VINF_SUCCESS) /* Note: Could return VWRN_ALREADY_EXISTS. */
         {
-            audioMixerRemoveStream(pThis->pSinkOutput, pDrv->Out.phStrmOut);
-            rc = audioMixerAddStreamOut(pThis->pSinkOutput,
+            AudioMixerRemoveStream(pThis->pSinkOutput, pDrv->Out.phStrmOut);
+            rc = AudioMixerAddStreamOut(pThis->pSinkOutput,
                                         pDrv->pConnector, pDrv->Out.pStrmOut,
                                         0 /* uFlags */, &pDrv->Out.phStrmOut);
@@ -2543 +2543 @@
 
     /* Set the volume. Codec already converted it to the correct range. */
-    audioMixerSetSinkVolume(pSink, &vol);
+    AudioMixerSetSinkVolume(pSink, &vol);
 
     LogFlowFuncLeaveRC(rc);
@@ -3589 +3589 @@
     if (pThis->pMixer)
     {
-        audioMixerDestroy(pThis->pMixer);
+        AudioMixerDestroy(pThis->pMixer);
         pThis->pMixer = NULL;
     }
@@ -3858 +3858 @@
     if (RT_SUCCESS(rc))
     {
-        rc = audioMixerCreate("HDA Mixer", 0 /* uFlags */, &pThis->pMixer);
+        rc = AudioMixerCreate("HDA Mixer", 0 /* uFlags */, &pThis->pMixer);
         if (RT_SUCCESS(rc))
         {
@@ -3868 +3868 @@
             streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS;
 
-            rc = audioMixerSetDeviceFormat(pThis->pMixer, &streamCfg);
+            rc = AudioMixerSetDeviceFormat(pThis->pMixer, &streamCfg);
             AssertRC(rc);
 
             /* Add all required audio sinks. */
-            rc = audioMixerAddSink(pThis->pMixer, "[Playback] PCM Output",
+            rc = AudioMixerAddSink(pThis->pMixer, "[Playback] PCM Output",
                                    AUDMIXSINKDIR_OUTPUT, &pThis->pSinkOutput);
             AssertRC(rc);
 
-            rc = audioMixerAddSink(pThis->pMixer, "[Recording] Line In",
+            rc = AudioMixerAddSink(pThis->pMixer, "[Recording] Line In",
                                    AUDMIXSINKDIR_INPUT, &pThis->pSinkLineIn);
             AssertRC(rc);
 
-            rc = audioMixerAddSink(pThis->pMixer, "[Recording] Microphone In",
+            rc = AudioMixerAddSink(pThis->pMixer, "[Recording] Microphone In",
                                    AUDMIXSINKDIR_INPUT, &pThis->pSinkMicIn);
             AssertRC(rc);
@@ -3886 +3886 @@
             /* There is no master volume control. Set the master to max. */
             PDMAUDIOVOLUME vol = { false, 255, 255 };
-            rc = audioMixerSetMasterVolume(pThis->pMixer, &vol);
+            rc = AudioMixerSetMasterVolume(pThis->pMixer, &vol);
             AssertRC(rc);
         }