mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into gui

Browse source
This commit is contained in:
Xpl0itR 2019-08-24 12:12:13 +01:00
commit 504459199f
No known key found for this signature in database
GPG key ID: 91798184109676AD
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Audio/Native/libsoundio/SoundIOOutStream.cs
View file

@ -64,7 +64,7 @@ namespace SoundIOSharp
get { unsafe { return new SoundIOChannelLayout ((IntPtr) ((void*) ((IntPtr) handle + layout_offset))); } } get { unsafe { return new SoundIOChannelLayout ((IntPtr) ((void*) ((IntPtr) handle + layout_offset))); } }
set { set {
unsafe { unsafe {
Buffer.MemoryCopy ((void*)((IntPtr)handle + layout_offset), (void*)value.Handle, Buffer.MemoryCopy ((void*)value.Handle, (void*)((IntPtr)handle + layout_offset),
Marshal.SizeOf<SoundIoChannelLayout> (), Marshal.SizeOf<SoundIoChannelLayout> ()); Marshal.SizeOf<SoundIoChannelLayout> (), Marshal.SizeOf<SoundIoChannelLayout> ());
} }
} }

2
Ryujinx/Program.cs
View file

@ -1,4 +1,4 @@
using Gtk; using Gtk;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Profiler; using Ryujinx.Profiler;
using Ryujinx.UI; using Ryujinx.UI;

1
Ryujinx/RPsupported.dat
View file

@ -15,6 +15,7 @@
010065500b218000 010065500b218000
010068f00aa78000 010068f00aa78000
01006a800016e000 01006a800016e000
010072800cbe8000
01007330027ee000 01007330027ee000
0100749009844000 0100749009844000
01007a4008486000 01007a4008486000