add a new "scale" property in font files. Specifying, e.g., "scale 1.2" in a font...

[xonotic/darkplaces.git] / snd_coreaudio.c

diff --git a/snd_coreaudio.c b/snd_coreaudio.c
index cb653f0447090953bc792784d52f8db44c9b748c..d518ae95f5360869fc55649866e311bf65840716 100644 (file)
--- a/snd_coreaudio.c
+++ b/snd_coreaudio.c
@@ -55,7 +55,7 @@ static OSStatus audioDeviceIOProc(AudioDeviceID inDevice,
 {
        float *outBuffer;
        unsigned int frameCount, factor, sampleIndex;
-       const float scale = 1.0f / SHRT_MAX;
+       float scale = 1.0f / SHRT_MAX;
 
        outBuffer = (float*)outOutputData->mBuffers[0].mData;
        factor = snd_renderbuffer->format.channels * snd_renderbuffer->format.width;
@@ -239,7 +239,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                return false;
        }
 
-       if(streamDesc.mFormatID != kAudioFormatLinearPCM)
+       if(streamDesc.mFormatID == kAudioFormatLinearPCM)
        {
                // Add the callback function
                status = AudioDeviceAddIOProc(outputDeviceID, audioDeviceIOProc, NULL);
@@ -258,7 +258,10 @@ 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;
                                                }