Changeset 55005 in vbox for trunk/include

Timestamp:

Mar 30, 2015 12:07:39 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99276

Message:

PDM/Audio: Added volume through virtual mixer.

File:

• trunk/include/VBox/vmm/pdmaudioifs.h (modified) (7 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -30 +30 @@
 #include <iprt/list.h>
 
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
 typedef struct
 {
@@ -36 +37 @@
     uint32_t l;
 } volume_t;
+#endif
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
@@ -137 +139 @@
     PDMAUDIOMIXERCTL_PCM,
     PDMAUDIOMIXERCTL_LINE_IN,
+    PDMAUDIOMIXERCTL_MIC_IN,
     /** Hack to blow the type up to 32-bit. */
     PDMAUDIOMIXERCTL_32BIT_HACK = 0x7fffffff
@@ -199 +202 @@
     bool        fSwapEndian;
 } PDMPCMPROPS, *PPDMPCMPROPS;
+
+/**
+ * Structure keeping an audio volume level.
+ */
+typedef struct PDMAUDIOVOLUME
+{
+    /** Set to @c true if this stream is muted, @c false if not. */
+    bool                   fMuted;
+    /** Left channel volume. */
+    uint32_t               uLeft;
+    /** Right channel volume. */
+    uint32_t               uRight;
+} PDMAUDIOVOLUME, *PPDMAUDIOVOLUME;
 
 /**
@@ -243 +259 @@
      *  in the samples buffer. */
     uint32_t               offReadWrite;
-    /** Total samples already mixed down to the
-     *  parent buffer (if any). Always starting at
-     *  the parent's offReadWrite position.
-     *  Note: Count always is specified in parent samples,
-     *        as the sample count can differ between parent
-     *        and child. */
+    /**
+     * Total samples already mixed down to the parent buffer (if any). Always starting at
+     * the parent's offReadWrite position.
+     *
+     * Note: Count always is specified in parent samples, as the sample count can differ between parent
+     *       and child.
+     */
     uint32_t               cMixed;
     uint32_t               cProcessed;
     /** Pointer to parent buffer (if any). */
     PPDMAUDIOMIXBUF        pParent;
-    /** List of children mix buffers to keep
-     *  in sync with (if being a parent buffer). */
+    /** List of children mix buffers to keep in sync with (if being a parent buffer). */
     RTLISTANCHOR           lstBuffers;
-    /** Intermediate structure for buffer
-     *  conversion tasks. */
+    /** Intermediate structure for buffer conversion tasks. */
     PPDMAUDIOSTRMRATE      pRate;
+    /** Current volume used for mixing. */
+    PDMAUDIOVOLUME         Volume;
     /** This buffer's audio format. */
     PDMAUDIOMIXBUFFMT      AudioFmt;
@@ -335 +352 @@
     /** Guest audio output stream has some samples or not. */
     bool                   fEmpty;
-    /** Set to @c true if this stream is muted, @c false if not. */
-    bool                   fMuted;
     /** Name of this stream. */
     char                  *pszName;
-    /** Left channel volume. */
-    uint32_t               uVolumeLeft;
-    /** Right channel volume. */
-    uint32_t               uVolumeRight;
 } PDMAUDIOGSTSTRMSTATE, *PPDMAUDIOGSTSTRMSTATE;
 
@@ -443 +454 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnInitNull, (PPDMIAUDIOCONNECTOR pInterface));
-
-    /**
-     * Sets the audio volume of a specific guest output stream.
-     *
-     * @returns VBox status code.
-     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
-     * @param   pGstStrmOut     Pointer to guest output stream.
-     * @param   fMute           Whether to mute or not.
-     * @param   uVolLeft        Left audio stream volume.
-     * @param   uVolRight       Right audio stream volume.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnSetVolumeOut, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOGSTSTRMOUT pGstStrmOut,
-                                                bool fMute, uint8_t uVolLeft, uint8_t uVolRight));
-
-    /**
-     * Sets the overall audio volume.
-     *
-     * @returns VBox status code.
-     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
-     * @param   fMute           Whether to mute or not.
-     * @param   uVolLeft        Left audio stream volume.
-     * @param   uVolRight       Right audio stream volume.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnSetVolume, (PPDMIAUDIOCONNECTOR pInterface,
-                                             bool fMute, uint8_t uVolLeft, uint8_t uVolRight));
 
     /**