Changeset 89010 in vbox for trunk/src/VBox/Devices

Timestamp:

May 12, 2021 12:52:13 PM (4 years ago)

Author:

vboxsync

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

144349

Message:

Audio/ValKit: First tones can be played back by VKAT now. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTest.cpp (modified) (1 diff)
• AudioTest.h (modified) (1 diff)
• VBoxDDVKAT.h (modified) (1 diff)

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

@@ -93 +93 @@
 
     memcpy(&pTone->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
+
+    pTone->enmType = AUDIOTESTTONETYPE_SINE; /* Only type implemented so far. */
 
     return pTone->rdFreqHz;

trunk/src/VBox/Devices/Audio/AudioTest.h

@@ -27 +27 @@
 
 /**
+ * Enumeration for an audio test tone (wave) type.
+ */
+typedef enum AUDIOTESTTONETYPE
+{
+    /** Invalid type. */
+    AUDIOTESTTONETYPE_INVALID = 0,
+    /** Sine wave. */
+    AUDIOTESTTONETYPE_SINE,
+    /** Square wave. Not implemented yet. */
+    AUDIOTESTTONETYPE_SQUARE,
+    /** Triangluar wave. Not implemented yet. */
+    AUDIOTESTTONETYPE_TRIANGLE,
+    /** Sawtooth wave. Not implemented yet. */
+    AUDIOTESTTONETYPE_SAWTOOTH,
+    /** The usual 32-bit hack. */
+    AUDIOTESTTONETYPE_32BIT_HACK = 0x7fffffff
+} AUDIOTESTTONETYPE;
+
+/**
  * Structure for handling an audio (sine wave) test tone.
  */
 typedef struct AUDIOTESTTONE
 {
+    /** The tone's wave type. */
+    AUDIOTESTTONETYPE   enmType;
     /** The PCM properties. */
-    PDMAUDIOPCMPROPS Props;
+    PDMAUDIOPCMPROPS    Props;
     /** Current sample index for generate the sine wave. */
-    uint64_t         uSample;
+    uint64_t            uSample;
     /** The fixed portion of the sin() input. */
-    double           rdFixed;
+    double              rdFixed;
     /** Frequency (in Hz) of the sine wave to generate. */
-    double           rdFreqHz;
+    double              rdFreqHz;
 } AUDIOTESTTONE;
 /** Pointer to an audio test tone. */

trunk/src/VBox/Devices/Audio/VBoxDDVKAT.h

@@ -137 +137 @@
 DECLINLINE(int) CFGMR3QueryStringDef(PCFGMNODE pNode, const char *pszName, char *pszString, size_t cchString, const char *pszDef)
 {
-    RT_NOREF(pNode, pszName, pszString, cchString, pszDef);
-    return 0;
+    RT_NOREF(pNode, pszName);
+    return RTStrCopy(pszString, cchString, pszDef); /* Just return the expected default value. */
 }