Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

List available devices and use Generic Software if Generic Hardware is the default

Browse source
This commit is contained in:
smallmodel 2024-08-22 13:30:04 +02:00
parent 4839a2026b
commit f67a7c6621
No known key found for this signature in database
GPG key ID: A96F163ED4891440
1 changed files with 66 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

69
code/client/snd_openal_new.cpp
View file

@ -54,6 +54,7 @@ cvar_t *s_obstruction_cal_time;
cvar_t *s_lastSoundTime;
// Added in OPM
cvar_t *s_openaldriver;
cvar_t *s_alAvailableDevices;
static float reverb_table[] = {
0.5f, 0.25f, 0.417f, 0.653f, 0.208f, 0.5f, 0.403f, 0.5f, 0.5f,
@ -89,6 +90,9 @@ int music_loaded = 0;
int music_numsongs = 0;
int music_currentsong = 0;
static qboolean enumeration_ext = qfalse;
static qboolean enumeration_all_ext = qfalse;
song_t music_songs[MAX_MUSIC_SONGS];
openal_internal_t openal;
static float s_fFadeStartTime;
@ -268,13 +272,72 @@ static bool S_OPENAL_InitContext()
dev = NULL;
}
if (!dev) {
dev = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
}
// Device enumeration support
enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
enumeration_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT");
if(enumeration_ext || enumeration_all_ext)
{
char devicenames[16384] = "";
const char *devicelist;
#ifdef _WIN32
const char *defaultdevice;
#endif
int curlen;
// get all available devices + the default device name.
if(enumeration_all_ext)
{
devicelist = qalcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
#ifdef _WIN32
defaultdevice = qalcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
#endif
}
else
{
// We don't have ALC_ENUMERATE_ALL_EXT but normal enumeration.
devicelist = qalcGetString(NULL, ALC_DEVICE_SPECIFIER);
#ifdef _WIN32
defaultdevice = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
#endif
enumeration_ext = qtrue;
}
#ifdef _WIN32
// check whether the default device is generic hardware. If it is, change to
// Generic Software as that one works more reliably with various sound systems.
// If it's not, use OpenAL's default selection as we don't want to ignore
// native hardware acceleration.
if(!dev && defaultdevice && !strcmp(defaultdevice, "Generic Hardware"))
dev = "Generic Software";
#endif
// dump a list of available devices to a cvar for the user to see.
if(devicelist)
{
while((curlen = strlen(devicelist)))
{
Q_strcat(devicenames, sizeof(devicenames), devicelist);
Q_strcat(devicenames, sizeof(devicenames), "\n");
devicelist += curlen + 1;
}
}
s_alAvailableDevices = Cvar_Get("s_alAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
Com_Printf("OpenAL: List of available devices:\n%s\n", devicenames);
}
Com_Printf("OpenAL: Opening device \"%s\"...\n", dev ? dev : "{default}");
al_device = qalcOpenDevice(dev);
if (!al_device && dev) {
Com_Printf("Failed to open OpenAL device '%s', trying default.\n", dev);
al_device = qalcOpenDevice(NULL);
}
if (!al_device) {
Com_Printf("OpenAL: Could not open device\n");
S_OPENAL_NukeContext();