Changeset 20501 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 12, 2009 11:31:37 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/Audio: Boomer(OSS) support (disabled, requires snv_115+).

Location:

trunk/src/VBox/Frontends

Files:

• VBoxBFE/VBoxBFE.cpp (modified) (1 diff)
• VBoxManage/Makefile.kmk (modified) (1 diff)
• VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• VirtualBox/Makefile.kmk (modified) (1 diff)
• VirtualBox/src/VBoxVMSettingsAudio.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -1950 +1950 @@
 #elif defined(RT_OS_LINUX)
         rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
+#elif defined(RT_OS_SOLARIS)
+# ifdef VBOX_WITH_SOLARIS_OSS
+        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();
+# else
+        rc = CFGMR3InsertString(pCfg, "AudioDriver",      "solaudio");              UPDATE_RC();
+# endif
 #elif defined(RT_OS_L4)
         rc = CFGMR3InsertString(pCfg, "AudioDriver",      "oss");                   UPDATE_RC();

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -39 +39 @@
         $(if $(VBOX_WITH_HEADLESS), VBOX_WITH_HEADLESS) \
         $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
+        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \

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

@@ -199 +199 @@
         if (fSolaris)
         {
-            RTPrintf(                        "|solaudio");
+            RTPrintf(                        "|solaudio"
+#ifdef VBOX_WITH_SOLARIS_OSS
+                                             "|oss"
+#endif
+                                              );
         }
         if (fLinux)

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

@@ -1442 +1442 @@
                 }
 
+# ifdef VBOX_WITH_SOLARIS_OSS
+                else if (!strcmp(audio, "oss"))
+                {
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+                }
+# endif
+
 #endif /* !RT_OS_SOLARIS */
 #ifdef RT_OS_DARWIN

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -177 +177 @@
         $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA) \
         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
+        $(if $(VBOX_WITH_SOLARIS_OSS),VBOX_WITH_SOLARIS_OSS) \
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
         $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT)

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

@@ -84 +84 @@
 #if defined Q_OS_SOLARIS
     mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_SolAudio));
+# if defined VBOX_WITH_SOLARIS_OSS
+    mCbAudioDriver->addItem (vboxGlobal().toString (KAudioDriverType_OSS));
+#endif
 #endif
 #if defined Q_OS_LINUX || defined Q_OS_FREEBSD