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

Timestamp:

Sep 26, 2017 6:13:13 PM (7 years ago)

Author:

vboxsync

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

118144

Message:

DrvAudioVideoRec.cpp: reverse order, drop unnecessary assertions, PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns) always comes first.

File:

• trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp (modified) (3 diffs)

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

@@ -1019 +1019 @@
 
 /**
+ * @interface_method_impl{PDMDRVREG,pfnDestruct}
+ */
+/* static */
+DECLCALLBACK(void) AudioVideoRec::drvDestruct(PPDMDRVINS pDrvIns)
+{
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+    PDRVAUDIOVIDEOREC pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOVIDEOREC);
+    LogFlowFuncEnter();
+
+    /*
+     * If the AudioVideoRec object is still alive, we must clear it's reference to
+     * us since we'll be invalid when we return from this method.
+     */
+    if (pThis->pAudioVideoRec)
+    {
+        pThis->pAudioVideoRec->mpDrv = NULL;
+        pThis->pAudioVideoRec = NULL;
+    }
+}
+
+
+/**
  * Construct a audio video recording driver instance.
  *
@@ -1026 +1048 @@
 DECLCALLBACK(int) AudioVideoRec::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
-    RT_NOREF(fFlags);
-
-    AssertPtrReturn(pDrvIns, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,    VERR_INVALID_POINTER);
-
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     PDRVAUDIOVIDEOREC pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOVIDEOREC);
+    RT_NOREF(fFlags);
 
     LogRel(("Audio: Initializing video recording audio driver\n"));
@@ -1085 +1103 @@
 
     return VINF_SUCCESS;
-}
-
-
-/**
- * @interface_method_impl{PDMDRVREG,pfnDestruct}
- */
-/* static */
-DECLCALLBACK(void) AudioVideoRec::drvDestruct(PPDMDRVINS pDrvIns)
-{
-    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-    PDRVAUDIOVIDEOREC pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOVIDEOREC);
-    LogFlowFuncEnter();
-
-    /*
-     * If the AudioVideoRec object is still alive, we must clear it's reference to
-     * us since we'll be invalid when we return from this method.
-     */
-    if (pThis->pAudioVideoRec)
-    {
-        pThis->pAudioVideoRec->mpDrv = NULL;
-        pThis->pAudioVideoRec = NULL;
-    }
 }