TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-orders sound device provider wieghting to preffer xaudio over directsound as d-sound is getting tossed soon.

Browse source
This commit is contained in:
Azaezel 2014-11-29 05:20:46 -06:00
parent a0e1fca057
commit 55c3717ffa
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Templates/Empty/game/core/scripts/client/audio.cs
View file

@ -239,27 +239,26 @@ function sfxCompareProvider( %providerA, %providerB )
case "FMOD": case "FMOD":
return 1; return 1;
case "XAudio":
if( %providerB !$= "FMOD" )
return 1;
else
return -1;
// Prefer OpenAL over anything but FMOD. // Prefer OpenAL over anything but FMOD.
case "OpenAL": case "OpenAL":
if( %providerB $= "FMOD" ) if( %providerB $= "FMOD" && %providerB !$= "XAudio")
return -1; return -1;
else else
return 1; return 1;
// As long as the XAudio SFX provider still has issues, // DSound is just about deprecated, so make that one the last fallback
// choose stable DSound over it.
case "DirectSound": case "DirectSound":
if( %providerB $= "FMOD" || %providerB $= "OpenAL" ) if( %providerB $= "FMOD" || %providerB $= "OpenAL" && %providerB !$= "XAudio")
return -1; return -1;
else else
return 0; return 0;
case "XAudio":
if( %providerB !$= "FMOD" && %providerB !$= "OpenAL" && %providerB !$= "DirectSound" )
return 1;
else
return -1;
default: default:
return -1; return -1;
} }

19
Templates/Full/game/core/scripts/client/audio.cs
View file

@ -239,27 +239,26 @@ function sfxCompareProvider( %providerA, %providerB )
case "FMOD": case "FMOD":
return 1; return 1;
case "XAudio":
if( %providerB !$= "FMOD" )
return 1;
else
return -1;
// Prefer OpenAL over anything but FMOD. // Prefer OpenAL over anything but FMOD.
case "OpenAL": case "OpenAL":
if( %providerB $= "FMOD" ) if( %providerB $= "FMOD" && %providerB !$= "XAudio")
return -1; return -1;
else else
return 1; return 1;
// As long as the XAudio SFX provider still has issues, // DSound is just about deprecated, so make that one the last fallback
// choose stable DSound over it.
case "DirectSound": case "DirectSound":
if( %providerB $= "FMOD" || %providerB $= "OpenAL" ) if( %providerB $= "FMOD" || %providerB $= "OpenAL" && %providerB !$= "XAudio")
return -1; return -1;
else else
return 0; return 0;
case "XAudio":
if( %providerB !$= "FMOD" && %providerB !$= "OpenAL" && %providerB !$= "DirectSound" )
return 1;
else
return -1;
default: default:
return -1; return -1;
} }