From 94b3c4a3a89623409a6506996a85fd774915068c Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 20 Feb 2015 11:57:37 -0800 Subject: [PATCH] simpler less draconian workaround --- libraries/audio-client/src/AudioClient.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h index 941fcc6c12..7ac445a7fc 100644 --- a/libraries/audio-client/src/AudioClient.h +++ b/libraries/audio-client/src/AudioClient.h @@ -56,14 +56,8 @@ static const int NUM_AUDIO_CHANNELS = 2; static const int DEFAULT_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 3; static const int MIN_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 1; -#ifdef _WIN32 - // WORKAROUND: Some sound devices on Windows (at least 8.1) will get scratchy if their output - // buffer is set too high so we have to limit the number of frames in the buffer. - static const int MAX_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 5; -#else - static const int MAX_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 20; -#endif -#ifdef Q_OS_ANDROID +static const int MAX_AUDIO_OUTPUT_BUFFER_SIZE_FRAMES = 20; +#if defined(Q_OS_ANDROID) || defined(Q_OS_WIN) static const int DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED = false; #else static const int DEFAULT_AUDIO_OUTPUT_STARVE_DETECTION_ENABLED = true;