add SDLMain stuff for OS X; make the Makefiles ready for OS X cross compilation ...

[xonotic/darkplaces.git] / snd_coreaudio.c

diff --git a/snd_coreaudio.c b/snd_coreaudio.c
index c10789f0173ef48058d7f6fb9a2946c4c47210cb..246cff1d5f1a51e18c1569bc3088024954c8442e 100644 (file)
--- a/snd_coreaudio.c
+++ b/snd_coreaudio.c
@@ -138,14 +138,14 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
        Con_Printf("Initializing CoreAudio...\n");
 
-       if (suggested != NULL)
-               memcpy (suggested, requested, sizeof (suggested));
-
        if(requested->width != 2)
        {
                // we can only do 16bit per sample for now
                if(suggested != NULL)
+               {
+                       memcpy (suggested, requested, sizeof (*suggested));
                        suggested->width = 2;
+               }
                return false;
        }
 
@@ -217,6 +217,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        {
                if (suggested != NULL)
                {
+                       memcpy (suggested, requested, sizeof (*suggested));
                        suggested->channels = streamDesc.mChannelsPerFrame;
                        suggested->speed = streamDesc.mSampleRate;
                }