Changeset 19058 in vbox

Timestamp:

Apr 21, 2009 11:03:32 AM (16 years ago)

Author:

vboxsync

Message:

AudioAdapterImpl.cpp: There might be more OSS users, so join them up.

File:

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

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -242 +242 @@
 #endif
 #ifdef RT_OS_LINUX
-            case AudioDriverType_OSS:
 # ifdef VBOX_WITH_ALSA
             case AudioDriverType_ALSA:
@@ -250 +249 @@
 # endif
 #endif /* RT_OS_LINUX */
+#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
+            case AudioDriverType_OSS:
+#endif
 #ifdef RT_OS_DARWIN
             case AudioDriverType_CoreAudio:
@@ -255 +257 @@
 #ifdef RT_OS_OS2
             case AudioDriverType_MMPM:
-#endif
-#ifdef RT_OS_FREEBSD
-            case AudioDriverType_OSS:
 #endif
             {
@@ -367 +366 @@
     mAudioDriver = AudioDriverType_CoreAudio;
 #elif defined (RT_OS_OS2)
-    mAudioDriver = AudioDriverType_MMP;;
+    mAudioDriver = AudioDriverType_MMP;
+#elif defined (RT_OS_FREEBSD)
+    mAudioDriver = AudioDriverType_OSS;
 #else
     mAudioDriver = AudioDriverType_Null;
@@ -436 +437 @@
 #endif // RT_OS_SOLARIS
 #ifdef RT_OS_LINUX
-    else if (strcmp (driver, "OSS") == 0)
-        mData->mAudioDriver = AudioDriverType_OSS;
     else if (strcmp (driver, "ALSA") == 0)
 # ifdef VBOX_WITH_ALSA
@@ -453 +452 @@
 # endif
 #endif // RT_OS_LINUX
+#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
+    else if (strcmp (driver, "OSS") == 0)
+        mData->mAudioDriver = AudioDriverType_OSS;
+#endif // RT_OS_LINUX || RT_OS_FREEBSD
 #ifdef RT_OS_DARWIN
     else if (strcmp (driver, "CoreAudio") == 0)
@@ -461 +464 @@
         mData->mAudioDriver = AudioDriverType_MMPM;
 #endif
-#ifdef RT_OS_FREEBSD
-    else if (strcmp (driver, "OSS") == 0)
-        mData->mAudioDriver = AudioDriverType_OSS;
-# endif
     else
         AssertMsgFailed (("Invalid driver '%s'\n", driver));
@@ -551 +550 @@
             }
 # endif
+#endif /* RT_OS_LINUX */
+#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD)
             case AudioDriverType_OSS:
             {
@@ -556 +557 @@
                 break;
             }
-#endif /* RT_OS_LINUX */
+#endif /* RT_OS_LINUX || RT_OS_FREEBSD */
 #ifdef RT_OS_DARWIN
             case AudioDriverType_CoreAudio:
@@ -568 +569 @@
             {
                 driverStr = "MMPM";
-                break;
-            }
-#endif
-#ifdef RT_OS_FREEBSD
-            case AudioDriverType_OSS:
-            {
-                driverStr = "OSS";
                 break;
             }