TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-19 22:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #974 from Azaezel/sound_provider_fallback_request

Browse source 
re-orders sound device provider wieghting
This commit is contained in:
Daniel Buckmaster 2014-12-21 19:06:06 +11:00
commit 154be2ae0e
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":
return 1;
case "XAudio":
if( %providerB !$= "FMOD" )
return 1;
else
return -1;
// Prefer OpenAL over anything but FMOD.
case "OpenAL":
if( %providerB $= "FMOD" )
if( %providerB $= "FMOD" && %providerB !$= "XAudio")
return -1;
else
return 1;
// As long as the XAudio SFX provider still has issues,
// choose stable DSound over it.
// DSound is just about deprecated, so make that one the last fallback
case "DirectSound":
if( %providerB $= "FMOD" || %providerB $= "OpenAL" )
if( %providerB $= "FMOD" || %providerB $= "OpenAL" && %providerB !$= "XAudio")
return -1;
else
return 0;
case "XAudio":
if( %providerB !$= "FMOD" && %providerB !$= "OpenAL" && %providerB !$= "DirectSound" )
return 1;
else
return -1;
default:
return -1;
}

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

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