Merge pull request #974 from Azaezel/sound_provider_fallback_request

re-orders sound device provider wieghting
GarageGames · Dec 21, 2014 · 154be2a · 154be2a
2 parents 183fe7d + 55c3717
commit 154be2a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/Templates/Empty/game/core/scripts/client/audio.cs b/Templates/Empty/game/core/scripts/client/audio.cs
@@ -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;
    }

diff --git a/Templates/Full/game/core/scripts/client/audio.cs b/Templates/Full/game/core/scripts/client/audio.cs
@@ -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;
    }