]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Fixed threaded mode in the CoreAudio sound module
authormolivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 28 Aug 2008 10:30:38 +0000 (10:30 +0000)
committermolivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 28 Aug 2008 10:30:38 +0000 (10:30 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8484 d7cf8633-e32d-0410-b094-e92efae38249

snd_coreaudio.c

index d518ae95f5360869fc55649866e311bf65840716..91b776034380233dcac8ad82a50fa69ef534a374 100644 (file)
@@ -73,6 +73,7 @@ static OSStatus audioDeviceIOProc(AudioDeviceID inDevice,
                if (snd_usethreadedmixing)
                {
                        S_MixToBuffer(mixbuffer, submissionChunk);
+                       sampleCount = submissionChunk * snd_renderbuffer->format.channels;
                        for (sampleIndex = 0; sampleIndex < sampleCount; sampleIndex++)
                                outBuffer[sampleIndex] = mixbuffer[sampleIndex] * scale;
                        // unlock the mutex now
@@ -258,10 +259,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                                                if (!status)
                                                {
                                                        s_isRunning = true;
-#if 0
-// FIXME: This causes crashes and weird problems, why doesn't it work?
                                                        snd_threaded = true;
-#endif
                                                        Con_Print("   Initialization successful\n");
                                                        return true;
                                                }