Changeset 24863 in vbox for trunk/src

Timestamp:

Nov 23, 2009 12:12:21 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManageModifyVM: Merged the oss code.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1411 +1411 @@
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
-                else if (!strcmp(ValueUnion.psz, "oss"))
-                {
-                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
-                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-                }
 # ifdef VBOX_WITH_ALSA
                 else if (!strcmp(ValueUnion.psz, "alsa"))
@@ -1437 +1432 @@
                     CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
                 }
-
-# ifdef VBOX_WITH_SOLARIS_OSS
-                else if (!strcmp(ValueUnion.psz, "oss"))
-                {
-                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
-                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-                }
-# endif
-
 #endif /* !RT_OS_SOLARIS */
 #ifdef RT_OS_DARWIN
@@ -1455 +1441 @@
 
 #endif /* !RT_OS_DARWIN */
-# ifdef RT_OS_FREEBSD
+# if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(VBOX_WITH_SOLARIS_OSS)
                 else if (!strcmp(ValueUnion.psz, "oss"))
                 {