===========================================================================
*/
+#include "quakedef.h"
+
#include <limits.h>
#include <pthread.h>
#include <CoreAudio/AudioHardware.h>
-#include "quakedef.h"
#include "snd_main.h"
outBuffer = (float*)outOutputData->mBuffers[0].mData;
factor = snd_renderbuffer->format.channels * snd_renderbuffer->format.width;
frameCount = 0;
-
+
// Lock the snd_renderbuffer
if (SndSys_LockRenderBuffer())
{
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]);
if (frameCount < submissionChunk)
{
unsigned int missingFrames;
-
+
missingFrames = submissionChunk - frameCount;
- Con_DPrintf("audioDeviceIOProc: %u sample frames missing\n", missingFrames);
+ if (developer.integer >= 1000 && vid_activewindow)
+ Con_Printf("audioDeviceIOProc: %u sample frames missing\n", missingFrames);
memset(&outBuffer[frameCount * snd_renderbuffer->format.channels], 0, missingFrames * sizeof(outBuffer[0]));
}
return true;
Con_Printf("Initializing CoreAudio...\n");
-
- // We only accept 16-bit samples for the moment
- if (requested->width != 2)
+
+ if(requested->width != 2)
{
- // Suggest a 16-bit format instead
- if (suggested != NULL)
+ // we can only do 16bit per sample for now
+ if(suggested != NULL)
{
- memcpy (suggested, requested, sizeof (suggested));
+ memcpy (suggested, requested, sizeof (*suggested));
suggested->width = 2;
}
-
return false;
}
-
+
// Get the output device
propertySize = sizeof(outputDeviceID);
status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propertySize, &outputDeviceID);
Con_Printf("CoreAudio: AudioDeviceGetProperty() returned %d when getting kAudioDevicePropertyStreamFormat\n", status);
return false;
}
+
Con_DPrint (" Hardware format:\n");
Con_DPrintf(" %5d mSampleRate\n", (unsigned int)streamDesc.mSampleRate);
Con_DPrintf(" %c%c%c%c mFormatID\n",
Con_DPrintf(" %5d mChannelsPerFrame\n", streamDesc.mChannelsPerFrame);
Con_DPrintf(" %5d mBitsPerChannel\n", streamDesc.mBitsPerChannel);
+ // Suggest proper settings if they differ
+ if (requested->channels != streamDesc.mChannelsPerFrame || requested->speed != streamDesc.mSampleRate)
+ {
+ if (suggested != NULL)
+ {
+ memcpy (suggested, requested, sizeof (*suggested));
+ suggested->channels = streamDesc.mChannelsPerFrame;
+ suggested->speed = streamDesc.mSampleRate;
+ }
+ return false;
+ }
+
if(streamDesc.mFormatID != kAudioFormatLinearPCM)
{
Con_Print("CoreAudio: Default audio device doesn't support linear PCM!\n");
return;
}
s_isRunning = false;
-
+
pthread_mutex_destroy(&coreaudio_mutex);
status = AudioDeviceRemoveIOProc(outputDeviceID, audioDeviceIOProc);