446

[xonotic/darkplaces.git] / snd_coreaudio.c

diff --git a/snd_coreaudio.c b/snd_coreaudio.c
index a7f711e7f3915f63b7933375f8882e0dff0c4223..ca8da917c921deab31858f7b7cb0f771e9a19008 100644 (file)
--- a/snd_coreaudio.c
+++ b/snd_coreaudio.c
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include <limits.h>
+#include <pthread.h>
 
 #include <CoreAudio/AudioHardware.h>
 
@@ -56,7 +57,7 @@ static OSStatus audioDeviceIOProc(AudioDeviceID inDevice,
        outBuffer = (float*)outOutputData->mBuffers[0].mData;
        factor = snd_renderbuffer->format.channels * snd_renderbuffer->format.width;
        frameCount = 0;
-       
+
        // Lock the snd_renderbuffer
        if (SndSys_LockRenderBuffer())
        {
@@ -81,7 +82,7 @@ static OSStatus audioDeviceIOProc(AudioDeviceID inDevice,
                        samples = (const short*)(&snd_renderbuffer->ring[startOffset * factor]);
                        for (sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
                                outBuffer[sampleIndex] = samples[sampleIndex] * scale;
-                       
+
                        outBuffer = &outBuffer[sampleCount];
                        sampleCount = frameCount * snd_renderbuffer->format.channels - sampleCount;
                        samples = (const short*)(&snd_renderbuffer->ring[0]);
@@ -106,9 +107,10 @@ static OSStatus audioDeviceIOProc(AudioDeviceID inDevice,
        if (frameCount < submissionChunk)
        {
                unsigned int missingFrames;
-               
+
                missingFrames = submissionChunk - frameCount;
-               Con_DPrintf("audioDeviceIOProc: %u sample frames missing\n", missingFrames);
+               if (developer.integer >= 200)
+                       Con_Printf("audioDeviceIOProc: %u sample frames missing\n", missingFrames);
                memset(&outBuffer[frameCount * snd_renderbuffer->format.channels], 0, missingFrames * sizeof(outBuffer[0]));
        }
 
@@ -135,7 +137,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                return true;
 
        Con_Printf("Initializing CoreAudio...\n");
-       
+
        // We only accept 16-bit samples for the moment
        if (requested->width != 2)
        {
@@ -148,7 +150,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
                return false;
        }
-       
+
        // Get the output device
        propertySize = sizeof(outputDeviceID);
        status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propertySize, &outputDeviceID);
@@ -274,7 +276,7 @@ void SndSys_Shutdown(void)
                return;
        }
        s_isRunning = false;
-       
+
        pthread_mutex_destroy(&coreaudio_mutex);
 
        status = AudioDeviceRemoveIOProc(outputDeviceID, audioDeviceIOProc);