]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix CoreAudio support so that it suggests a proper sound speed when the
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 17 May 2007 11:43:53 +0000 (11:43 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 17 May 2007 11:43:53 +0000 (11:43 +0000)
hardware returns a different value

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7296 d7cf8633-e32d-0410-b094-e92efae38249

snd_coreaudio.c

index fa68470ddcba8c1d58b439bea43cda2fa6e4abb9..cdcf61397d3e3b5ffdfaa71bfb134800aa65ad3f 100644 (file)
@@ -200,6 +200,18 @@ 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;
        }
+
+       // Suggest the proper speed if it differs
+       if (requested.speed != streamDesc.mSampleRate)
+       {
+               if (suggested != NULL)
+               {
+                       memcpy (suggested, requested, sizeof (suggested));
+                       suggested->speed = streamDesc.mSampleRate;
+               }
+               return false;
+       }
+
        Con_DPrint ("   Hardware format:\n");
        Con_DPrintf("    %5d mSampleRate\n", (unsigned int)streamDesc.mSampleRate);
        Con_DPrintf("     %c%c%c%c mFormatID\n",