Index: /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp	(revision 88298)
+++ /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp	(revision 88299)
@@ -142,5 +142,5 @@
  * audio frames.
  *
- * @return  IPRT status code. VINF_TRY_AGAIN for getting next pointer at beginning (circular).
+ * @returns VBox status code. VINF_TRY_AGAIN for getting next pointer at beginning (circular).
  * @param   pMixBuf                 Mixing buffer to acquire audio frames from.
  * @param   cFrames                 Number of requested audio frames to write.
@@ -364,5 +364,5 @@
  * Allocates the internal audio frame buffer.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to allocate frame buffer for.
  * @param   cFrames                 Number of audio frames to allocate.
@@ -774,5 +774,5 @@
  * Converts a PDM audio volume to an internal mixing buffer volume.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pVolDst                 Where to store the converted mixing buffer volume.
  * @param   pVolSrc                 Volume to convert.
@@ -798,5 +798,5 @@
  * Initializes a mixing buffer.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to initialize.
  * @param   pszName                 Name of mixing buffer for easier identification. Optional.
@@ -908,5 +908,5 @@
  * then will automatically do the (needed) conversion.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to link parent to.
  * @param   pParent                 Parent mixing buffer to use for linking.
@@ -1049,5 +1049,5 @@
  * Mixes audio frames from a source mixing buffer to a destination mixing buffer.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  *          VERR_BUFFER_UNDERFLOW if the source did not have enough audio data.
  *          VERR_BUFFER_OVERFLOW if the destination did not have enough space to store the converted source audio data.
@@ -1232,5 +1232,5 @@
  * Mixes audio frames down to the parent mixing buffer, extended version.
  *
- * @return  IPRT status code. See audioMixBufMixTo() for a more detailed explanation.
+ * @returns VBox status code. See audioMixBufMixTo() for a more detailed explanation.
  * @param   pMixBuf                 Source mixing buffer to mix to its parent.
  * @param   cSrcOffset              Offset (in frames) of source mixing buffer.
@@ -1250,5 +1250,5 @@
  * Mixes audio frames down to the parent mixing buffer.
  *
- * @return  IPRT status code. See audioMixBufMixTo() for a more detailed explanation.
+ * @returns VBox status code. See audioMixBufMixTo() for a more detailed explanation.
  * @param   pMixBuf                 Source mixing buffer to mix to its parent.
  * @param   cSrcFrames              Number of source audio frames to mix to its parent.
@@ -1265,5 +1265,5 @@
  * Internal helper function for debugging. Do not use directly.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to print.
  * @param   pszFunc                 Function name to log this for.
@@ -1319,5 +1319,5 @@
  * Do not use directly.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to print.
  * @param   pszFunc                 Function name to print the chain for.
@@ -1364,5 +1364,5 @@
  * For debug versions only.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to print.
  */
@@ -1393,5 +1393,5 @@
  * For debug versions only.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to print.
  */
@@ -1429,5 +1429,5 @@
  * Reads audio frames at a specific offset.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to read audio frames from.
  * @param   offFrames               Offset (in audio frames) to start reading from.
@@ -1446,5 +1446,5 @@
  * not match the output will be converted accordingly.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf     Mixing buffer to read audio frames from.
  * @param   pDstProps   The target format.
@@ -1633,5 +1633,5 @@
  * Returns the current read position of a mixing buffer.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to return position for.
  */
@@ -1706,5 +1706,5 @@
  * Unlinks a mixing buffer from its parent, if any.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to unlink from parent.
  */
@@ -1768,5 +1768,5 @@
  * The sample format being written must match the format of the mixing buffer.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Pointer to mixing buffer to write to.
  * @param   offFrames               Offset (in frames) starting to write at.
@@ -1789,5 +1789,5 @@
  * the mixing buffer operates on.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf     Pointer to mixing buffer to write to.
  * @param   pSrcProps   The source format.
@@ -1892,6 +1892,7 @@
  * The sample format being written must match the format of the mixing buffer.
  *
- * @return  IPRT status code, or VERR_BUFFER_OVERFLOW if frames which not have
- *          been processed yet have been overwritten (due to cyclic buffer).
+ * @returns VBox status code
+ * @retval  VERR_BUFFER_OVERFLOW if frames which not have been processed yet
+ *          have been overwritten (due to cyclic buffer).
  * @param   pMixBuf                 Pointer to mixing buffer to write to.
  * @param   pvBuf                   Pointer to audio buffer to be written.
@@ -1908,5 +1909,6 @@
  * This function might write less data at once than requested.
  *
- * @return  IPRT status code, or VERR_BUFFER_OVERFLOW no space is available for writing anymore.
+ * @returns VBox status code
+ * @retval  VERR_BUFFER_OVERFLOW no space is available for writing anymore.
  * @param   pMixBuf     Pointer to mixing buffer to write to.
  * @param   pSrcProps   The source format.
@@ -2009,5 +2011,5 @@
  * Returns the current write position of a mixing buffer.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixBuf                 Mixing buffer to return position for.
  */
Index: /trunk/src/VBox/Devices/Audio/AudioMixer.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/AudioMixer.cpp	(revision 88298)
+++ /trunk/src/VBox/Devices/Audio/AudioMixer.cpp	(revision 88299)
@@ -160,5 +160,5 @@
  * Creates an audio sink and attaches it to the given mixer.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixer              Mixer to attach created sink to.
  * @param   pszName             Name of the sink to create.
@@ -210,5 +210,5 @@
  * Creates an audio mixer.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pcszName            Name of the audio mixer.
  * @param   fFlags              Creation flags.
@@ -342,5 +342,5 @@
  * Invalidates all internal data, internal version.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixer              Mixer to invalidate data for.
  */
@@ -365,5 +365,5 @@
  * Invalidates all internal data.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixer              Mixer to invalidate data for.
  */
@@ -411,5 +411,5 @@
  * Removes a formerly attached audio sink for an audio mixer, internal version.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixer              Mixer to remove sink from.
  * @param   pSink               Sink to remove.
@@ -442,5 +442,5 @@
  * Removes a formerly attached audio sink for an audio mixer.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixer              Mixer to remove sink from.
  * @param   pSink               Sink to remove.
@@ -460,5 +460,5 @@
  * Sets the mixer's master volume.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixer              Mixer to set master volume for.
  * @param   pVol                Volume to set.
@@ -494,5 +494,5 @@
  * Adds an audio stream to a specific audio sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink to add audio stream to.
  * @param   pStream             Stream to add.
@@ -557,5 +557,5 @@
  * Creates an audio mixer stream.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink to use for creating the stream.
  * @param   pConn               Audio connector interface to use.
@@ -708,5 +708,5 @@
  * Controls a mixer sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Mixer sink to control.
  * @param   enmSinkCmd          Sink command to set.
@@ -1184,5 +1184,5 @@
  * Reads audio data from a mixer sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Mixer sink to read data from.
  * @param   enmOp               Mixer operation to use for reading the data.
@@ -1291,5 +1291,5 @@
  * Removes a mixer stream from a mixer sink, internal version.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink to remove mixer stream from.
  * @param   pStream             Stream to remove.
@@ -1455,5 +1455,5 @@
  * Sets the audio format of a mixer sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink to set audio format for.
  * @param   pPCMProps           Audio format (PCM properties) to set.
@@ -1528,5 +1528,5 @@
  * Set the current recording source of an input mixer sink, internal version.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Input mixer sink to set recording source for.
  * @param   pStream             Mixer stream to set as current recording source. Must be an input stream.
@@ -1601,5 +1601,5 @@
  * Set the current recording source of an input mixer sink.
  *
- * @return  IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Input mixer sink to set recording source for.
  * @param   pStream             Mixer stream to set as current recording source. Must be an input stream.
@@ -1625,5 +1625,5 @@
  * Sets the volume of an individual sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink to set volume for.
  * @param   pVol                Volume to set.
@@ -1658,5 +1658,5 @@
  * Updates a mixer sink, internal version.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Mixer sink to update.
  */
@@ -1819,5 +1819,5 @@
  * Updates (invalidates) a mixer sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Mixer sink to update.
  */
@@ -1841,5 +1841,5 @@
  * Updates the (master) volume of a mixer sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Mixer sink to update volume for.
  * @param   pVolMaster          Master volume to set.
@@ -1882,5 +1882,5 @@
  * Writes (buffered) output data of a sink's stream to the bound audio connector stream.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink of stream that contains the mixer stream.
  * @param   pMixStream          Mixer stream to write output data for.
@@ -1897,5 +1897,5 @@
  * Writes (buffered) output data of a sink's stream to the bound audio connector stream, extended version.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink of stream that contains the mixer stream.
  * @param   pMixStream          Mixer stream to write output data for.
@@ -1989,5 +1989,5 @@
  * only multiplex as much data as all streams can handle at this time.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink       Sink to write audio output to.
  * @param   pvBuf       Pointer to audio data to write.
@@ -2062,5 +2062,5 @@
  * Writes data to a mixer sink.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pSink               Sink to write data to.
  * @param   enmOp               Mixer operation to use when writing data to the sink.
@@ -2125,5 +2125,5 @@
  * Controls a mixer stream, internal version.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixStream          Mixer stream to control.
  * @param   enmCmd              Mixer stream command to use.
@@ -2187,5 +2187,5 @@
  * Controls a mixer stream.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
  * @param   pMixStream          Mixer stream to control.
  * @param   enmCmd              Mixer stream command to use.