Changeset 98089 in vbox

Timestamp:

Jan 16, 2023 9:32:37 AM (23 months ago)

Author:

vboxsync

Message:

Audio/Settings: Compile fixes if VBOX_WITH_AUDIO_PULSE and VBOX_WITH_AUDIO_ALSA are not defined; cleaned up the function a bit to not go even deeper in the #ifdef hell. Keep it simple.

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (1 diff)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -8926 +8926 @@
 
 #elif defined(RT_OS_LINUX)
-    /* On Linux, we need to check at runtime what's actually supported. */
+    /* On Linux, we need to check at runtime what's actually supported.
+     * Descending precedence. */
     static RTCLockMtx s_mtx;
     static AudioDriverType_T s_enmLinuxDriver = AudioDriverType_Null;
     RTCLock lock(s_mtx);
-    if (s_enmLinuxDriver == AudioDriverType_Null)
+    if (s_enmLinuxDriver == AudioDriverType_Null) /* Already determined from a former run? */
     {
 # ifdef VBOX_WITH_AUDIO_PULSE
         /* Check for the pulse library & that the pulse audio daemon is running. */
-        if (RTProcIsRunningByName("pulseaudio") &&
-            RTLdrIsLoadable("libpulse.so.0"))
+        if (   RTProcIsRunningByName("pulseaudio")
+            && RTLdrIsLoadable("libpulse.so.0"))
+        {
             s_enmLinuxDriver = AudioDriverType_Pulse;
-        else
-# endif /* VBOX_WITH_AUDIO_PULSE */
+        }
+#endif /* VBOX_WITH_AUDIO_PULSE */
+
 # ifdef VBOX_WITH_AUDIO_ALSA
+        if (s_enmLinuxDriver == AudioDriverType_Null)
+        {
             /* Check if we can load the ALSA library */
-             if (RTLdrIsLoadable("libasound.so.2"))
+            if (RTLdrIsLoadable("libasound.so.2"))
                 s_enmLinuxDriver = AudioDriverType_ALSA;
+        }
 # endif /* VBOX_WITH_AUDIO_ALSA */
+
 # ifdef VBOX_WITH_AUDIO_OSS
-             else
-                s_enmLinuxDriver = AudioDriverType_OSS;
+        if (s_enmLinuxDriver == AudioDriverType_Null)
+            s_enmLinuxDriver = AudioDriverType_OSS;
 # endif /* VBOX_WITH_AUDIO_OSS */
     }