Changeset 19002 in vbox

Timestamp:

Apr 17, 2009 8:04:12 PM (16 years ago)

Author:

vboxsync

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

46100

Message:

Audio: Add support for FreeBSD

Location:

trunk/src/VBox

Files:

• Devices/Audio/audio.c (modified) (1 diff)
• Devices/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxVMSettingsAudio.cpp (modified) (1 diff)
• Main/AudioAdapterImpl.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Audio/audio.c

@@ -83 +83 @@
 #ifdef RT_OS_SOLARIS
     &solaudio_audio_driver,
+#endif
+#ifdef RT_OS_FREEBSD
+    &oss_audio_driver,
 #endif
     &no_audio_driver

trunk/src/VBox/Devices/Makefile.kmk

@@ -700 +700 @@
 Drivers_SOURCES      := $(filter-out \
         Storage/DrvHost% \
-        , $(Drivers_SOURCES))
+        , $(Drivers_SOURCES)) \
+        Audio/ossaudio.c
 Drivers_SOURCES.freebsd =
 endif # freebsd

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsAudio.cpp

@@ -93 +93 @@
 #elif defined Q_OS_MACX
     mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_CoreAudio));
+#elif defined Q_OS_FREEBSD
+    mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_OSS));
 #endif
     /* Set the old value */

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -255 +255 @@
 #ifdef RT_OS_OS2
             case AudioDriverType_MMPM:
+#endif
+#ifdef RT_OS_FREEBSD
+            case AudioDriverType_OSS:
 #endif
             {
@@ -458 +461 @@
         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));
@@ -564 +571 @@
             }
 #endif
+#ifdef RT_OS_FREEBSD
+            case AudioDriverType_OSS:
+            {
+                driverStr = "OSS";
+                break;
+            }
+#endif
             default:
                 ComAssertMsgFailedRet (("Wrong audio driver type! driver = %d",

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2274 +2274 @@
             }
 #endif
+#ifdef RT_OS_FREEBSD
+            case AudioDriverType_OSS:
+            {
+                rc = CFGMR3InsertString(pCfg, "AudioDriver", "oss");                RC_CHECK();
+                break;
+            }
+#endif
         }
         hrc = pMachine->COMGETTER(Name)(&str);                                      H();