Changeset 35496 in vbox

Timestamp:

Jan 12, 2011 4:29:24 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: clenaup (voice_mc isn't used and removed)

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevCodec.cpp (modified) (3 diffs)
• DevCodec.h (modified) (1 diff)

trunk/src/VBox/Devices/Audio/DevCodec.cpp

@@ -2235 +2235 @@
     if (!AUD_is_host_voice_in_ok(pState->SwVoiceIn))
         LogRel (("HDA: WARNING: Unable to open PCM IN!\n"));
-    if (!AUD_is_host_voice_in_ok(pState->voice_mc))
-        LogRel (("HDA: WARNING: Unable to open PCM MC!\n"));
     if (!AUD_is_host_voice_out_ok(pState->SwVoiceOut))
         LogRel (("HDA: WARNING: Unable to open PCM OUT!\n"));
 
     if (   !AUD_is_host_voice_in_ok(pState->SwVoiceIn)
-        && !AUD_is_host_voice_out_ok(pState->SwVoiceOut)
-        && !AUD_is_host_voice_in_ok(pState->voice_mc))
+        && !AUD_is_host_voice_out_ok(pState->SwVoiceOut))
     {
         /* Was not able initialize *any* voice. Select the NULL audio driver instead */
         AUD_close_in  (&pState->card, pState->SwVoiceIn);
         AUD_close_out (&pState->card, pState->SwVoiceOut);
-        AUD_close_in  (&pState->card, pState->voice_mc);
         pState->SwVoiceOut = NULL;
         pState->SwVoiceIn = NULL;
-        pState->voice_mc = NULL;
         AUD_init_null ();
 
@@ -2258 +2253 @@
     }
     else if (   !AUD_is_host_voice_in_ok(pState->SwVoiceIn)
-             || !AUD_is_host_voice_out_ok(pState->SwVoiceOut)
-             || !AUD_is_host_voice_in_ok(pState->voice_mc))
+             || !AUD_is_host_voice_out_ok(pState->SwVoiceOut))
     {
         char   szMissingVoices[128];
@@ -2267 +2261 @@
         if (!AUD_is_host_voice_out_ok(pState->SwVoiceOut))
             len += RTStrPrintf (szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_out" : "PCM_out");
-        if (!AUD_is_host_voice_in_ok(pState->voice_mc))
-            len += RTStrPrintf (szMissingVoices + len, sizeof(szMissingVoices) - len, len ? ", PCM_mic" : "PCM_mic");
 
         PDMDevHlpVMSetRuntimeError (pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",

trunk/src/VBox/Devices/Audio/DevCodec.h

@@ -457 +457 @@
     /** PCM out */
     SWVoiceOut              *SwVoiceOut;
-    /** Mic in */
-    SWVoiceIn               *voice_mc;
 #else
     CODECAUDIOOUTFORMAT        aSwVoiceOut;