Changeset 63714 in vbox for trunk/src

Timestamp:

Sep 5, 2016 1:03:53 PM (9 years ago)

Author:

vboxsync

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

110489

Message:

Build fix.

File:

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

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

@@ -84 +84 @@
 typedef FNDIRECTSOUNDCAPTUREENUMERATEW *PFNDIRECTSOUNDCAPTUREENUMERATEW;
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
 # define VBOX_DSOUND_MAX_EVENTS 3
 
@@ -93 +93 @@
     DSOUNDEVENT_OUTPUT,
  } DSOUNDEVENT;
-#endif /* VBOX_WITH_AUDIO_CALLBACKS */
+#endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
 
 typedef struct DSOUNDHOSTCFG
@@ -152 +152 @@
     /** Whether this backend supports any audio output. */
     bool                fEnabledOut;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
     /** Pointer to the audio connector interface of the driver/device above us. */
     PPDMIAUDIOCONNECTOR pUpIAudioConnector;
@@ -207 +207 @@
 static void     dsoundDeviceRemove(PDSOUNDDEV pDev);
 static int      dsoundDevicesEnumerate(PDRVHOSTDSOUND pThis, PPDMAUDIOBACKENDCFG pCfg);
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
 static int      dsoundNotifyThread(PDRVHOSTDSOUND pThis, bool fShutdown);
 #endif
@@ -528 +528 @@
         if (SUCCEEDED(hr))
         {
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
             if (pThis->aEvents[DSOUNDEVENT_OUTPUT] != NULL)
             {
@@ -607 +607 @@
          */
         bd.dwFlags     = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_LOCSOFTWARE;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
         bd.dwFlags    |= DSBCAPS_CTRLPOSITIONNOTIFY;
 #endif
@@ -684 +684 @@
         DSLOG(("DSound: cMaxSamplesInBuffer=%RU32\n", pDSoundStream->cMaxSamplesInBuffer));
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
         /*
          * Install notification.
@@ -730 +730 @@
         hr = IDirectSoundBuffer8_Play(pDSoundStream->pDSB, 0, 0, 0);
 
-#endif /* VBOX_WITH_AUDIO_CALLBACKS */
+#endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
 
     } while (0);
@@ -1216 +1216 @@
             {
                 DWORD fFlags = 0;
-#ifndef VBOX_WITH_AUDIO_CALLBACKS
+#ifndef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
                 fFlags |= DSCBSTART_LOOPING;
 #endif
@@ -1412 +1412 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
         if (   pThis->fEnabledOut != RT_BOOL(cbCtx.cDevOut)
             || pThis->fEnabledIn  != RT_BOOL(cbCtx.cDevIn))
@@ -1639 +1639 @@
 
             DWORD fFlags = 0;
-#ifndef VBOX_WITH_AUDIO_CALLBACKS
+#ifndef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
             fFlags |= DSCBSTART_LOOPING;
 #endif
@@ -1933 +1933 @@
 }
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
 
 static int dsoundNotifyThread(PDRVHOSTDSOUND pThis, bool fShutdown)
@@ -2042 +2042 @@
 }
 
-#endif /* VBOX_WITH_AUDIO_CALLBACKS */
+#endif /* VBOX_WITH_AUDIO_DEVICE_CALLBACKS */
 
 
@@ -2054 +2054 @@
     LogFlowFuncEnter();
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
     int rc = dsoundNotifyThread(pThis, true /* fShutdown */);
     AssertRC(rc);
@@ -2094 +2094 @@
         IDirectSound_Release(pDirectSound);
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
         /* Create notification event. */
         pThis->aEvents[DSOUNDEVENT_NOTIFY] = CreateEvent(NULL /* Security attribute */,
@@ -2369 +2369 @@
     PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvHostDSound);
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
     /*
      * Get the IAudioConnector interface of the above driver/device.
@@ -2389 +2389 @@
     pThis->fEnabledIn  = false;
     pThis->fEnabledOut = false;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
+#ifdef VBOX_WITH_AUDIO_DEVICE_CALLBACKS
     pThis->fStopped    = false;
     pThis->fShutdown   = false;