From 03d4833aa9508def9b3f6ade48500a89bb09ac0a Mon Sep 17 00:00:00 2001 From: dhewg Date: Mon, 2 Jan 2012 19:19:41 +0100 Subject: [PATCH] Use memory mapped async mixing on OSX The OSX specific preferences dialog sets com_asyncSound to "1" when OpenAL is used, do the same. --- neo/framework/Common.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neo/framework/Common.cpp b/neo/framework/Common.cpp index c8bc14ff..efe8f804 100644 --- a/neo/framework/Common.cpp +++ b/neo/framework/Common.cpp @@ -80,9 +80,7 @@ idCVar com_memoryMarker( "com_memoryMarker", "-1", CVAR_INTEGER | CVAR_SYSTEM | idCVar com_preciseTic( "com_preciseTic", "1", CVAR_BOOL|CVAR_SYSTEM, "run one game tick every async thread update" ); idCVar com_asyncInput( "com_asyncInput", "0", CVAR_BOOL|CVAR_SYSTEM, "sample input from the async thread" ); #define ASYNCSOUND_INFO "0: mix sound inline, 1: memory mapped async mix, 2: callback mixing, 3: write async mix" -#if defined( MACOS_X ) -idCVar com_asyncSound( "com_asyncSound", "2", CVAR_INTEGER|CVAR_SYSTEM|CVAR_ROM, ASYNCSOUND_INFO ); -#elif defined( __unix__ ) +#if defined( __unix__ ) && !defined( MACOS_X ) idCVar com_asyncSound( "com_asyncSound", "3", CVAR_INTEGER|CVAR_SYSTEM|CVAR_ROM, ASYNCSOUND_INFO ); #else idCVar com_asyncSound( "com_asyncSound", "1", CVAR_INTEGER|CVAR_SYSTEM, ASYNCSOUND_INFO, 0, 1 );