Changeset 7466 in vbox for trunk/src/VBox/Main/AudioAdapterImpl.cpp

Timestamp:

Mar 15, 2008 9:47:45 PM (17 years ago)

Author:

vboxsync

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

28905

Message:

Main/Settings: Applied all current XML settings format todos and increased version from 1.3.pre to 1.3.

File:

• trunk/src/VBox/Main/AudioAdapterImpl.cpp (modified) (10 diffs)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -228 +228 @@
 #ifdef RT_OS_WINDOWS
 # ifdef VBOX_WITH_WINMM
-            case AudioDriverType_WINMM:
-# endif
-            case AudioDriverType_DSOUND:
+            case AudioDriverType_WinMM:
+# endif
+            case AudioDriverType_DirectSound:
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
@@ -242 +242 @@
 #endif /* RT_OS_LINUX */
 #ifdef RT_OS_DARWIN
-            case AudioDriverType_Core:
+            case AudioDriverType_CoreAudio:
 #endif
 #ifdef RT_OS_OS2
@@ -370 +370 @@
     const char *driver = audioAdapterNode.stringValue ("driver");
     mData->mAudioDriver = AudioDriverType_Null;
-    if      (strcmp (driver, "null") == 0)
+    if      (strcmp (driver, "Null") == 0)
         ; /* Null has been set above */
 #ifdef RT_OS_WINDOWS
-    else if (strcmp (driver, "winmm") == 0)
+    else if (strcmp (driver, "WinMM") == 0)
 #ifdef VBOX_WITH_WINMM
-        mData->mAudioDriver = AudioDriverType_WINMM;
+        mData->mAudioDriver = AudioDriverType_WinMM;
 #else
         /* fall back to dsound */
-        mData->mAudioDriver = AudioDriverType_DSOUND;
-#endif
-    else if (strcmp (driver, "dsound") == 0)
-        mData->mAudioDriver = AudioDriverType_DSOUND;
+        mData->mAudioDriver = AudioDriverType_DirectSound;
+#endif
+    else if (strcmp (driver, "DirectSound") == 0)
+        mData->mAudioDriver = AudioDriverType_DirectSound;
 #endif // RT_OS_WINDOWS
 #ifdef RT_OS_LINUX
-    else if (strcmp (driver, "oss") == 0)
+    else if (strcmp (driver, "OSS") == 0)
         mData->mAudioDriver = AudioDriverType_OSS;
-    else if (strcmp (driver, "alsa") == 0)
+    else if (strcmp (driver, "ALSA") == 0)
 # ifdef VBOX_WITH_ALSA
         mData->mAudioDriver = AudioDriverType_ALSA;
@@ -393 +393 @@
         mData->mAudioDriver = AudioDriverType_OSS;
 # endif
-    else if (strcmp (driver, "pulse") == 0)
+    else if (strcmp (driver, "Pulse") == 0)
 # ifdef VBOX_WITH_PULSE
         mData->mAudioDriver = AudioDriverType_Pulse;
@@ -402 +402 @@
 #endif // RT_OS_LINUX
 #ifdef RT_OS_DARWIN
-    else if (strcmp (driver, "coreaudio") == 0)
-        mData->mAudioDriver = AudioDriverType_Core;
+    else if (strcmp (driver, "CoreAudio") == 0)
+        mData->mAudioDriver = AudioDriverType_CoreAudio;
 #endif
 #ifdef RT_OS_OS2
-    else if (strcmp (driver, "mmpm") == 0)
+    else if (strcmp (driver, "MMPM") == 0)
         mData->mAudioDriver = AudioDriverType_MMPM;
 #endif
@@ -456 +456 @@
         case AudioDriverType_Null:
         {
-            driverStr = "null";
+            driverStr = "Null";
             break;
         }
 #ifdef RT_OS_WINDOWS
-            case AudioDriverType_WINMM:
+            case AudioDriverType_WinMM:
 # ifdef VBOX_WITH_WINMM
             {
-                driverStr = "winmm";
-                break;
-            }
-# endif
-            case AudioDriverType_DSOUND:
-            {
-                driverStr = "dsound";
+                driverStr = "WinMM";
+                break;
+            }
+# endif
+            case AudioDriverType_DirectSound:
+            {
+                driverStr = "DirectSound";
                 break;
             }
@@ -477 +477 @@
 # ifdef VBOX_WITH_ALSA
             {
-                driverStr = "alsa";
+                driverStr = "ALSA";
                 break;
             }
@@ -484 +484 @@
 # ifdef VBOX_WITH_PULSE
             {
-                driverStr = "pulse";
+                driverStr = "Pulse";
                 break;
             }
@@ -490 +490 @@
             case AudioDriverType_OSS:
             {
-                driverStr = "oss";
+                driverStr = "OSS";
                 break;
             }
 #endif /* RT_OS_LINUX */
 #ifdef RT_OS_DARWIN
-            case AudioDriverType_Core:
-            {
-                driverStr = "coreaudio";
+            case AudioDriverType_CoreAudio:
+            {
+                driverStr = "CoreAudio";
                 break;
             }
@@ -504 +504 @@
             case AudioDriverType_MMPM:
             {
-                driverStr = "mmpm";
+                driverStr = "MMPM";
                 break;
             }