aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-08-03 19:31:42 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-08-03 19:31:42 +0000
commit7e79fa2629cce14e4ee4649dec92468748109b59 (patch)
tree4181582fc63a3b4d895e142789b48a0ca704bf62 /code
parent5472c69ea3040b3837dc4584562a6e060e8b0144 (diff)
downloadioquake3-aero-7e79fa2629cce14e4ee4649dec92468748109b59.tar.gz
ioquake3-aero-7e79fa2629cce14e4ee4649dec92468748109b59.zip
* Restrict OpenAL capture support test hack to OS X, where it is required; this
fixes a crash on exit with Windows when using OpenAL git-svn-id: svn://svn.icculus.org/quake3/trunk@1433 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
-rw-r--r--code/client/cl_main.c2
-rw-r--r--code/client/snd_openal.c23
2 files changed, 18 insertions, 7 deletions
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 4f6d4c2..98686ad 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -3181,7 +3181,7 @@ void CL_Shutdown( void ) {
Com_Printf( "----- CL_Shutdown -----\n" );
if ( recursive ) {
- printf ("recursive shutdown\n");
+ Com_Printf( "WARNING: Recursive shutdown\n" );
return;
}
recursive = qtrue;
diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c
index 6147131..98f193d 100644
--- a/code/client/snd_openal.c
+++ b/code/client/snd_openal.c
@@ -2072,22 +2072,33 @@ qboolean S_AL_Init( soundInterface_t *si )
// !!! FIXME: add support for capture device enumeration.
// !!! FIXME: add some better error reporting.
s_alCapture = Cvar_Get( "s_alCapture", "1", CVAR_ARCHIVE | CVAR_LATCH );
- if (!s_alCapture->integer) {
+ if (!s_alCapture->integer)
+ {
Com_Printf("OpenAL capture support disabled by user ('+set s_alCapture 1' to enable)\n");
+ }
#if USE_MUMBLE
- } else if (cl_useMumble->integer) {
+ else if (cl_useMumble->integer)
+ {
Com_Printf("OpenAL capture support disabled for Mumble support\n");
+ }
#endif
- } else {
+ else
+ {
+#ifdef MACOS_X
// !!! FIXME: Apple has a 1.1-compliant OpenAL, which includes
// !!! FIXME: capture support, but they don't list it in the
// !!! FIXME: extension string. We need to check the version string,
// !!! FIXME: then the extension string, but that's too much trouble,
// !!! FIXME: so we'll just check the function pointer for now.
- //if (qalcIsExtensionPresent(NULL, "ALC_EXT_capture")) {
- if (qalcCaptureOpenDevice == NULL) {
+ if (qalcCaptureOpenDevice == NULL)
+#else
+ if (!qalcIsExtensionPresent(NULL, "ALC_EXT_capture"))
+#endif
+ {
Com_Printf("No ALC_EXT_capture support, can't record audio.\n");
- } else {
+ }
+ else
+ {
// !!! FIXME: 8000Hz is what Speex narrowband mode needs, but we
// !!! FIXME: should probably open the capture device after
// !!! FIXME: initializing Speex so we can change to wideband