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

Timestamp:

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

Author:

vboxsync

Message:

Mac OS X audio support (only playback).

Location:

trunk/src/VBox/Main

Files:

• AudioAdapterImpl.cpp (modified) (2 diffs)
• ConsoleImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• xml/VirtualBox-settings-macosx.xsd (modified) (1 diff)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -218 +218 @@
         {
             case AudioDriverType_NullAudioDriver:
+#ifdef __WIN__
+#ifdef VBOX_WITH_WINMM
+            case AudioDriverType_WINMMAudioDriver:
+#endif
+            case AudioDriverType_DSOUNDAudioDriver:
+#endif /* __WIN__ */
+#ifdef __LINUX__
+            case AudioDriverType_OSSAudioDriver:
+#ifdef VBOX_WITH_ALSA
+            case AudioDriverType_ALSAAudioDriver:
+#endif
+#endif /* __LINUX__ */
+#ifdef __DARWIN__
+            case AudioDriverType_CoreAudioDriver:
+#endif 
             {
                 mData.backup();
@@ -224 +239 @@
             }
 
-#ifdef __WIN__
-#ifdef VBOX_WITH_WINMM
-            case AudioDriverType_WINMMAudioDriver:
-            {
-                mData.backup();
-                mData->mAudioDriver = audioDriver;
-                break;
-            }
-#endif
-            case AudioDriverType_DSOUNDAudioDriver:
-            {
-                mData.backup();
-                mData->mAudioDriver = audioDriver;
-                break;
-            }
-#endif /* __WIN__ */
-
-#ifdef __LINUX__
-            case AudioDriverType_OSSAudioDriver:
-            {
-                mData.backup();
-                mData->mAudioDriver = audioDriver;
-                break;
-            }
-#ifdef VBOX_WITH_ALSA
-            case AudioDriverType_ALSAAudioDriver:
-            {
-                mData.backup();
-                mData->mAudioDriver = audioDriver;
-                break;
-            }
-#endif
-#endif /* __LINUX__ */
             default:
             {

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5321 +5321 @@
                 break;
             }
-#ifdef VBOX_WITH_ALSA
+# ifdef VBOX_WITH_ALSA
             case AudioDriverType_ALSAAudioDriver:
             {
@@ -5327 +5327 @@
                 break;
             }
-#endif
+# endif
 #endif /* __LINUX__ */
+#ifdef __DARWIN__
+            case AudioDriverType_CoreAudioDriver:
+            {
+                rc = CFGMR3InsertString(pCfg, "AudioDriver", "coreaudio");              RC_CHECK();
+                break;
+            }
+#endif 
         }
     }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3949 +3949 @@
 #endif
 #endif // __LINUX__
+#ifdef __DARWIN__
+        else if (driver == L"coreaudio")
+            audioDriver = AudioDriverType_CoreAudioDriver;
+#endif 
         else
             AssertMsgFailed (("Invalid driver: %ls\n", driver.raw()));
@@ -5727 +5731 @@
             }
 #endif /* __WIN__ */
+#ifdef __LINUX__
             case AudioDriverType_ALSAAudioDriver:
 #ifdef VBOX_WITH_ALSA
@@ -5734 +5739 @@
             }
 #endif
-#ifdef __LINUX__
             case AudioDriverType_OSSAudioDriver:
             {
@@ -5741 +5745 @@
             }
 #endif /* __LINUX__ */
+#ifdef __DARWIN__
+            case AudioDriverType_CoreAudioDriver:
+            {
+                CFGLDRSetString (adapterNode, "driver", "coreaudio");
+                break;
+            }
+#endif 
             default:
                 ComAssertMsgFailedBreak (("Wrong audio driver type! driver = %d\n",

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6909 +6909 @@
         <const name="ALSAAudioDriver"   value="3"/>
         <const name="DSOUNDAudioDriver" value="4"/>
+        <const name="CoreAudioDriver"   value="5"/>
     </enum>
 

trunk/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd

@@ -96 +96 @@
       <xsd:restriction base="xsd:token">
         <xsd:enumeration value="null"/>
+        <xsd:enumeration value="coreaudio"/>
       </xsd:restriction>
     </xsd:simpleType>