vbox的更動 54230 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

時間撮記:

2015-2-17 下午01:13:02 (10 年 以前)

作者:

vboxsync

訊息:

PDM/Audio: Update.

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (修改) (5 筆差異)

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

@@ -1450 +1450 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         if (mAudioVRDE)
-            mAudioVRDE->onVRDEInputIntercept(false /* fIntercept */);
+            mAudioVRDE->onVRDEControl(false /* fEnable */, 0 /* uFlags */);
 #else
         mcAudioRefs--;
@@ -1501 +1501 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     if (mAudioVRDE)
-        mAudioVRDE->onVRDEInputIntercept(true /* fIntercept */);
+        mAudioVRDE->onVRDEControl(true /* fEnable */, 0 /* uFlags */);
 #else
     ++mcAudioRefs;
@@ -2380 +2380 @@
                            (PFNRT)i_unplugCpu, 3,
                            this, pUVM, (VMCPUID)aCpu);
-    
+
         /* release the lock before a VMR3* call (EMT might wait for it, @bugref{7648})! */
         alock.release();
@@ -4821 +4821 @@
      */
     bool fResume = false;
-    int rc = i_suspendBeforeConfigChange(pUVM, NULL, &fResume);
-    if (FAILED(rc))
-        return rc;
+    HRESULT hr = i_suspendBeforeConfigChange(pUVM, NULL, &fResume);
+    if (FAILED(hr))
+        return hr;
 
     /*
@@ -4830 +4830 @@
      * here to make requests from under the lock in order to serialize them.
      */
-    PVMREQ pReq;
-    int vrc = VMR3ReqCallWaitU(pUVM, 0 /*idDstCpu*/,
-                               (PFNRT)i_changeNetworkAttachment, 6,
-                               this, pUVM, pszDevice, uInstance, uLun, aNetworkAdapter);
+    int rc = VMR3ReqCallWaitU(pUVM, 0 /*idDstCpu*/,
+                              (PFNRT)i_changeNetworkAttachment, 6,
+                              this, pUVM, pszDevice, uInstance, uLun, aNetworkAdapter);
 
     if (fResume)
         i_resumeAfterConfigChange(pUVM);
 
-    if (RT_SUCCESS(vrc))
-    {
-        LogFlowThisFunc(("Returns S_OK\n"));
+    if (RT_SUCCESS(rc))
         return S_OK;
-    }
 
     return setError(E_FAIL,
-                    tr("Could not change the network adaptor attachement type (%Rrc)"),
-                    vrc);
+                    tr("Could not change the network adaptor attachement type (%Rrc)"), rc);
 }