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

Timestamp:

Mar 11, 2016 12:59:22 PM (9 years ago)

Author:

vboxsync

Message:

Build fix for Solaris.

File:

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

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

@@ -40 +40 @@
 #if ((SOUND_VERSION > 360) && (defined(OSS_SYSINFO)))
 /* OSS > 3.6 has a new syscall available for querying a bit more detailed information
- * about OSS' audio capabilities. */
+ * about OSS' audio capabilities. This is handy for e.g. Solaris. */
 # define VBOX_WITH_OSS_SYSINFO 1
 #endif
@@ -609 +609 @@
             if (err == 0)
             {
-                LogRel2(("OSS: Number of DSPs: %d\n", ossVer.numaudios));
-                LogRel2(("OSS: Number of mixers: %d\n", ossVer.nummixers));
-                /** @todo Determine number of input devices + output devices. */
+                LogRel2(("OSS: Number of DSPs: %d\n", ossInfo.numaudios));
+                LogRel2(("OSS: Number of mixers: %d\n", ossInfo.nummixers));
+
+                int cDev = ossInfo.nummixers;
+                if (!cDev)
+                    cDev = ossInfo.numaudios;
+
+                pCfg->cSources        = cDev;
+                pCfg->cSinks          = cDev;
+
+                pCfg->cMaxStreamsIn   = UINT32_MAX;
+                pCfg->cMaxStreamsOut  = UINT32_MAX;
             }
             else
@@ -621 +630 @@
                 pCfg->cSinks          = 1;
 
-                pCfg->cMaxStreamsIn   = UINT32_MAX; /* Line in + microphone in. */
+                pCfg->cMaxStreamsIn   = UINT32_MAX;
                 pCfg->cMaxStreamsOut  = UINT32_MAX;
 #ifdef VBOX_WITH_OSS_SYSINFO