Changeset 53523 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvHostOSSAudio.cpp (modified) (5 diffs)
• Devices/Makefile.kmk (modified) (3 diffs)
• Devices/build/VBoxDD.cpp (modified) (3 diffs)
• Devices/build/VBoxDD.h (modified) (2 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (2 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;

trunk/src/VBox/Devices/Makefile.kmk

@@ -529 +529 @@
 
   ifeq ($(KBUILD_TARGET),linux)
-   VBoxDD_SOURCES  += \
-                Audio/DrvHostOssAudio.cpp
+   VBoxDD_SOURCES += \
+                Audio/DrvHostOSSAudio.cpp
+
    ifdef VBOX_WITH_PULSE
     VBoxDD_DEFS    += VBOX_WITH_PULSE
@@ -539 +540 @@
 
    ifdef VBOX_WITH_ALSA
-    VBoxDD_DEFS.linux    += VBOX_WITH_ALSA
-    VBoxDD_SOURCES.linux += \
-        Audio/DrvHostAlsaAudio.cpp \
-        Audio/alsa_stubs.c
+    VBoxDD_DEFS    += VBOX_WITH_ALSA
+    VBoxDD_SOURCES += \
+                Audio/DrvHostALSAAudio.cpp \
+                Audio/alsa_stubs.c
    endif
   endif
@@ -548 +549 @@
   ifeq ($(KBUILD_TARGET),freebsd)
    VBoxDD_SOURCES  += \
-                Audio/DrvHostOssAudio.cpp
+                Audio/DrvHostOSSAudio.cpp
    ifdef VBOX_WITH_PULSE
     VBoxDD_DEFS    += VBOX_WITH_PULSE

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -125 +125 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-    //rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAudioVRDE);
-    //if (RT_FAILURE(rc))
-    //    return rc;
-#else
+#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceAudioSniffer);
     if (RT_FAILURE(rc))
@@ -296 +292 @@
     if (RT_FAILURE(rc))
         return rc;
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostALSAAudio);
+    if (RT_FAILURE(rc))
+        return rc;    
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
+    if (RT_FAILURE(rc))
+        return rc;    
 # endif
 # if defined(RT_OS_FREEBSD)
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOssAudio);
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
     if (RT_FAILURE(rc))
         return rc;
@@ -308 +310 @@
 # endif
 # if defined(RT_OS_SOLARIS)
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
+    if (RT_FAILURE(rc))
+        return rc;   
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostSolAudio);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -125 +125 @@
 # if defined(RT_OS_LINUX)
 extern const PDMDRVREG g_DrvHostPulseAudio;
+extern const PDMDRVREG g_DrvHostALSAAudio;
+extern const PDMDRVREG g_DrvHostOSSAudio;
 # endif
 # if defined(RT_OS_DARWIN)
@@ -130 +132 @@
 # endif
 # if defined(RT_OS_SOLARIS)
+extern const PDMDRVREG g_DrvHostOSSAudio;
 extern const PDMDRVREG g_DrvHostSolAudio;
 # endif
 # if defined(RT_OS_FREEBSD)
-extern const PDMDRVREG g_DrvHostOssAudio;
+extern const PDMDRVREG g_DrvHostOSSAudio;
 # endif
 #endif

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2721 +2721 @@
                 {
 # ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                    InsertConfigString(pLunL1, "Driver", "AlsaAudio");
+                    InsertConfigString(pLunL1, "Driver", "ALSAAudio");
 # else
                     InsertConfigString(pCfg, "AudioDriver", "alsa");
@@ -2743 +2743 @@
                 {
 # ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-//                    #error "Port OSS audio backend!" /** @todo Port OSS driver. */
+                    InsertConfigString(pLunL1, "Driver", "OSSAudio");
 # else
                     InsertConfigString(pCfg, "AudioDriver", "ossaudio");