Changeset 82321 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 2, 2019 12:35:28 PM (5 years ago)

Author:

vboxsync

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

135145

Message:

ConsoleImpl2.cpp: More of same.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2916 +2916 @@
                     break;
                 }
-                default: AssertFailedBreak();
+                default:
+                    pszAudioDevice = "oops";
+                    AssertFailedBreak();
             }
 
@@ -2937 +2939 @@
              * The audio driver.
              */
-            Utf8Str strAudioDriver;
-
-            AudioDriverType_T audioDriver;
-            hrc = audioAdapter->COMGETTER(AudioDriver)(&audioDriver);                       H();
-            switch (audioDriver)
+            AudioDriverType_T enmAudioDriver;
+            hrc = audioAdapter->COMGETTER(AudioDriver)(&enmAudioDriver);                    H();
+            const char *pszAudioDriver;
+            switch (enmAudioDriver)
             {
                 case AudioDriverType_Null:
-                {
-                    strAudioDriver = "NullAudio";
+                    pszAudioDriver = "NullAudio";
                     break;
-                }
 #ifdef RT_OS_WINDOWS
 # ifdef VBOX_WITH_WINMM
                 case AudioDriverType_WinMM:
-                {
-                    #error "Port WinMM audio backend!" /** @todo Still needed? */
+#  error "Port WinMM audio backend!" /** @todo Still needed? */
                     break;
-                }
 # endif
                 case AudioDriverType_DirectSound:
-                {
-                    strAudioDriver = "DSoundAudio";
+                    pszAudioDriver = "DSoundAudio";
                     break;
-                }
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_SOLARIS
                 case AudioDriverType_SolAudio:
-                {
                     /* Should not happen, as the Solaris Audio backend is not around anymore.
                      * Remove this sometime later. */
@@ -2971 +2965 @@
 
                     /* Manually set backend to OSS for now. */
-                    strAudioDriver = "OSSAudio";
+                    pszAudioDriver = "OSSAudio";
                     break;
-                }
 #endif
 #ifdef VBOX_WITH_AUDIO_OSS
                 case AudioDriverType_OSS:
-                {
-                    strAudioDriver = "OSSAudio";
+                    pszAudioDriver = "OSSAudio";
                     break;
-                }
 #endif
 #ifdef VBOX_WITH_AUDIO_ALSA
                 case AudioDriverType_ALSA:
-                {
-                    strAudioDriver = "ALSAAudio";
+                    pszAudioDriver = "ALSAAudio";
                     break;
-                }
 #endif
 #ifdef VBOX_WITH_AUDIO_PULSE
                 case AudioDriverType_Pulse:
-                {
-                    strAudioDriver = "PulseAudio";
+                    pszAudioDriver = "PulseAudio";
                     break;
-                }
 #endif
 #ifdef RT_OS_DARWIN
                 case AudioDriverType_CoreAudio:
-                {
-                    strAudioDriver = "CoreAudio";
+                    pszAudioDriver = "CoreAudio";
                     break;
-                }
 #endif
-                default: AssertFailedBreak();
+                default:
+                    pszAudioDriver = "oops";
+                    AssertFailedBreak();
             }
 
@@ -3009 +2996 @@
 
             InsertConfigNodeF(pInst, &pLunL0, "LUN#%u", uAudioLUN);
-            rc = i_configAudioDriver(audioAdapter, virtualBox, pMachine, pLunL0, strAudioDriver.c_str());
+            rc = i_configAudioDriver(audioAdapter, virtualBox, pMachine, pLunL0, pszAudioDriver);
             if (RT_SUCCESS(rc))
                 uAudioLUN++;