Changeset 25819 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jan 13, 2010 11:09:52 PM (15 years ago)

Author:

vboxsync

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

56596

Message:

FreeBSD: Add support for PulseAudio. Contributed by Noriyoshi Kawano and Bernhard Froehlich (thank you)

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (3 diffs)
• VBoxManageModifyVM.cpp (modified) (1 diff)

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

@@ -67 +67 @@
     bool fSolaris = false;
 #endif
+#ifdef RT_OS_FREEBSD
+    bool fFreeBSD = true;
+#else
+    bool fFreeBSD = false;
+#endif
 #ifdef RT_OS_DARWIN
     bool fDarwin = true;
@@ -88 +93 @@
         fWin = true;
         fSolaris = true;
+        fFreeBSD = true;
         fDarwin = true;
         fVRDP = true;
@@ -236 +242 @@
                                              "|alsa"
 #endif
+#ifdef VBOX_WITH_PULSE
+                                             "|pulse"
+#endif
+                                             );
+        }
+        if (fFreeBSD)
+        {
+            RTPrintf(                        "|oss"
 #ifdef VBOX_WITH_PULSE
                                              "|pulse"

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

@@ -1346 +1346 @@
                 }
 #endif /* !RT_OS_SOLARIS */
+#ifdef RT_OS_FREEBSD
+                else if (!strcmp(ValueUnion.psz, "oss"))
+                {
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+                }
+# ifdef VBOX_WITH_PULSE
+                else if (!strcmp(ValueUnion.psz, "pulse"))
+                {
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse));
+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+                }
+# endif
+#endif /* !RT_OS_FREEBSD */
 #ifdef RT_OS_DARWIN
                 else if (!strcmp(ValueUnion.psz, "coreaudio"))