Changeset 91039 in vbox for trunk/src

Timestamp:

Aug 31, 2021 5:09:25 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: More code for resolving the connection problems. ​bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTestService.cpp (modified) (6 diffs)

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

@@ -559 +559 @@
 
     if (pThis->Callbacks.pfnTestSetBegin)
-    {
         rc = pThis->Callbacks.pfnTestSetBegin(pThis->Callbacks.pvUser, pReq->szTag);
-        if (RT_FAILURE(rc))
-            return atsReplyRC(pThis, pInst, pPktHdr, rc, "Beginning test set '%s' failed", pReq->szTag);
-    }
 
     if (RT_SUCCESS(rc))
-    {
         rc = atsReplyAck(pThis, pInst, pPktHdr);
-    }
     else
         rc = atsReplyRC(pThis, pInst, pPktHdr, rc, "Beginning test set failed");
-
     return rc;
 }
@@ -593 +586 @@
 
     if (pThis->Callbacks.pfnTestSetEnd)
-    {
         rc = pThis->Callbacks.pfnTestSetEnd(pThis->Callbacks.pvUser, pReq->szTag);
-        if (RT_FAILURE(rc))
-            return atsReplyRC(pThis, pInst, pPktHdr, rc, "Ending test set '%s' failed", pReq->szTag);
-    }
+
     if (RT_SUCCESS(rc))
-    {
         rc = atsReplyAck(pThis, pInst, pPktHdr);
-    }
     else
         rc = atsReplyRC(pThis, pInst, pPktHdr, rc, "Ending test set failed");
-
     return rc;
 }
@@ -734 +721 @@
 static int atsDoTonePlay(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
-    int rc = VINF_SUCCESS;
-
     if (pPktHdr->cb < sizeof(ATSPKTREQTONEPLAY))
         return atsReplyBadSize(pThis, pInst, pPktHdr, sizeof(ATSPKTREQTONEPLAY));
@@ -742 +727 @@
         return atsReplyInvalidState(pThis, pInst, pPktHdr);
 
-    if (!pThis->Callbacks.pfnTonePlay)
-        return atsReplyRC(pThis, pInst, pPktHdr, VERR_NOT_SUPPORTED, "Playing tones not supported");
+    int rc = VINF_SUCCESS;
 
     PATSPKTREQTONEPLAY pReq = (PATSPKTREQTONEPLAY)pPktHdr;
-    rc = pThis->Callbacks.pfnTonePlay(pThis->Callbacks.pvUser, &pReq->ToneParms);
-
-    int rc2 = atsReplyAck(pThis, pInst, pPktHdr);
+
+    if (pThis->Callbacks.pfnTonePlay)
+        rc = pThis->Callbacks.pfnTonePlay(pThis->Callbacks.pvUser, &pReq->ToneParms);
+
     if (RT_SUCCESS(rc))
-        rc = rc2;
-
+        rc = atsReplyAck(pThis, pInst, pPktHdr);
+    else
+        rc = atsReplyRC(pThis, pInst, pPktHdr, rc, "Playing test tone failed");
     return rc;
 }
@@ -765 +751 @@
 static int atsDoToneRecord(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
-    int rc = VINF_SUCCESS;
-
     if (pPktHdr->cb < sizeof(ATSPKTREQTONEREC))
         return atsReplyBadSize(pThis, pInst, pPktHdr, sizeof(ATSPKTREQTONEREC));
@@ -773 +757 @@
         return atsReplyInvalidState(pThis, pInst, pPktHdr);
 
-    if (!pThis->Callbacks.pfnToneRecord)
-        return atsReplyRC(pThis, pInst, pPktHdr, VERR_NOT_SUPPORTED, "Recording tones not supported");
+    int rc = VINF_SUCCESS;
 
     PATSPKTREQTONEREC pReq = (PATSPKTREQTONEREC)pPktHdr;
-    rc = pThis->Callbacks.pfnToneRecord(pThis->Callbacks.pvUser, &pReq->ToneParms);
-
-    int rc2 = atsReplyAck(pThis, pInst, pPktHdr);
+
+    if (pThis->Callbacks.pfnToneRecord)
+        rc = pThis->Callbacks.pfnToneRecord(pThis->Callbacks.pvUser, &pReq->ToneParms);
+
     if (RT_SUCCESS(rc))
-        rc = rc2;
-
+        rc = atsReplyAck(pThis, pInst, pPktHdr);
+    else
+        rc = atsReplyRC(pThis, pInst, pPktHdr, rc, "Recording test tone failed");
     return rc;
 }