ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add an IStatable extension method that can load a state directly from a byte array, reduces the stream creation boiler plate in a number of palces

This commit is contained in:
adelikat 2020-04-18 10:26:08 -05:00
parent a460846ff8
commit 9494243eef
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/Api/Classes/MemorySaveStateApi.cs
View File

@ -34,9 +34,7 @@ namespace BizHawk.Client.Common
var guid = new Guid(identifier); var guid = new Guid(identifier);
try try
{ {
using var ms = new MemoryStream(_memorySavestates[guid]); StatableCore.LoadStateBinary(_memorySavestates[guid]);
using var br = new BinaryReader(ms);
StatableCore.LoadStateBinary(br);
} }
catch catch
{ {

3
BizHawk.Client.Common/rewind/Rewinder.cs
View File

@ -371,8 +371,7 @@ namespace BizHawk.Client.Common
} }
} }
using var lastStateReader = new BinaryReader(new MemoryStream(_lastState)); Global.Emulator.AsStatable().LoadStateBinary(_lastState);
Global.Emulator.AsStatable().LoadStateBinary(lastStateReader);
} }
else else
{ {

2
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -39,7 +39,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
Emulator.AsStatable().LoadStateBinary(new BinaryReader(new MemoryStream(movie.BinarySavestate, false))); Emulator.AsStatable().LoadStateBinary(movie.BinarySavestate);
} }
if (movie.SavestateFramebuffer != null && Emulator.HasVideoProvider()) if (movie.SavestateFramebuffer != null && Emulator.HasVideoProvider())

4
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -1070,9 +1070,7 @@ namespace BizHawk.Client.EmuHawk
public void LoadState(KeyValuePair<int, byte[]> state) public void LoadState(KeyValuePair<int, byte[]> state)
{ {
using var ms = new MemoryStream(state.Value); StatableEmulator.LoadStateBinary(state.Value);
using var br = new BinaryReader(ms);
StatableEmulator.LoadStateBinary(br);
if (state.Key == 0 && CurrentTasMovie.StartsFromSavestate) if (state.Key == 0 && CurrentTasMovie.StartsFromSavestate)
{ {

10
BizHawk.Emulation.Common/Interfaces/Services/IStatable.cs
View File

@ -72,5 +72,15 @@ namespace BizHawk.Emulation.Common
core.LoadStateBinary(br); core.LoadStateBinary(br);
} }
} }
/// <summary>
/// Loads a state directly from a byte array
/// </summary>
public static void LoadStateBinary(this IStatable core, byte[] state)
{
using var ms = new MemoryStream(state, false);
using var br = new BinaryReader(ms);
core.LoadStateBinary(br);
}
} }
} }