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

Marshal results in QueryDevices correctly.

Browse Source
This commit is contained in:
RoosterDragon
2016-10-03 21:47:42 +01:00
parent c7feed2b19
commit c79ccab1ba
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenRA.Platforms.Default/OpenAlSoundEngine.cs
View File

@@ -55,20 +55,35 @@ namespace OpenRA.Platforms.Default
// Clear error bit // Clear error bit
AL10.alGetError(); AL10.alGetError();
var devices = new List<string>(); // Returns a null separated list of strings, terminated by two nulls.
var next = ALC10.alcGetString(IntPtr.Zero, type); var devicesPtr = ALC10.alcGetString(IntPtr.Zero, type);
if (next == IntPtr.Zero || AL10.alGetError() != AL10.AL_NO_ERROR) if (devicesPtr == IntPtr.Zero || AL10.alGetError() != AL10.AL_NO_ERROR)
{ {
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[0];
} }
do var devices = new List<string>();
var buffer = new List<byte>();
var offset = 0;
while (true)
{ {
var str = Marshal.PtrToStringAuto(next); var b = Marshal.ReadByte(devicesPtr, offset++);
next += Encoding.Default.GetByteCount(str) + 1; if (b != 0)
devices.Add(str); {
} while (Marshal.ReadByte(next) != 0); buffer.Add(b);
continue;
}
// A null indicates termination of that string, so add that to our list.
devices.Add(Encoding.Default.GetString(buffer.ToArray()));
buffer.Clear();
// Two successive nulls indicates the end of the list.
if (Marshal.ReadByte(devicesPtr, offset) == 0)
break;
}
return devices.ToArray(); return devices.ToArray();
} }