Changeset 72973 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Jul 8, 2018 1:23:58 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123525

Message:

Main: Some early sketches on how to get proper C++ enums with xpidl.

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

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

@@ -6833 +6833 @@
         switch (machineUserData.enmFaultToleranceState)
         {
-        case FaultToleranceState_Inactive:
-            pelmFaultTolerance->setAttribute("state", "inactive");
-            break;
-        case FaultToleranceState_Master:
-            pelmFaultTolerance->setAttribute("state", "master");
-            break;
-        case FaultToleranceState_Standby:
-            pelmFaultTolerance->setAttribute("state", "standby");
-            break;
+            case FaultToleranceState_Inactive:
+                pelmFaultTolerance->setAttribute("state", "inactive");
+                break;
+            case FaultToleranceState_Master:
+                pelmFaultTolerance->setAttribute("state", "master");
+                break;
+            case FaultToleranceState_Standby:
+                pelmFaultTolerance->setAttribute("state", "standby");
+                break;
+#ifdef VBOX_WITH_XPCOM_CPP_ENUM_HACK
+            case FaultToleranceState_32BitHack: /* (compiler warnings) */
+                AssertFailedBreak();
+#endif
         }
 
@@ -6921 +6925 @@
     /* On Linux, we need to check at runtime what's actually supported. */
     static RTCLockMtx s_mtx;
-    static AudioDriverType_T s_linuxDriver = -1;
+    static AudioDriverType_T s_enmLinuxDriver = AudioDriverType_Null;
     RTCLock lock(s_mtx);
-    if (s_linuxDriver == (AudioDriverType_T)-1)
+    if (s_enmLinuxDriver == AudioDriverType_Null)
     {
 # ifdef VBOX_WITH_AUDIO_PULSE
@@ -6929 +6933 @@
         if (RTProcIsRunningByName("pulseaudio") &&
             RTLdrIsLoadable("libpulse.so.0"))
-            s_linuxDriver = AudioDriverType_Pulse;
+            s_enmLinuxDriver = AudioDriverType_Pulse;
         else
 # endif /* VBOX_WITH_AUDIO_PULSE */
@@ -6935 +6939 @@
             /* Check if we can load the ALSA library */
              if (RTLdrIsLoadable("libasound.so.2"))
-                s_linuxDriver = AudioDriverType_ALSA;
+                s_enmLinuxDriver = AudioDriverType_ALSA;
         else
 # endif /* VBOX_WITH_AUDIO_ALSA */
-            s_linuxDriver = AudioDriverType_OSS;
-    }
-    return s_linuxDriver;
+            s_enmLinuxDriver = AudioDriverType_OSS;
+    }
+    return s_enmLinuxDriver;
 
 #elif defined(RT_OS_DARWIN)