This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 1a44a9a0f8a374be0bd0913f360944dda5c5e1a4 Author: m4n4t4...@gmail.com <m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a> Date: Wed Jun 4 22:47:04 2014 +0000 All: Use OpenAL-Soft by default on OSX instead of Apple's implementation --- MP/code/client/snd_openal.c | 14 ++++++++++---- MP/code/libs/macosx/libopenal.dylib | Bin 0 -> 1096400 bytes SP/code/client/snd_openal.c | 10 ++++++++-- SP/code/libs/macosx/libopenal.dylib | Bin 0 -> 1096400 bytes 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/MP/code/client/snd_openal.c b/MP/code/client/snd_openal.c index 890a6ef..4f9cfeb 100644 --- a/MP/code/client/snd_openal.c +++ b/MP/code/client/snd_openal.c @@ -2314,7 +2314,7 @@ static cvar_t *s_alCapture; #ifdef _WIN32 #define ALDRIVER_DEFAULT "OpenAL32.dll" #elif defined(MACOS_X) -#define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL" +#define ALDRIVER_DEFAULT "libopenal.dylib" #elif defined(__OpenBSD__) #define ALDRIVER_DEFAULT "libopenal.so" #else @@ -2535,7 +2535,11 @@ static void S_AL_SoundInfo(void) #ifdef USE_VOIP if(capture_ext) { +#ifdef MACOS_X + Com_Printf(" Input Device: %s\n", qalcGetString(alCaptureDevice, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)); +#else Com_Printf(" Input Device: %s\n", qalcGetString(alCaptureDevice, ALC_CAPTURE_DEVICE_SPECIFIER)); +#endif Com_Printf(" Available Input Devices:\n%s", s_alAvailableInputDevices->string); } #endif @@ -2625,10 +2629,12 @@ qboolean S_AL_Init( soundInterface_t *si ) // Load QAL if( !QAL_Init( s_alDriver->string ) ) { -#ifdef _WIN32 - if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) && !QAL_Init( "OpenAL64.dll" ) ) { +#if defined( _WIN32 ) + if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) && !QAL_Init( "OpenAL64.dll" ) ) { +#elif defined ( MACOS_X ) + if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) && !QAL_Init( "/System/Library/Frameworks/OpenAL.framework/OpenAL" ) ) { #else - if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) || !QAL_Init( ALDRIVER_DEFAULT ) ) { + if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) || !QAL_Init( ALDRIVER_DEFAULT ) ) { #endif return qfalse; } diff --git a/MP/code/libs/macosx/libopenal.dylib b/MP/code/libs/macosx/libopenal.dylib new file mode 100755 index 0000000..0c72aa7 Binary files /dev/null and b/MP/code/libs/macosx/libopenal.dylib differ diff --git a/SP/code/client/snd_openal.c b/SP/code/client/snd_openal.c index 648c772..856caa9 100644 --- a/SP/code/client/snd_openal.c +++ b/SP/code/client/snd_openal.c @@ -2353,7 +2353,7 @@ static cvar_t *s_alCapture; #ifdef _WIN32 #define ALDRIVER_DEFAULT "OpenAL32.dll" #elif defined(MACOS_X) -#define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL" +#define ALDRIVER_DEFAULT "libopenal.dylib" #elif defined(__OpenBSD__) #define ALDRIVER_DEFAULT "libopenal.so" #else @@ -2574,7 +2574,11 @@ static void S_AL_SoundInfo(void) #ifdef USE_VOIP if(capture_ext) { +#ifdef MACOS_X + Com_Printf(" Input Device: %s\n", qalcGetString(alCaptureDevice, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER)); +#else Com_Printf(" Input Device: %s\n", qalcGetString(alCaptureDevice, ALC_CAPTURE_DEVICE_SPECIFIER)); +#endif Com_Printf(" Available Input Devices:\n%s", s_alAvailableInputDevices->string); } #endif @@ -2664,8 +2668,10 @@ qboolean S_AL_Init( soundInterface_t *si ) // Load QAL if( !QAL_Init( s_alDriver->string ) ) { -#ifdef _WIN32 +#if defined( _WIN32 ) if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) && !QAL_Init( "OpenAL64.dll" ) ) { +#elif defined ( MACOS_X ) + if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) && !QAL_Init( "/System/Library/Frameworks/OpenAL.framework/OpenAL" ) ) { #else if( !Q_stricmp( s_alDriver->string, ALDRIVER_DEFAULT ) || !QAL_Init( ALDRIVER_DEFAULT ) ) { #endif diff --git a/SP/code/libs/macosx/libopenal.dylib b/SP/code/libs/macosx/libopenal.dylib new file mode 100755 index 0000000..0c72aa7 Binary files /dev/null and b/SP/code/libs/macosx/libopenal.dylib differ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits