Reworked v_isometric code significantly, it now defaults to a proper isometric view...

[xonotic/darkplaces.git] / snd_coreaudio.c

diff --git a/snd_coreaudio.c b/snd_coreaudio.c
index d518ae95f5360869fc55649866e311bf65840716..ce8fff5bcf7d02073d025d78cc6b9bb20c929f9d 100644 (file)
--- a/snd_coreaudio.c
+++ b/snd_coreaudio.c
@@ -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
@@ -123,8 +124,8 @@ static OSStatus audioDeviceIOProc(AudioDeviceID inDevice,
                unsigned int missingFrames;
 
                missingFrames = submissionChunk - frameCount;
-               if (developer.integer >= 1000 && vid_activewindow)
-                       Con_Printf("audioDeviceIOProc: %u sample frames missing\n", missingFrames);
+               if (developer_insane.integer && vid_activewindow)
+                       Con_DPrintf("audioDeviceIOProc: %u sample frames missing\n", missingFrames);
                memset(&outBuffer[frameCount * snd_renderbuffer->format.channels], 0, missingFrames * sizeof(outBuffer[0]));
        }
 
@@ -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;
                                                }
@@ -387,3 +385,15 @@ void SndSys_UnlockRenderBuffer (void)
 {
        pthread_mutex_unlock(&coreaudio_mutex);
 }
+
+/*
+====================
+SndSys_SendKeyEvents
+
+Send keyboard events originating from the sound system (e.g. MIDI)
+====================
+*/
+void SndSys_SendKeyEvents(void)
+{
+       // not supported
+}