Changeset 36521 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 4, 2011 12:24:23 PM (14 years ago)

Author:

vboxsync

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

70942

Message:

iprt/cpp/lock.h: RTLock, RTLockMtx -> RTCLock, RTClockMtx. 'RTC' is now the official C++ class prefix for IPRT.

Location:

trunk/src/VBox/Main/xml

Files:

• Makefile.kup (modified) (2 props)
• Settings.cpp (modified) (3 diffs)

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

@@ -694 +694 @@
             med.strFormat = "RAW";
         }
-    
+
         if (t == DVDImage)
             med.hdType = MediumType_Readonly;
@@ -4459 +4459 @@
 #elif defined(RT_OS_LINUX)
     // on Linux, we need to check at runtime what's actually supported...
-    static RTLockMtx s_mtx;
+    static RTCLockMtx s_mtx;
     static AudioDriverType_T s_linuxDriver = -1;
-    RTLock lock(s_mtx);
+    RTCLock lock(s_mtx);
     if (s_linuxDriver == (AudioDriverType_T)-1)
     {
@@ -4473 +4473 @@
 # if defined(VBOX_WITH_ALSA)
             /* Check if we can load the ALSA library */
-            if (RTLdrIsLoadable("libasound.so.2"))
+             if (RTLdrIsLoadable("libasound.so.2"))
                 s_linuxDriver = AudioDriverType_ALSA;
-       else
+        else
 # endif /* VBOX_WITH_ALSA */
             s_linuxDriver = AudioDriverType_OSS;