Changeset 70036 in vbox

Timestamp:

Dec 8, 2017 4:52:18 PM (7 years ago)

Author:

vboxsync

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

119573

Message:

Build fix.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• DisplayImpl.cpp (modified) (2 diffs)

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

@@ -5518 +5518 @@
 
             const PVIDEORECCFG pCfg = pDisplay->i_videoRecGetConfig();
+# ifdef VBOX_WITH_AUDIO_VIDEOREC
             const unsigned     uLUN = pCfg->Audio.uLUN; /* Get the currently configured LUN. */
-
+# else
+            const unsigned     uLUN = 0;
+# endif
             int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY /*idDstCpu*/,
                                        (PFNRT)Display::i_videoRecConfigure, 4,
-                                       pDisplay, pCfg, true /* fAttachDetach */, &pCfg->Audio.uLUN);
+                                       pDisplay, pCfg, true /* fAttachDetach */, &uLUN);
             if (RT_SUCCESS(vrc))
             {
                 /* Make sure to acquire the lock again after we're done running in EMT. */
                 alock.acquire();
-
-                /* We don't support dynamic LUNs for this stuff yet. */
-                Assert(uLUN == pCfg->Audio.uLUN);
 
                 if (!mDisplay->i_videoRecStarted())

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

@@ -2645 +2645 @@
     } /* while */
 
+    unsigned uLUN = *puLUN;
+
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     ComPtr<IAudioAdapter> audioAdapter;
@@ -2651 +2653 @@
 
     unsigned uInstance = 0;
-    unsigned uLUN      = *puLUN;
 
     Utf8Str strAudioDev = pThis->mParent->i_getAudioAdapterDeviceName(audioAdapter);