Changeset 1071 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Feb 27, 2007 11:00:14 AM (18 years ago)

Author:

vboxsync

Message:

fix Vista crash if sound is enabled; made audio LogRel consistent; winmm was never used, show dsound instead

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3827 +3827 @@
 #ifdef __WIN__
         else if (driver == L"winmm")
+#ifdef VBOX_WITH_WINMM
             audioDriver = AudioDriverType_WINMMAudioDriver;
+#else
+            // fall back to dsound
+            audioDriver = AudioDriverType_DSOUNDAudioDriver;
+#endif
         else if (driver == L"dsound")
             audioDriver = AudioDriverType_DSOUNDAudioDriver;
@@ -5582 +5587 @@
 #ifdef __WIN__
             case AudioDriverType_WINMMAudioDriver:
+#ifdef VBOX_WITH_WINMM
             {
                 CFGLDRSetString (adapterNode, "driver", "winmm");
                 break;
             }
+#endif
             case AudioDriverType_DSOUNDAudioDriver:
             {
@@ -5592 +5599 @@
             }
 #endif /* __WIN__ */
+            case AudioDriverType_ALSAAudioDriver:
 #ifdef VBOX_WITH_ALSA
-            case AudioDriverType_ALSAAudioDriver:
             {
                 CFGLDRSetString (adapterNode, "driver", "alsa");
                 break;
             }
-#else
-            /* fall back to OSS */
-            case AudioDriverType_ALSAAudioDriver:
 #endif
 #ifdef __LINUX__