csqc patch from [515], seems to work with [515]'s dpcsqc test mod, needs a lot of...

[xonotic/darkplaces.git] / snd_coreaudio.c

diff --git a/snd_coreaudio.c b/snd_coreaudio.c
index 5788387e939edb5bb2b5e140d5e17c2e0c65d117..093893016ab4486fb85c2312142c22243fc362d9 100644 (file)
--- a/snd_coreaudio.c
+++ b/snd_coreaudio.c
@@ -147,17 +147,17 @@ qboolean SNDDMA_Init(void)
                return false;
        }
        Con_DPrintf("   Hardware format:\n");
-       Con_DPrintf("    %5d mSampleRate\n", (unsigned int)outputStreamBasicDescription.mSampleRate);
-       Con_DPrintf("     %c%c%c%c mFormatID\n",
+       Con_DPrintf("    %5d mSampleRate\n", (unsigned int)outputStreamBasicDescription.mSampleRate);
+       Con_DPrintf("     %c%c%c%c mFormatID\n",
                                (outputStreamBasicDescription.mFormatID & 0xff000000) >> 24,
                                (outputStreamBasicDescription.mFormatID & 0x00ff0000) >> 16,
                                (outputStreamBasicDescription.mFormatID & 0x0000ff00) >>  8,
                                (outputStreamBasicDescription.mFormatID & 0x000000ff) >>  0);
-       Con_DPrintf("    %5d mBytesPerPacket\n", outputStreamBasicDescription.mBytesPerPacket);
-       Con_DPrintf("    %5d mFramesPerPacket\n", outputStreamBasicDescription.mFramesPerPacket);
-       Con_DPrintf("    %5d mBytesPerFrame\n", outputStreamBasicDescription.mBytesPerFrame);
-       Con_DPrintf("    %5d mChannelsPerFrame\n", outputStreamBasicDescription.mChannelsPerFrame);
-       Con_DPrintf("    %5d mBitsPerChannel\n", outputStreamBasicDescription.mBitsPerChannel);
+       Con_DPrintf("    %5d mBytesPerPacket\n", outputStreamBasicDescription.mBytesPerPacket);
+       Con_DPrintf("    %5d mFramesPerPacket\n", outputStreamBasicDescription.mFramesPerPacket);
+       Con_DPrintf("    %5d mBytesPerFrame\n", outputStreamBasicDescription.mBytesPerFrame);
+       Con_DPrintf("    %5d mChannelsPerFrame\n", outputStreamBasicDescription.mChannelsPerFrame);
+       Con_DPrintf("    %5d mBitsPerChannel\n", outputStreamBasicDescription.mBitsPerChannel);
 
        if(outputStreamBasicDescription.mFormatID != kAudioFormatLinearPCM)
        {
@@ -174,7 +174,7 @@ qboolean SNDDMA_Init(void)
        }
 
        maxMixedSamples = BUFFER_SIZE;
-       s_mixedSamples = Mem_Alloc (snd_mempool, sizeof(*s_mixedSamples) * maxMixedSamples);
+       s_mixedSamples = (short *)Mem_Alloc (snd_mempool, sizeof(*s_mixedSamples) * maxMixedSamples);
        Con_DPrintf("   Buffer size = %d samples (%d chunks)\n",
                                maxMixedSamples, (maxMixedSamples / submissionChunk));
 
@@ -183,8 +183,9 @@ qboolean SNDDMA_Init(void)
        shm->format.speed = outputStreamBasicDescription.mSampleRate;
        shm->format.channels = outputStreamBasicDescription.mChannelsPerFrame;
        shm->format.width = 2;
+       shm->sampleframes = maxMixedSamples / shm->format.channels;
        shm->samples = maxMixedSamples;
-       shm->buffer = (qbyte *)s_mixedSamples;
+       shm->buffer = (unsigned char *)s_mixedSamples;
        shm->samplepos = 0;
 
        // We haven't enqueued anything yet