Merge pull request #54 from tobiasschulz/master

.NET doesn't use dllmaps
This commit is contained in:
Ethan Lee 2014-03-09 12:32:54 -04:00
commit 6899e6cdb0
4 changed files with 6 additions and 6 deletions

View file

@ -16,7 +16,7 @@
<dllmap dll="SDL2_ttf.dll" os="osx" target="libSDL2_ttf-2.0.0.dylib"/>
<dllmap dll="SDL2_ttf.dll" os="linux" target="libSDL2_ttf-2.0.so.0"/>
<dllmap dll="openal32.dll" os="windows" target="soft_oal.dll"/>
<dllmap dll="openal32.dll" os="osx" target="libopenal.1.dylib"/>
<dllmap dll="openal32.dll" os="linux" target="libopenal.so.1"/>
<dllmap dll="soft_oal.dll" os="windows" target="soft_oal.dll"/>
<dllmap dll="soft_oal.dll" os="osx" target="libopenal.1.dylib"/>
<dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
</configuration>

View file

@ -80,7 +80,7 @@ namespace OpenTK.Audio
public AudioCapture(string deviceName, int frequency, ALFormat sampleFormat, int bufferSize)
{
if (!AudioDeviceEnumerator.IsOpenALSupported)
throw new DllNotFoundException("openal32.dll");
throw new DllNotFoundException("soft_oal.dll");
if (frequency <= 0)
throw new ArgumentOutOfRangeException("frequency");
if (bufferSize <= 0)

View file

@ -252,7 +252,7 @@ namespace OpenTK.Audio
void CreateContext(string device, int freq, int refresh, bool sync, bool enableEfx, MaxAuxiliarySends efxAuxiliarySends)
{
if (!AudioDeviceEnumerator.IsOpenALSupported)
throw new DllNotFoundException("openal32.dll");
throw new DllNotFoundException("soft_oal.dll");
if (AudioDeviceEnumerator.Version == AudioDeviceEnumerator.AlcVersion.Alc1_1 && AudioDeviceEnumerator.AvailablePlaybackDevices.Count == 0) // Alc 1.0 does not support device enumeration.
throw new NotSupportedException("No audio hardware is available.");

View file

@ -76,7 +76,7 @@ namespace OpenTK.Audio.OpenAL
#region Constants
internal const string Lib = "openal32.dll";
internal const string Lib = "soft_oal.dll";
internal const CallingConvention Style = CallingConvention.Cdecl;
#endregion Constants