add cl_dyntexture.o to makefile

[xonotic/darkplaces.git] / snd_coreaudio.c

diff --git a/snd_coreaudio.c b/snd_coreaudio.c
index c10789f0173ef48058d7f6fb9a2946c4c47210cb..1e36c7683e199809d5015d15b19bb6224cbfbca8 100644 (file)
--- a/snd_coreaudio.c
+++ b/snd_coreaudio.c
@@ -20,12 +20,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#include "quakedef.h"
+
 #include <limits.h>
 #include <pthread.h>
 
 #include <CoreAudio/AudioHardware.h>
 
-#include "quakedef.h"
 #include "snd_main.h"
 
 
@@ -138,14 +139,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 +218,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;
                }