Changeset 53523 in vbox for trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp

Timestamp:

Dec 12, 2014 1:46:29 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Add ALSA backend (work in progress).

File:

• trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (modified) (5 diffs)

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

@@ -68 +68 @@
 {
     /** Note: Always must come first! */
-    PDMAUDIOHSTSTRMIN  hw;
+    PDMAUDIOHSTSTRMIN  pStreamIn;
     int                hFile;
     int                cFragments;
@@ -79 +79 @@
 {
     /** Note: Always must come first! */
-    PDMAUDIOHSTSTRMOUT  hw;
+    PDMAUDIOHSTSTRMOUT  pStreamOut;
     int                 hFile;
     int                 cFragments;
@@ -204 +204 @@
 }
 
-static void drvHostOSSAudioClose(int *phFile)
-{
-    if (!phFile)
-        return;
-
-    if (*phFile) 
-    {
-        if (close(*phFile))
-            LogRel(("Audio: Closing descriptor failed: %s\n", 
-                    strerror(errno)));
-        else
-            *phFile = -1;
+static int drvHostOSSAudioClose(int *phFile)
+{
+    if (!phFile || !*phFile)
+        return VINF_SUCCESS;
+
+    int rc;
+    if (close(*phFile))
+    {
+        LogRel(("Audio: Closing descriptor failed: %s\n", 
+                strerror(errno)));
+        rc = VERR_GENERAL_FAILURE; /** @todo */
     }
+    else
+    {
+        *phFile = -1;
+        rc = VINF_SUCCESS;
+    }
+
+    return rc;
 }
 
@@ -232 +238 @@
     do 
     {
-        const char *pszDSP = fIn ? s_OSSConf.devpath_in : s_OSSConf.devpath_out;
-        if (!pszDSP)
-        {
-            LogRel(("Audio: Invalid or no %s DSP set\n", 
+        const char *pszDev = fIn ? s_OSSConf.devpath_in : s_OSSConf.devpath_out;
+        if (!pszDev)
+        {
+            LogRel(("Audio: Invalid or no %s device name set\n", 
                     fIn ? "input" : "output"));
             rc = VERR_INVALID_PARAMETER;
@@ -241 +247 @@
         }
 
-        hFile = open(pszDSP, (fIn ? O_RDONLY : O_WRONLY) | O_NONBLOCK);
-        if (!hFile) 
-        {
-            LogRel(("Audio: Failed to open %s: %s\n", pszDSP, strerror(errno)));
+        hFile = open(pszDev, (fIn ? O_RDONLY : O_WRONLY) | O_NONBLOCK);
+        if (hFile == -1) 
+        {
+            LogRel(("Audio: Failed to open %s: %s\n", pszDev, strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
             break;