Changeset 54230 in vbox for trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp

Timestamp:

Feb 17, 2015 1:13:02 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Update.

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -766 +766 @@
 }
 
+static DECLCALLBACK(bool) drvHostOSSAudioIsEnabled(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
+{
+    NOREF(pInterface);
+    NOREF(enmDir);
+    return true; /* Always all enabled. */
+}
+
 static DECLCALLBACK(int) drvHostOSSAudioPlayOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHstStrmOut,
                                                 uint32_t *pcSamplesPlayed)
@@ -933 +940 @@
      * Init the static parts.
      */
-    pThis->pDrvIns                    = pDrvIns;
+    pThis->pDrvIns                   = pDrvIns;
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface  = drvHostOSSAudioQueryInterface;
-    pThis->IHostAudioR3.pfnInitIn     = drvHostOSSAudioInitIn;
-    pThis->IHostAudioR3.pfnInitOut    = drvHostOSSAudioInitOut;
-    pThis->IHostAudioR3.pfnControlIn  = drvHostOSSAudioControlIn;
-    pThis->IHostAudioR3.pfnControlOut = drvHostOSSAudioControlOut;
-    pThis->IHostAudioR3.pfnFiniIn     = drvHostOSSAudioFiniIn;
-    pThis->IHostAudioR3.pfnFiniOut    = drvHostOSSAudioFiniOut;
-    pThis->IHostAudioR3.pfnCaptureIn  = drvHostOSSAudioCaptureIn;
-    pThis->IHostAudioR3.pfnPlayOut    = drvHostOSSAudioPlayOut;
-    pThis->IHostAudioR3.pfnGetConf    = drvHostOSSAudioGetConf;
-    pThis->IHostAudioR3.pfnInit       = drvHostOSSAudioInit;
+    pDrvIns->IBase.pfnQueryInterface = drvHostOSSAudioQueryInterface;
+    /* IHostAudioR3 */
+    PDMAUDIO_IHOSTAUDIOR3_CALLBACKS(drvHostOSSAudio);
 
     return VINF_SUCCESS;