epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port Tao.OpenAl to OpenTK.Audio.OpenAL

Browse Source
This commit is contained in:
Matthias Mailänder
2014-05-04 07:47:21 +02:00
parent bf9d3a8082
commit fdf108a879
8 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -80,7 +80,7 @@ VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev
game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs') game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
game_TARGET = OpenRA.Game.exe game_TARGET = OpenRA.Game.exe
game_KIND = winexe game_KIND = winexe
game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/Tao/Tao.OpenAl.dll thirdparty/SharpFont.dll game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/SDL2-CS.dll thirdparty/SharpFont.dll
game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
PROGRAMS += game PROGRAMS += game
game: $(game_TARGET) game: $(game_TARGET)

7
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -76,10 +76,6 @@
<Reference Include="Eluant"> <Reference Include="Eluant">
<HintPath>..\thirdparty\Eluant.dll</HintPath> <HintPath>..\thirdparty\Eluant.dll</HintPath>
</Reference> </Reference>
<Reference Include="Tao.OpenAl, Version=1.1.0.1, Culture=neutral, PublicKeyToken=a7579dda88828311">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\thirdparty\Tao\Tao.OpenAl.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib"> <Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath> <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference> </Reference>
@@ -89,6 +85,9 @@
<Reference Include="MaxMind.Db"> <Reference Include="MaxMind.Db">
<HintPath>..\thirdparty\MaxMind.Db.dll</HintPath> <HintPath>..\thirdparty\MaxMind.Db.dll</HintPath>
</Reference> </Reference>
<Reference Include="SDL2-CS">
<HintPath>..\thirdparty\SDL2-CS.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Actor.cs" /> <Compile Include="Actor.cs" />

123
OpenRA.Game/Sound.cs
View File

@@ -16,7 +16,8 @@ using OpenRA.FileSystem;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
using Tao.OpenAl; using OpenTK;
using OpenTK.Audio.OpenAL;
namespace OpenRA namespace OpenRA
{ {
@@ -449,13 +450,13 @@ namespace OpenRA
float volume = 1f; float volume = 1f;
Dictionary<int, PoolSlot> sourcePool = new Dictionary<int, PoolSlot>(); Dictionary<int, PoolSlot> sourcePool = new Dictionary<int, PoolSlot>();
static string[] QueryDevices(string label, int type) static string[] QueryDevices(string label, AlcGetStringList type)
{ {
// Clear error bit // Clear error bit
Al.alGetError(); AL.GetError();
var devices = Alc.alcGetStringv(IntPtr.Zero, type); var devices = Alc.GetString(IntPtr.Zero, type).ToArray();
if (Al.alGetError() != Al.AL_NO_ERROR) if (AL.GetError() != ALError.NoError)
{ {
Log.Write("sound", "Failed to query OpenAL device list using {0}", label); Log.Write("sound", "Failed to query OpenAL device list using {0}", label);
return new string[] { }; return new string[] { };
@@ -466,12 +467,12 @@ namespace OpenRA
public static string[] AvailableDevices() public static string[] AvailableDevices()
{ {
// Returns all devices under windows vista and newer // Returns all devices under Windows Vista and newer
if (Alc.alcIsExtensionPresent(IntPtr.Zero, "ALC_ENUMERATE_ALL_EXT") == Alc.ALC_TRUE) if (Alc.IsExtensionPresent(IntPtr.Zero, "ALC_ENUMERATE_ALL_EXT"))
return QueryDevices("ALC_ENUMERATE_ALL_EXT", Alc.ALC_ALL_DEVICES_SPECIFIER); return QueryDevices("ALC_ENUMERATE_ALL_EXT", AlcGetStringList.AllDevicesSpecifier);
if (Alc.alcIsExtensionPresent(IntPtr.Zero, "ALC_ENUMERATION_EXT") == Alc.ALC_TRUE) if (Alc.IsExtensionPresent(IntPtr.Zero, "ALC_ENUMERATION_EXT"))
return QueryDevices("ALC_ENUMERATION_EXT", Alc.ALC_DEVICE_SPECIFIER); return QueryDevices("ALC_ENUMERATION_EXT", AlcGetStringList.DeviceSpecifier);
return new string[] { }; return new string[] { };
} }
@@ -485,25 +486,25 @@ namespace OpenRA
else else
Console.WriteLine("Using default device"); Console.WriteLine("Using default device");
var dev = Alc.alcOpenDevice(Game.Settings.Sound.Device); var dev = Alc.OpenDevice(Game.Settings.Sound.Device);
if (dev == IntPtr.Zero) if (dev == IntPtr.Zero)
{ {
Console.WriteLine("Failed to open device. Falling back to default"); Console.WriteLine("Failed to open device. Falling back to default");
dev = Alc.alcOpenDevice(null); dev = Alc.OpenDevice(null);
if (dev == IntPtr.Zero) if (dev == IntPtr.Zero)
throw new InvalidOperationException("Can't create OpenAL device"); throw new InvalidOperationException("Can't create OpenAL device");
} }
var ctx = Alc.alcCreateContext(dev, IntPtr.Zero); var ctx = Alc.CreateContext(dev, (int[])null);
if (ctx == IntPtr.Zero) if (ctx == ContextHandle.Zero)
throw new InvalidOperationException("Can't create OpenAL context"); throw new InvalidOperationException("Can't create OpenAL context");
Alc.alcMakeContextCurrent(ctx); Alc.MakeContextCurrent(ctx);
for (var i = 0; i < PoolSize; i++) for (var i = 0; i < PoolSize; i++)
{ {
var source = 0; var source = 0;
Al.alGenSources(1, out source); AL.GenSources(1, out source);
if (0 != Al.alGetError()) if (0 != AL.GetError())
{ {
Log.Write("sound", "Failed generating OpenAL source {0}", i); Log.Write("sound", "Failed generating OpenAL source {0}", i);
return; return;
@@ -528,8 +529,8 @@ namespace OpenRA
foreach (int key in sourcePool.Keys) foreach (int key in sourcePool.Keys)
{ {
int state; int state;
Al.alGetSourcei(key, Al.AL_SOURCE_STATE, out state); AL.GetSource(key, ALGetSourcei.SourceState, out state);
if (state != Al.AL_PLAYING && state != Al.AL_PAUSED) if (state != (int)ALSourceState.Playing && state != (int)ALSourceState.Paused)
freeSources.Add(key); freeSources.Add(key);
} }
@@ -606,7 +607,7 @@ namespace OpenRA
public float Volume public float Volume
{ {
get { return volume; } get { return volume; }
set { Al.alListenerf(Al.AL_GAIN, volume = value); } set { AL.Listener(ALListenerf.Gain, volume = value); }
} }
public void PauseSound(ISound sound, bool paused) public void PauseSound(ISound sound, bool paused)
@@ -616,11 +617,11 @@ namespace OpenRA
var key = ((OpenAlSound)sound).Source; var key = ((OpenAlSound)sound).Source;
int state; int state;
Al.alGetSourcei(key, Al.AL_SOURCE_STATE, out state); AL.GetSource(key, ALGetSourcei.SourceState, out state);
if (state == Al.AL_PLAYING && paused) if (state == (int)ALSourceState.Playing && paused)
Al.alSourcePause(key); AL.SourcePause(key);
else if (state == Al.AL_PAUSED && !paused) else if (state == (int)ALSourceState.Paused && !paused)
Al.alSourcePlay(key); AL.SourcePlay(key);
} }
public void SetAllSoundsPaused(bool paused) public void SetAllSoundsPaused(bool paused)
@@ -628,11 +629,11 @@ namespace OpenRA
foreach (var key in sourcePool.Keys) foreach (var key in sourcePool.Keys)
{ {
int state; int state;
Al.alGetSourcei(key, Al.AL_SOURCE_STATE, out state); AL.GetSource(key, ALGetSourcei.SourceState, out state);
if (state == Al.AL_PLAYING && paused) if (state == (int)ALSourceState.Playing && paused)
Al.alSourcePause(key); AL.SourcePause(key);
else if (state == Al.AL_PAUSED && !paused) else if (state == (int)ALSourceState.Paused && !paused)
Al.alSourcePlay(key); AL.SourcePlay(key);
} }
} }
@@ -641,14 +642,14 @@ namespace OpenRA
var sounds = sourcePool.Select(s => s.Key).Where(b => var sounds = sourcePool.Select(s => s.Key).Where(b =>
{ {
int state; int state;
Al.alGetSourcei(b, Al.AL_SOURCE_STATE, out state); AL.GetSource(b, ALGetSourcei.SourceState, out state);
return (state == Al.AL_PLAYING || state == Al.AL_PAUSED) && return (state == (int)ALSourceState.Playing || state == (int)ALSourceState.Paused) &&
(music == null || b != ((OpenAlSound)music).Source) && (music == null || b != ((OpenAlSound)music).Source) &&
(video == null || b != ((OpenAlSound)video).Source); (video == null || b != ((OpenAlSound)video).Source);
}); });
foreach (var s in sounds) foreach (var s in sounds)
Al.alSourcef(s, Al.AL_GAIN, volume); AL.Source(s, ALSourcef.Gain, volume);
} }
public void StopSound(ISound sound) public void StopSound(ISound sound)
@@ -658,9 +659,9 @@ namespace OpenRA
var key = ((OpenAlSound)sound).Source; var key = ((OpenAlSound)sound).Source;
int state; int state;
Al.alGetSourcei(key, Al.AL_SOURCE_STATE, out state); AL.GetSource(key, ALGetSourcei.SourceState, out state);
if (state == Al.AL_PLAYING || state == Al.AL_PAUSED) if (state == (int)ALSourceState.Playing || state == (int)ALSourceState.Paused)
Al.alSourceStop(key); AL.SourceStop(key);
} }
public void StopAllSounds() public void StopAllSounds()
@@ -668,20 +669,20 @@ namespace OpenRA
foreach (var key in sourcePool.Keys) foreach (var key in sourcePool.Keys)
{ {
int state; int state;
Al.alGetSourcei(key, Al.AL_SOURCE_STATE, out state); AL.GetSource(key, ALGetSourcei.SourceState, out state);
if (state == Al.AL_PLAYING || state == Al.AL_PAUSED) if (state == (int)ALSourceState.Playing || state == (int)ALSourceState.Paused)
Al.alSourceStop(key); AL.SourceStop(key);
} }
} }
public void SetListenerPosition(WPos position) public void SetListenerPosition(WPos position)
{ {
// Move the listener out of the plane so that sounds near the middle of the screen aren't too positional // Move the listener out of the plane so that sounds near the middle of the screen aren't too positional
Al.alListener3f(Al.AL_POSITION, position.X, position.Y, position.Z + 2133); AL.Listener(ALListener3f.Position, position.X, position.Y, position.Z + 2133);
var orientation = new[] { 0f, 0f, 1f, 0f, -1f, 0f }; var orientation = new[] { 0f, 0f, 1f, 0f, -1f, 0f };
Al.alListenerfv(Al.AL_ORIENTATION, ref orientation[0]); AL.Listener(ALListenerfv.Orientation, ref orientation);
Al.alListenerf(Al.AL_METERS_PER_UNIT, .01f); AL.Listener(ALListenerf.EfxMetersPerUnit, .01f);
} }
} }
@@ -689,18 +690,18 @@ namespace OpenRA
{ {
public readonly int Buffer; public readonly int Buffer;
static int MakeALFormat(int channels, int bits) static ALFormat MakeALFormat(int channels, int bits)
{ {
if (channels == 1) if (channels == 1)
return bits == 16 ? Al.AL_FORMAT_MONO16 : Al.AL_FORMAT_MONO8; return bits == 16 ? ALFormat.Mono16 : ALFormat.Mono8;
else else
return bits == 16 ? Al.AL_FORMAT_STEREO16 : Al.AL_FORMAT_STEREO8; return bits == 16 ? ALFormat.Stereo16 : ALFormat.Stereo8;
} }
public OpenAlSoundSource(byte[] data, int channels, int sampleBits, int sampleRate) public OpenAlSoundSource(byte[] data, int channels, int sampleBits, int sampleRate)
{ {
Al.alGenBuffers(1, out Buffer); AL.GenBuffers(1, out Buffer);
Al.alBufferData(Buffer, MakeALFormat(channels, sampleBits), data, data.Length, sampleRate); AL.BufferData(Buffer, MakeALFormat(channels, sampleBits), data, data.Length, sampleRate);
} }
} }
@@ -717,16 +718,16 @@ namespace OpenRA
Source = source; Source = source;
Volume = volume; Volume = volume;
Al.alSourcef(source, Al.AL_PITCH, 1f); AL.Source(source, ALSourcef.Pitch, 1f);
Al.alSource3f(source, Al.AL_POSITION, pos.X, pos.Y, pos.Z); AL.Source(source, ALSource3f.Position, pos.X, pos.Y, pos.Z);
Al.alSource3f(source, Al.AL_VELOCITY, 0f, 0f, 0f); AL.Source(source, ALSource3f.Velocity, 0f, 0f, 0f);
Al.alSourcei(source, Al.AL_BUFFER, buffer); AL.Source(source, ALSourcei.Buffer, buffer);
Al.alSourcei(source, Al.AL_LOOPING, looping ? Al.AL_TRUE : Al.AL_FALSE); AL.Source(source, ALSourceb.Looping, looping);
Al.alSourcei(source, Al.AL_SOURCE_RELATIVE, relative ? 1 : 0); AL.Source(source, ALSourceb.SourceRelative, relative);
Al.alSourcef(source, Al.AL_REFERENCE_DISTANCE, 6826); AL.Source(source, ALSourcef.ReferenceDistance, 6826);
Al.alSourcef(source, Al.AL_MAX_DISTANCE, 136533); AL.Source(source, ALSourcef.MaxDistance, 136533);
Al.alSourcePlay(source); AL.SourcePlay(source);
} }
public float Volume public float Volume
@@ -739,7 +740,7 @@ namespace OpenRA
set set
{ {
if (Source != -1) if (Source != -1)
Al.alSourcef(Source, Al.AL_GAIN, volume = value); AL.Source(Source, ALSourcef.Gain, volume = value);
} }
} }
@@ -747,8 +748,8 @@ namespace OpenRA
{ {
get get
{ {
float pos; int pos;
Al.alGetSourcef(Source, Al.AL_SAMPLE_OFFSET, out pos); AL.GetSource(Source, ALGetSourcei.SampleOffset, out pos);
return pos / 22050f; return pos / 22050f;
} }
} }
@@ -758,8 +759,8 @@ namespace OpenRA
get get
{ {
int state; int state;
Al.alGetSourcei(Source, Al.AL_SOURCE_STATE, out state); AL.GetSource(Source, ALGetSourcei.SourceState, out state);
return state == Al.AL_PLAYING; return state == (int)ALSourceState.Playing;
} }
} }
} }

4
packaging/windows/OpenRA.nsi
View File

@@ -93,7 +93,7 @@ Section "Game" GAME
File "${SRCDIR}\KopiLua.dll" File "${SRCDIR}\KopiLua.dll"
File "${SRCDIR}\NLua.dll" File "${SRCDIR}\NLua.dll"
File "${SRCDIR}\eluant.dll" File "${SRCDIR}\eluant.dll"
File "${DEPSDIR}\OpenAL32.dll" File "${DEPSDIR}\soft_oal.dll"
File "${DEPSDIR}\SDL2.dll" File "${DEPSDIR}\SDL2.dll"
File "${DEPSDIR}\freetype6.dll" File "${DEPSDIR}\freetype6.dll"
File "${DEPSDIR}\zlib1.dll" File "${DEPSDIR}\zlib1.dll"
@@ -214,7 +214,7 @@ Function ${UN}Clean
Delete $INSTDIR\KopiLua.dll Delete $INSTDIR\KopiLua.dll
Delete $INSTDIR\NLua.dll Delete $INSTDIR\NLua.dll
Delete $INSTDIR\SDL2-CS.dll Delete $INSTDIR\SDL2-CS.dll
Delete $INSTDIR\OpenAL32.dll Delete $INSTDIR\soft_oal.dll
Delete $INSTDIR\SDL2.dll Delete $INSTDIR\SDL2.dll
Delete $INSTDIR\lua51.dll Delete $INSTDIR\lua51.dll
Delete $INSTDIR\eluant.dll Delete $INSTDIR\eluant.dll

3
thirdparty/SDL2-CS.dll.config vendored
View File

@@ -3,4 +3,7 @@
<dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/> <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
<dllmap os="linux" dll="SDL2.dll" cpu="x86" target="libSDL232.2.0.2.so" /> <dllmap os="linux" dll="SDL2.dll" cpu="x86" target="libSDL232.2.0.2.so" />
<dllmap os="linux" dll="SDL2.dll" cpu="x86-64" target="libSDL264.2.0.2.so" /> <dllmap os="linux" dll="SDL2.dll" cpu="x86-64" target="libSDL264.2.0.2.so" />
<dllmap dll="soft_oal.dll" os="osx" target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
<dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
</configuration> </configuration>

BIN
thirdparty/Tao/Tao.OpenAl.dll vendored
View File

Binary file not shown.

12
thirdparty/Tao/Tao.OpenAl.dll.config vendored
View File

@@ -1,12 +0,0 @@
<configuration>
<dllmap dll="OpenAL32.dll">
<dllentry os="linux" dll="libopenal.so.1" />
<dllentry os="windows" dll="OpenAL32.dll" />
<dllentry os="osx" dll="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
</dllmap>
<dllmap dll="alut.dll">
<dllentry os="linux" dll="libalut.so.1" />
<dllentry os="windows" dll="alut.dll" />
<dllentry os="osx" dll="libalut.so.0" />
</dllmap>
</configuration>

0
thirdparty/windows/OpenAL32.dll → thirdparty/windows/soft_oal.dll vendored
View File