Changeset 64383 in vbox

Timestamp:

Oct 24, 2016 1:01:24 PM (8 years ago)

Author:

vboxsync

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

111491

Message:

Audio/DevIchAc97.cpp: Move the AC'97 streams and mixer sinks creation in ichac97StreamsInit() to match ichac97StreamsDestroy().

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (3 diffs)

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

@@ -460 +460 @@
         case AC97SOUNDSOURCE_PO_INDEX: return pThis->pSinkOut;    break;
         case AC97SOUNDSOURCE_MC_INDEX: return pThis->pSinkMicIn;  break;
-        default:       break;
+        default:                                                  break;
     }
 
@@ -677 +677 @@
     LogFlowFuncEnter();
 
-    int rc = ichac97StreamInit    (&pThis->StreamLineIn, AC97SOUNDSOURCE_PI_INDEX);
+    /*
+     * Create all sinks and AC'97 streams.
+     */
+
+    /* Line-In. */
+    int rc = AudioMixerCreateSink(pThis->pMixer, "[Recording] Line In", AUDMIXSINKDIR_INPUT, &pThis->pSinkLineIn);
     if (RT_SUCCESS(rc))
-    {
-        rc = ichac97StreamInit    (&pThis->StreamMicIn,  AC97SOUNDSOURCE_MC_INDEX);
+        rc = ichac97StreamInit(&pThis->StreamLineIn, AC97SOUNDSOURCE_PI_INDEX);
+
+    /* Microphone-In. */
+    if (RT_SUCCESS(rc))
+    {
+        rc = AudioMixerCreateSink(pThis->pMixer, "[Recording] Microphone In", AUDMIXSINKDIR_INPUT, &pThis->pSinkMicIn);
         if (RT_SUCCESS(rc))
-        {
-            rc = ichac97StreamInit(&pThis->StreamOut,    AC97SOUNDSOURCE_PO_INDEX);
-        }
-    }
-
-    /* Open all streams with the current AC'97 mixer settings. */
+            rc = ichac97StreamInit(&pThis->StreamMicIn, AC97SOUNDSOURCE_MC_INDEX);
+    }
+
+    /* Output. */
+    if (RT_SUCCESS(rc))
+    {
+        rc = AudioMixerCreateSink(pThis->pMixer, "[Playback] PCM Output", AUDMIXSINKDIR_OUTPUT, &pThis->pSinkOut);
+        if (RT_SUCCESS(rc))
+            rc = ichac97StreamInit(&pThis->StreamOut, AC97SOUNDSOURCE_PO_INDEX);
+    }
+
+    /*
+     * Open all streams with the current AC'97 mixer settings.
+     */
     if (RT_SUCCESS(rc))
     {
@@ -2874 +2891 @@
 
     if (RT_SUCCESS(rc))
-    {
         rc = AudioMixerCreate("AC'97 Mixer", 0 /* uFlags */, &pThis->pMixer);
-        if (RT_SUCCESS(rc))
-        {
-            /* Add all required audio sinks. */
-            int rc2 = AudioMixerCreateSink(pThis->pMixer, "[Playback] PCM Output", AUDMIXSINKDIR_OUTPUT, &pThis->pSinkOut);
-            AssertRC(rc2);
-
-            rc2 = AudioMixerCreateSink(pThis->pMixer, "[Recording] Line In", AUDMIXSINKDIR_INPUT, &pThis->pSinkLineIn);
-            AssertRC(rc2);
-
-            rc2 = AudioMixerCreateSink(pThis->pMixer, "[Recording] Microphone In", AUDMIXSINKDIR_INPUT, &pThis->pSinkMicIn);
-            AssertRC(rc2);
-        }
-    }
 
     ichac97Reset(pDevIns);