teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Properly use ALC_ALL_DEVICES_SPECIFIER in sound info 

- Properly use ALC_CAPTURE_DEVICE_SPECIFIER in sound info
This commit is contained in:
Thilo Schulz 2011-03-14 16:36:40 +00:00
parent e0eb1b4227
commit 379dfbf496
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/client/snd_openal.c
View File

@ -46,6 +46,8 @@ cvar_t *s_alAvailableDevices;
cvar_t *s_alAvailableInputDevices; cvar_t *s_alAvailableInputDevices;
static qboolean enumeration_ext = qfalse; static qboolean enumeration_ext = qfalse;
static qboolean enumeration_all_ext = qfalse;
static qboolean capture_ext = qfalse;
/* /*
================= =================
@ -2271,8 +2273,7 @@ void S_AL_MasterGain( float gain )
S_AL_SoundInfo S_AL_SoundInfo
================= =================
*/ */
static static void S_AL_SoundInfo(void)
void S_AL_SoundInfo( void )
{ {
Com_Printf( "OpenAL info:\n" ); Com_Printf( "OpenAL info:\n" );
Com_Printf( " Vendor: %s\n", qalGetString( AL_VENDOR ) ); Com_Printf( " Vendor: %s\n", qalGetString( AL_VENDOR ) );
@ -2280,15 +2281,22 @@ void S_AL_SoundInfo( void )
Com_Printf( " Renderer: %s\n", qalGetString( AL_RENDERER ) ); Com_Printf( " Renderer: %s\n", qalGetString( AL_RENDERER ) );
Com_Printf( " AL Extensions: %s\n", qalGetString( AL_EXTENSIONS ) ); Com_Printf( " AL Extensions: %s\n", qalGetString( AL_EXTENSIONS ) );
Com_Printf( " ALC Extensions: %s\n", qalcGetString( alDevice, ALC_EXTENSIONS ) ); Com_Printf( " ALC Extensions: %s\n", qalcGetString( alDevice, ALC_EXTENSIONS ) );
if(enumeration_ext)
{ if(enumeration_all_ext)
Com_Printf(" Device: %s\n", qalcGetString(alDevice, ALC_ALL_DEVICES_SPECIFIER));
else if(enumeration_ext)
Com_Printf(" Device: %s\n", qalcGetString(alDevice, ALC_DEVICE_SPECIFIER)); Com_Printf(" Device: %s\n", qalcGetString(alDevice, ALC_DEVICE_SPECIFIER));
if(enumeration_all_ext || enumeration_ext)
Com_Printf(" Available Devices:\n%s", s_alAvailableDevices->string); Com_Printf(" Available Devices:\n%s", s_alAvailableDevices->string);
#ifdef USE_VOIP #ifdef USE_VOIP
Com_Printf(" Input Device: %s\n", qalcGetString(alCaptureDevice, ALC_DEVICE_SPECIFIER)); if(capture_ext)
{
Com_Printf(" Input Device: %s\n", qalcGetString(alCaptureDevice, ALC_CAPTURE_DEVICE_SPECIFIER));
Com_Printf(" Available Input Devices:\n%s", s_alAvailableInputDevices->string); Com_Printf(" Available Input Devices:\n%s", s_alAvailableInputDevices->string);
#endif
} }
#endif
} }
@ -2385,10 +2393,12 @@ qboolean S_AL_Init( soundInterface_t *si )
if(inputdevice && !*inputdevice) if(inputdevice && !*inputdevice)
inputdevice = NULL; inputdevice = NULL;
// Device enumeration support // Device enumeration support
if((enumeration_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT")) || enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT") enumeration_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT");
)
if(enumeration_ext || enumeration_all_ext)
{ {
char devicenames[16384] = ""; char devicenames[16384] = "";
const char *devicelist; const char *devicelist;
@ -2501,6 +2511,8 @@ qboolean S_AL_Init( soundInterface_t *si )
const char *defaultinputdevice; const char *defaultinputdevice;
int curlen; int curlen;
capture_ext = qtrue;
// get all available input devices + the default input device name. // get all available input devices + the default input device name.
inputdevicelist = qalcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); inputdevicelist = qalcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
defaultinputdevice = qalcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); defaultinputdevice = qalcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);