MoonsideGames
/
MoonWorks
1
0
Fork 1
Code Issues 4 Pull Requests Projects Releases 1 Activity

forgot that C# arrays are not just memory

pull/18/head
cosmonaut 2022-04-07 15:11:14 -07:00
parent ba66ed4225
commit b252d0eb92
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Audio/StreamingSoundOgg.cs
View File

@ -20,12 +20,14 @@ namespace MoonWorks.Audio
public static StreamingSoundOgg Load(AudioDevice device, string filePath) public static StreamingSoundOgg Load(AudioDevice device, string filePath)
{ {
var fileData = File.ReadAllBytes(filePath); var fileData = File.ReadAllBytes(filePath);
var fileDataPtr = (IntPtr) GCHandle.Alloc(fileData, GCHandleType.Pinned); var fileDataPtr = Marshal.AllocHGlobal(fileData.Length);
Marshal.Copy(fileData, 0, fileDataPtr, fileData.Length);
var vorbisHandle = FAudio.stb_vorbis_open_memory(fileDataPtr, fileData.Length, out int error, IntPtr.Zero); var vorbisHandle = FAudio.stb_vorbis_open_memory(fileDataPtr, fileData.Length, out int error, IntPtr.Zero);
if (error != 0) if (error != 0)
{ {
((GCHandle) fileDataPtr).Free(); ((GCHandle) fileDataPtr).Free();
Logger.LogError("Error opening OGG file!"); Logger.LogError("Error opening OGG file!");
Logger.LogError("Error: " + error);
throw new AudioLoadException("Error opening OGG file!"); throw new AudioLoadException("Error opening OGG file!");
} }
var info = FAudio.stb_vorbis_get_info(vorbisHandle); var info = FAudio.stb_vorbis_get_info(vorbisHandle);
@ -40,7 +42,7 @@ namespace MoonWorks.Audio
internal StreamingSoundOgg( internal StreamingSoundOgg(
AudioDevice device, AudioDevice device,
IntPtr fileDataPtr, // MUST BE PINNED!! IntPtr fileDataPtr, // MUST BE AN ALLOCHGLOBAL HANDLE!!
IntPtr vorbisHandle, IntPtr vorbisHandle,
FAudio.stb_vorbis_info info FAudio.stb_vorbis_info info
) : base( ) : base(
@ -90,7 +92,7 @@ namespace MoonWorks.Audio
protected override void Destroy() protected override void Destroy()
{ {
((GCHandle) FileDataPtr).Free(); Marshal.FreeHGlobal(FileDataPtr);
FAudio.stb_vorbis_close(VorbisHandle); FAudio.stb_vorbis_close(VorbisHandle);
} }
} }