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

Timestamp:

Mar 17, 2007 1:09:30 AM (18 years ago)

Author:

vboxsync

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

19642

Message:

Mac OS X audio support (only playback).

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (7 diffs)
• VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

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

@@ -222 +222 @@
 #else
     bool fWin = false;
+#endif
+#ifdef __DARWIN__
+    bool fDarwin = true;
+#else
+    bool fDarwin = false;
 #endif
 #ifdef VBOX_VRDP
@@ -315 +320 @@
         }
         RTPrintf("                            [-audio none|null");
+        if (fWin)
+        {
+            RTPrintf(                        "|winmm|dsound");
+        }
         if (fLinux)
         {
@@ -323 +332 @@
                                              );
         }
-        if (fWin)
-        {
-            RTPrintf(                        "|winmm|dsound");
+        if (fDarwin)
+        {
+            RTPrintf(                        "|coreaudio");
         }
         RTPrintf(                            "]\n");
@@ -1000 +1009 @@
                 case  AudioDriverType_OSSAudioDriver:    psz = "OSS"; break;
                 case  AudioDriverType_ALSAAudioDriver:   psz = "ALSA"; break;
+                case  AudioDriverType_CoreAudioDriver:   psz = "CoreAudio"; break;
                 default: ; break;
             }
@@ -3590 +3600 @@
                 CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
             }
+#ifdef __WIN__
+            else if (strcmp(audio, "winmm") == 0)
+            {
+                CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_WINMMAudioDriver));
+                CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+            }
+            else if (strcmp(audio, "dsound") == 0)
+            {
+                CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_DSOUNDAudioDriver));
+                CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+            }
+#endif /* __WIN__ */
 #ifdef __LINUX__
             else if (strcmp(audio, "oss") == 0)
@@ -3596 +3618 @@
                 CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
             }
-#ifdef VBOX_WITH_ALSA
+# ifdef VBOX_WITH_ALSA
             else if (strcmp(audio, "alsa") == 0)
             {
@@ -3602 +3624 @@
                 CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
             }
-#endif
-#else /* !__LINUX__ */
-            else if (strcmp(audio, "winmm") == 0)
-            {
-                CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_WINMMAudioDriver));
+# endif
+#endif /* !__LINUX__ */
+#ifdef __DARWIN__
+            else if (strcmp(audio, "coreaudio") == 0)
+            {
+                CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_CoreAudioDriver));
                 CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
             }
-            else if (strcmp(audio, "dsound") == 0)
-            {
-                CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_DSOUNDAudioDriver));
-                CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-            }
-#endif /* !__LINUX__ */
+#endif /* !__DARWIN__ */
             else
             {

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

@@ -1540 +1540 @@
     audioDriverTypes [CEnums::DSOUNDAudioDriver] =
         tr ("Windows DirectSound", "AudioDriverType");
+    audioDriverTypes [CEnums::CoreAudioDriver] =
+        tr ("CoreAudio", "AudioDriverType");
 
     networkAttachmentTypes [CEnums::NoNetworkAttachment] =

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -708 +708 @@
     cbAudioDriver->insertItem (vboxGlobal().toString (CEnums::WINMMAudioDriver));
 #endif
-#elif defined Q_WS_X11
+#elif defined Q_OS_LINUX
     cbAudioDriver->insertItem (vboxGlobal().toString (CEnums::OSSAudioDriver));
 #ifdef VBOX_WITH_ALSA
     cbAudioDriver->insertItem (vboxGlobal().toString (CEnums::ALSAAudioDriver));
 #endif
+#elif defined Q_OS_MACX
+    cbAudioDriver->insertItem (vboxGlobal().toString (CEnums::CoreAudioDriver));
 #endif