changed all references to entity_render_t->frame to frame2 to eliminate

[xonotic/darkplaces.git] / snd_coreaudio.c

diff --git a/snd_coreaudio.c b/snd_coreaudio.c
index fa68470ddcba8c1d58b439bea43cda2fa6e4abb9..246cff1d5f1a51e18c1569bc3088024954c8442e 100644 (file)
--- a/snd_coreaudio.c
+++ b/snd_coreaudio.c
@@ -138,16 +138,14 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
        Con_Printf("Initializing CoreAudio...\n");
 
-       // We only accept 16-bit samples for the moment
-       if (requested->width != 2)
+       if(requested->width != 2)
        {
-               // Suggest a 16-bit format instead
-               if (suggested != NULL)
+               // we can only do 16bit per sample for now
+               if(suggested != NULL)
                {
-                       memcpy (suggested, requested, sizeof (suggested));
+                       memcpy (suggested, requested, sizeof (*suggested));
                        suggested->width = 2;
                }
-
                return false;
        }
 
@@ -200,6 +198,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                Con_Printf("CoreAudio: AudioDeviceGetProperty() returned %d when getting kAudioDevicePropertyStreamFormat\n", status);
                return false;
        }
+
        Con_DPrint ("   Hardware format:\n");
        Con_DPrintf("    %5d mSampleRate\n", (unsigned int)streamDesc.mSampleRate);
        Con_DPrintf("     %c%c%c%c mFormatID\n",
@@ -213,6 +212,18 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        Con_DPrintf("    %5d mChannelsPerFrame\n", streamDesc.mChannelsPerFrame);
        Con_DPrintf("    %5d mBitsPerChannel\n", streamDesc.mBitsPerChannel);
 
+       // Suggest proper settings if they differ
+       if (requested->channels != streamDesc.mChannelsPerFrame || requested->speed != streamDesc.mSampleRate)
+       {
+               if (suggested != NULL)
+               {
+                       memcpy (suggested, requested, sizeof (*suggested));
+                       suggested->channels = streamDesc.mChannelsPerFrame;
+                       suggested->speed = streamDesc.mSampleRate;
+               }
+               return false;
+       }
+
        if(streamDesc.mFormatID != kAudioFormatLinearPCM)
        {
                Con_Print("CoreAudio: Default audio device doesn't support linear PCM!\n");