OpenAL: Change soft parameter from exclusive to preference

This means that now if loading OpenAL soft fails, ittl try to fall back to native, and if loading OpenAL native fails, ittl fall back to OpenAL soft

Author: Beyley

src/OpenAL/Silk.NET.OpenAL/AL/AL.cs

@@ -29,8 +29,7 @@ public AL(INativeContext ctx)
         public override partial bool IsExtensionPresent(string name);
 
         /// <inheritdoc />
-        public SearchPathContainer SearchPaths => _searchPaths ??= (_soft
-             ? new OpenALSoftLibraryNameContainer() : new OpenALLibraryNameContainer());
+        public SearchPathContainer SearchPaths => _searchPaths ??= new OpenALLibraryNameContainer(_soft);
 
         /// <inheritdoc />
         public partial nint GetProcAddress(string name);
@@ -333,11 +332,12 @@ public partial void GetSourceProperty(uint source, GetSourceInteger param, out i
         /// <summary>
         /// Gets an instance of the API.
         /// </summary>
-        /// <param name="soft">Use OpenAL Soft libraries.</param>
+        /// <param name="soft">Prefer OpenAL Soft libraries.</param>
         /// <returns>The instance.</returns>
         public static AL GetApi(bool soft = false)
         {
-            SearchPathContainer searchPaths = soft ? new OpenALSoftLibraryNameContainer() : new OpenALLibraryNameContainer();
+            SearchPathContainer searchPaths = new OpenALLibraryNameContainer(soft);
+            
             var ctx = new MultiNativeContext
                 (CreateDefaultContext(searchPaths.GetLibraryNames()), null);
             var ret = new AL(ctx);

src/OpenAL/Silk.NET.OpenAL/ALC/ALContext.cs

@@ -25,8 +25,7 @@ public ALContext(INativeContext ctx)
         {
         }
 
-        public SearchPathContainer SearchPaths => _searchPaths ??= (_soft
-             ? new OpenALSoftLibraryNameContainer() : new OpenALLibraryNameContainer());
+        public SearchPathContainer SearchPaths => _searchPaths ??= new OpenALLibraryNameContainer(_soft);
 
         public override unsafe bool IsExtensionPresent(string name)
             => IsExtensionPresent(GetContextsDevice(GetCurrentContext()), name);
@@ -85,11 +84,11 @@ public override unsafe bool IsExtensionPresent(string name)
         /// <summary>
         /// Gets an instance of the API.
         /// </summary>
-        /// <param name="soft">Use OpenAL Soft libraries.</param>
+        /// <param name="soft">Prefer OpenAL Soft libraries.</param>
         /// <returns>The instance.</returns>
         public static unsafe ALContext GetApi(bool soft = false)
         {
-            SearchPathContainer searchPaths = soft ? new OpenALSoftLibraryNameContainer() : new OpenALLibraryNameContainer();
+            SearchPathContainer searchPaths = new OpenALLibraryNameContainer(soft);
             var ctx = new MultiNativeContext
                 (CreateDefaultContext(searchPaths.GetLibraryNames()), null);
             var ret = new ALContext(ctx);

src/OpenAL/Silk.NET.OpenAL/OpenALLibraryNameContainer.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Linq;
 using Silk.NET.Core.Loader;
 
 namespace Silk.NET.OpenAL
@@ -10,11 +11,28 @@ namespace Silk.NET.OpenAL
     /// </summary>
     internal class OpenALLibraryNameContainer : SearchPathContainer
     {
+        private readonly bool _preferSoft;
+
+        private readonly SearchPathContainer _soft;
+        private readonly SearchPathContainer _native;
+
+        public OpenALLibraryNameContainer(bool preferSoft)
+        {
+            _preferSoft = preferSoft;
+
+            _soft = new OpenALSoftLibraryNameContainer();
+            _native = new OpenALNativeLibraryNameContainer();
+        }
+
         /// <inheritdoc />
-        public override string[] Linux => new[] { "libopenal.so.1" };
+        public override string[] Linux => _preferSoft
+            ? _soft.Linux.Concat(_native.Linux).ToArray()
+            : _native.Linux.Concat(_soft.Linux).ToArray();
 
         /// <inheritdoc />
-        public override string[] MacOS => new[] { "/System/Library/Frameworks/OpenAL.framework/OpenAL" };
+        public override string[] MacOS => _preferSoft
+            ? _soft.MacOS.Concat(_native.MacOS).ToArray()
+            : _native.MacOS.Concat(_soft.MacOS).ToArray();
 
         /// <inheritdoc />
         public override string[] Android => Linux;
@@ -23,9 +41,13 @@ internal class OpenALLibraryNameContainer : SearchPathContainer
         public override string[] IOS => MacOS;
 
         /// <inheritdoc />
-        public override string[] Windows86 => new[] { "openal32.dll" };
+        public override string[] Windows86 => _preferSoft
+            ? _soft.Windows86.Concat(_native.Windows86).ToArray()
+            : _native.Windows86.Concat(_soft.Windows86).ToArray();
 
         /// <inheritdoc />
-        public override string[] Windows64 => new[] { "openal32.dll" };
+        public override string[] Windows64 => _preferSoft
+            ? _soft.Windows64.Concat(_native.Windows64).ToArray()
+            : _native.Windows64.Concat(_soft.Windows64).ToArray();
     }
-}
+}

src/OpenAL/Silk.NET.OpenAL/OpenALNativeLibraryNameContainer.cs

@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Silk.NET.Core.Loader;
+
+namespace Silk.NET.OpenAL
+{
+    /// <summary>
+    /// Contains the library name of OpenAL.
+    /// </summary>
+    internal class OpenALNativeLibraryNameContainer : SearchPathContainer
+    {
+        /// <inheritdoc />
+        public override string[] Linux => new[] { "libopenal.so.1" };
+
+        /// <inheritdoc />
+        public override string[] MacOS => new[] { "/System/Library/Frameworks/OpenAL.framework/OpenAL" };
+
+        /// <inheritdoc />
+        public override string[] Android => Linux;
+
+        /// <inheritdoc />
+        public override string[] IOS => MacOS;
+
+        /// <inheritdoc />
+        public override string[] Windows86 => new[] { "openal32.dll" };
+
+        /// <inheritdoc />
+        public override string[] Windows64 => new[] { "openal32.dll" };
+    }
+}