Changeset 91601 in vbox

Timestamp:

Oct 6, 2021 5:20:51 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Implemented setting the system's master volume to 100% on OSS. Untested. ​​bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp (modified) (4 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -38 +38 @@
 # include <alsa/version.h>
 # include "DrvHostAudioAlsaStubs.h"
+#endif
+#ifdef VBOX_WITH_AUDIO_OSS
+# include <fcntl.h>
+# include <sys/ioctl.h>
+# include <sys/mman.h>
+# include <sys/soundcard.h>
 #endif
 #ifdef RT_OS_WINDOWS
@@ -80 +86 @@
 *********************************************************************************************************************************/
 
+#ifdef VBOX_WITH_AUDIO_ALSA
 /**
- * Sets the system's master volume, if available.
- *
- * @returns VBox status code. VERR_NOT_SUPPORTED if not supported.
+ * Sets the system's master volume via ALSA, if available.
+ *
+ * @returns VBox status code.
  * @param   uVolPercent         Volume (in percent) to set.
  */
-int audioTestSetMasterVolume(unsigned uVolPercent)
-{
-#ifdef VBOX_WITH_AUDIO_ALSA
+static int audioTestSetMasterVolumeALSA(unsigned uVolPercent)
+{
     int rc = audioLoadAlsaLib();
     if (RT_FAILURE(rc))
@@ -143 +149 @@
 # undef ALSA_CHECK_RET
 # undef ALSA_CHECK_ERR_RET
-
-#elif defined(RT_OS_WINDOWS)
-
+}
+#endif /* VBOX_WITH_AUDIO_ALSA */
+
+#ifdef VBOX_WITH_AUDIO_OSS
+/**
+ * Sets the system's master volume via OSS, if available.
+ *
+ * @returns VBox status code.
+ * @param   uVolPercent         Volume (in percent) to set.
+ */
+static int audioTestSetMasterVolumeOSS(unsigned uVolPercent)
+{
+    int hFile = open("/dev/dsp", O_WRONLY | O_NONBLOCK, 0);
+    if (hFile == -1)
+    {
+        /* Try opening the mixing device instead. */
+        hFile = open("/dev/mixer", O_RDONLY | O_NONBLOCK, 0);
+    }
+
+    if (hFile != -1)
+    {
+        /* OSS maps 0 (muted) - 100 (max), so just use uVolPercent unmodified here. */
+        uint16_t uVol = RT_MAKE_U16(uVolPercent, uVolPercent);
+        AssertLogRelMsgReturnStmt(ioctl(hFile, SOUND_MIXER_PCM /* SNDCTL_DSP_SETPLAYVOL */, &uVol) >= 0,
+                                  ("OSS: Failed to set DSP playback volume: %s (%d)\n",
+                                   strerror(errno), errno), close(hFile), RTErrConvertFromErrno(errno));
+        return VINF_SUCCESS;
+    }
+
+    return VERR_NOT_SUPPORTED;
+}
+#endif /* VBOX_WITH_AUDIO_OSS */
+
+#ifdef RT_OS_WINDOWS
+static int audioTestSetMasterVolumeWASAPI(unsigned uVolPercent)
+{
     HRESULT hr;
 
@@ -186 +225 @@
 
 # undef WASAPI_CHECK_HR_RET
-
-#else
-
-    RT_NOREF(uVolPercent);
+}
+#endif /* RT_OS_WINDOWS */
+
+/**
+ * Sets the system's master volume, if available.
+ *
+ * @returns VBox status code. VERR_NOT_SUPPORTED if not supported.
+ * @param   uVolPercent         Volume (in percent) to set.
+ */
+int audioTestSetMasterVolume(unsigned uVolPercent)
+{
+    int rc = VINF_SUCCESS;
+
+#ifdef VBOX_WITH_AUDIO_ALSA
+    rc = audioTestSetMasterVolumeALSA(uVolPercent);
+    if (RT_SUCCESS(rc))
+        return rc;
+    /* else try OSS (if available) below. */
+#endif /* VBOX_WITH_AUDIO_ALSA */
+
+#ifdef VBOX_WITH_AUDIO_OSS
+    rc = audioTestSetMasterVolumeOSS(uVolPercent);
+    if (RT_SUCCESS(rc))
+        return rc;
+#endif /* VBOX_WITH_AUDIO_OSS */
+
+#ifdef RT_OS_WINDOWS
+    rc = audioTestSetMasterVolumeWASAPI(uVolPercent);
+    if (RT_SUCCESS(rc))
+        return rc;
+#endif
+
+   RT_NOREF(uVolPercent);
     /** @todo Port other platforms. */
    return VERR_NOT_SUPPORTED;
-#endif
 }