Changeset 70888 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 7, 2018 9:57:49 AM (7 years ago)

Author:

vboxsync

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

120714

Message:

Audio/DrvHostDSound.cpp: Renamed VBOX_WITH_AUDIO_DEVICE_CALLBACKS -> VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS.

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (17 diffs)

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

@@ -90 +90 @@
 typedef FNDIRECTSOUNDCAPTURECREATE8 *PFNDIRECTSOUNDCAPTURECREATE8;
 
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
 # define VBOX_DSOUND_MAX_EVENTS 3
 
@@ -99 +99 @@
     DSOUNDEVENT_OUTPUT,
  } DSOUNDEVENT;
-#endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
+#endif /* VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS */
 
 typedef struct DSOUNDHOSTCFG
@@ -183 +183 @@
     PFNPDMHOSTAUDIOCALLBACK     pfnCallback;
 #endif
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
     /** Pointer to the audio connector interface of the driver/device above us. */
     PPDMIAUDIOCONNECTOR         pUpIAudioConnector;
@@ -240 +240 @@
 static void     dsoundDeviceRemove(PDSOUNDDEV pDev);
 static int      dsoundDevicesEnumerate(PDRVHOSTDSOUND pThis, PPDMAUDIOBACKENDCFG pCfg);
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
 static int      dsoundNotifyThread(PDRVHOSTDSOUND pThis, bool fShutdown);
 #endif
@@ -582 +582 @@
         if (SUCCEEDED(hr))
         {
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
             if (pThis->aEvents[DSOUNDEVENT_OUTPUT] != NULL)
             {
@@ -682 +682 @@
          */
         bd.dwFlags     = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_LOCSOFTWARE;
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
         bd.dwFlags    |= DSBCAPS_CTRLPOSITIONNOTIFY;
 #endif
@@ -762 +762 @@
         DSLOG(("DSound: cMaxSamplesInBuffer=%RU32\n", pStreamDS->Out.cbBufSize));
 
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
         /*
          * Install notification.
@@ -810 +810 @@
             break;
 
-#endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
+#endif /* VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS */
 
         pCfgAcq->cFrameBufferHint = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, pThis->cfg.cbBufferOut);
@@ -1318 +1318 @@
             {
                 DWORD fFlags = 0;
-#ifndef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifndef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
                 fFlags |= DSCBSTART_LOOPING;
 #endif
@@ -1526 +1526 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
         if (   pThis->fEnabledOut != RT_BOOL(cbCtx.cDevOut)
             || pThis->fEnabledIn  != RT_BOOL(cbCtx.cDevIn))
@@ -1756 +1756 @@
 
             DWORD fFlags = 0;
-#ifndef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifndef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
             fFlags |= DSCBSTART_LOOPING;
 #endif
@@ -2031 +2031 @@
 }
 
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
 
 static int dsoundNotifyThread(PDRVHOSTDSOUND pThis, bool fShutdown)
@@ -2140 +2140 @@
 }
 
-#endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
+#endif /* VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS */
 
 
@@ -2152 +2152 @@
     LogFlowFuncEnter();
 
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
     int rc = dsoundNotifyThread(pThis, true /* fShutdown */);
     AssertRC(rc);
@@ -2192 +2192 @@
         IDirectSound_Release(pDirectSound);
 
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
         /* Create notification event. */
         pThis->aEvents[DSOUNDEVENT_NOTIFY] = CreateEvent(NULL /* Security attribute */,
@@ -2645 +2645 @@
 #endif
 
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
     /*
      * Get the IAudioConnector interface of the above driver/device.
@@ -2665 +2665 @@
     pThis->fEnabledIn  = false;
     pThis->fEnabledOut = false;
-#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DSOUND_NOTIFICATIONS
     pThis->fStopped    = false;
     pThis->fShutdown   = false;