Index: /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp
===================================================================
--- /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp	(revision 68357)
+++ /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp	(revision 68358)
@@ -46,7 +46,4 @@
 #define VBOX_PULSEAUDIO_MAX_LOG_REL_ERRORS 32 /** @todo Make this configurable thru driver options. */
 
-/* Whether to use PulseAudio's asynchronous handling or not. */
-//#define PULSEAUDIO_ASYNC /** @todo Make this configurable thru driver options. */
-
 #ifndef PA_STREAM_NOFLAGS
 # define PA_STREAM_NOFLAGS (pa_context_flags_t)0x0000U /* since 0.9.19 */
@@ -66,5 +63,4 @@
     ( (PDRVHOSTPULSEAUDIO)((uintptr_t)pInterface - RT_OFFSETOF(DRVHOSTPULSEAUDIO, IHostAudio)) )
 
-#define PULSEAUDIO_ASYNC
 
 /*********************************************************************************************************************************
@@ -191,7 +187,7 @@
 static int  paEnumerate(PDRVHOSTPULSEAUDIO pThis, PPDMAUDIOBACKENDCFG pCfg, uint32_t fEnum);
 static int  paError(PDRVHOSTPULSEAUDIO pThis, const char *szMsg);
+#ifdef DEBUG
 static void paStreamCbUnderflow(pa_stream *pStream, void *pvContext);
-#ifdef PULSEAUDIO_ASYNC
- static void paStreamCbReqWrite(pa_stream *pStream, size_t cbLen, void *pvContext);
+static void paStreamCbReqWrite(pa_stream *pStream, size_t cbLen, void *pvContext);
 #endif
 static void paStreamCbSuccess(pa_stream *pStream, int fSuccess, void *pvContext);
@@ -407,5 +403,5 @@
 
 
-#ifdef PULSEAUDIO_ASYNC
+#ifdef DEBUG
 static void paStreamCbReqWrite(pa_stream *pStream, size_t cbLen, void *pvContext)
 {
@@ -421,5 +417,4 @@
     Log2Func(("Requested %zu bytes -- Current latency is %RU64ms\n", cbLen, usec / 1000));
 }
-#endif /* PULSEAUDIO_ASYNC */
 
 
@@ -448,5 +443,5 @@
     }
 
-#ifdef LOG_ENABLED
+# ifdef LOG_ENABLED
     pa_usec_t curLatencyUs = 0;
     pa_stream_get_latency(pStream, &curLatencyUs, NULL /* Neg */);
@@ -460,9 +455,8 @@
     Log2Func(("curPosWrite=%RU64ms, curTs=%RU64ms, curDelta=%RI64ms, curLatency=%RU64ms\n",
               curPosWritesUs / 1000, curTsUs / 1000, (((int64_t)curPosWritesUs - (int64_t)curTsUs) / 1000), curLatencyUs / 1000));
-#endif
-}
-
-
-#ifdef VBOX_STRICT
+# endif
+}
+
+
 static void paStreamCbOverflow(pa_stream *pStream, void *pvContext)
 {
@@ -471,5 +465,5 @@
     Log2Func(("Warning: Hit overflow\n"));
 }
-#endif
+#endif /* DEBUG */
 
 
@@ -528,9 +522,7 @@
         }
 
-#ifdef PULSEAUDIO_ASYNC
+#ifdef DEBUG
         pa_stream_set_write_callback       (pStream, paStreamCbReqWrite,     pStreamPA);
-#endif
         pa_stream_set_underflow_callback   (pStream, paStreamCbUnderflow,    pStreamPA);
-#ifdef VBOX_STRICT
         if (!fIn) /* Only for output streams. */
             pa_stream_set_overflow_callback(pStream, paStreamCbOverflow,     pStreamPA);