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

Convert static class QuickBmpFile to (empty) struct with interface

This commit is contained in:
YoshiRulz 2021-04-08 16:10:18 +10:00
parent 1aebbe9cd6
commit bd9ec3c57d
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
9 changed files with 63 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BizHawk.Client.Common/IQuickBmpFile.cs Normal file
View File

@ -0,0 +1,17 @@
using System.IO;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common
{
public interface IQuickBmpFile
{
void Copy(IVideoProvider src, IVideoProvider dst);
bool Load(IVideoProvider v, Stream s);
bool LoadAuto(Stream s, out IVideoProvider vp);
void Save(IVideoProvider v, Stream s, int w, int h);
}
}

8
src/BizHawk.Client.Common/QuickBmpFile.cs
View File

@ -12,7 +12,7 @@ using BizHawk.Emulation.Common;
// ReSharper disable StyleCop.SA1401
namespace BizHawk.Client.Common
{
public static class QuickBmpFile
public readonly struct QuickBmpFile : IQuickBmpFile
{
[StructLayout(LayoutKind.Sequential, Pack = 1)]
private class BITMAPFILEHEADER
@ -334,6 +334,12 @@ namespace BizHawk.Client.Common
s.Write(dst, 0, dst.Length);
}
readonly void IQuickBmpFile.Copy(IVideoProvider src, IVideoProvider dst) => Copy(src, dst);
readonly bool IQuickBmpFile.Load(IVideoProvider v, Stream s) => Load(v, s);
public readonly bool LoadAuto(Stream s, out IVideoProvider vp) => Load(vp = new LoadedBMP(), s);
readonly void IQuickBmpFile.Save(IVideoProvider v, Stream s, int w, int h) => Save(v, s, w, h);
}
}

6
src/BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -20,10 +20,13 @@ namespace BizHawk.Client.Common
private IMovie _queuedMovie;
private readonly IQuickBmpFile _quickBmpFile;
public MovieSession(
IMovieConfig settings,
string backDirectory,
IDialogParent dialogParent,
IQuickBmpFile quickBmpFile,
Action<string> messageCallback,
Action pauseCallback,
Action modeChangedCallback)
@ -32,6 +35,7 @@ namespace BizHawk.Client.Common
BackupDirectory = backDirectory;
_messageCallback = messageCallback;
_dialogParent = dialogParent;
_quickBmpFile = quickBmpFile;
_pauseCallback = pauseCallback
?? throw new ArgumentNullException($"{nameof(pauseCallback)} cannot be null.");
_modeChangedCallback = modeChangedCallback
@ -311,7 +315,7 @@ namespace BizHawk.Client.Common
// TODO: change IMovies to take HawkFiles only and not path
if (Path.GetExtension(path)?.EndsWith("tasproj") ?? false)
{
return new TasMovie(this, path);
return new TasMovie(this, path, _quickBmpFile);
}
return new Bk2Movie(this, path);

14
src/BizHawk.Client.Common/movie/tasproj/TasBranch.cs
View File

@ -38,9 +38,13 @@ namespace BizHawk.Client.Common
public class TasBranchCollection : List<TasBranch>, ITasBranchCollection
{
private readonly ITasMovie _movie;
public TasBranchCollection(ITasMovie movie)
private readonly IQuickBmpFile _quickBmpFile;
public TasBranchCollection(ITasMovie movie, IQuickBmpFile quickBmpFile)
{
_movie = movie;
_quickBmpFile = quickBmpFile;
}
public int Current { get; set; } = -1;
@ -147,13 +151,13 @@ namespace BizHawk.Client.Common
bs.PutLump(nframebuffer, delegate(Stream s)
{
var vp = new BitmapBufferVideoProvider(b.OSDFrameBuffer);
QuickBmpFile.Save(vp, s, b.OSDFrameBuffer.Width, b.OSDFrameBuffer.Height);
_quickBmpFile.Save(vp, s, b.OSDFrameBuffer.Width, b.OSDFrameBuffer.Height);
});
bs.PutLump(ncoreframebuffer, delegate(Stream s)
{
var vp = new BitmapBufferVideoProvider(b.CoreFrameBuffer);
QuickBmpFile.Save(vp, s, b.CoreFrameBuffer.Width, b.CoreFrameBuffer.Height);
_quickBmpFile.Save(vp, s, b.CoreFrameBuffer.Width, b.CoreFrameBuffer.Height);
});
bs.PutLump(nmarkers, delegate(TextWriter tw)
@ -240,13 +244,13 @@ namespace BizHawk.Client.Common
bl.GetLump(nframebuffer, true, delegate(Stream s, long length)
{
QuickBmpFile.LoadAuto(s, out var vp);
_quickBmpFile.LoadAuto(s, out var vp);
b.OSDFrameBuffer = new BitmapBuffer(vp.BufferWidth, vp.BufferHeight, vp.GetVideoBuffer());
});
bl.GetLump(ncoreframebuffer, false, delegate(Stream s, long length)
{
QuickBmpFile.LoadAuto(s, out var vp);
_quickBmpFile.LoadAuto(s, out var vp);
b.CoreFrameBuffer = new BitmapBuffer(vp.BufferWidth, vp.BufferHeight, vp.GetVideoBuffer());
});

5
src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -16,9 +16,10 @@ namespace BizHawk.Client.Common
public const double CurrentVersion = 1.1;
/// <exception cref="InvalidOperationException">loaded core does not implement <see cref="IStatable"/></exception>
internal TasMovie(IMovieSession session, string path) : base(session, path)
internal TasMovie(IMovieSession session, string path, IQuickBmpFile quickBmpFile)
: base(session, path)
{
Branches = new TasBranchCollection(this);
Branches = new TasBranchCollection(this, quickBmpFile);
ChangeLog = new TasMovieChangeLog(this);
Header[HeaderKeys.MovieVersion] = $"BizHawk v2.0 Tasproj v{CurrentVersion.ToString(CultureInfo.InvariantCulture)}";
Markers = new TasMovieMarkerList(this);

18
src/BizHawk.Client.Common/savestates/SavestateFile.cs
View File

@ -17,9 +17,16 @@ namespace BizHawk.Client.Common
private readonly IStatable _statable;
private readonly IVideoProvider _videoProvider;
private readonly IMovieSession _movieSession;
private readonly IQuickBmpFile _quickBmpFile;
private readonly IDictionary<string, object> _userBag;
public SavestateFile(IEmulator emulator, IMovieSession movieSession, IDictionary<string, object> userBag)
public SavestateFile(
IEmulator emulator,
IMovieSession movieSession,
IQuickBmpFile quickBmpFile,
IDictionary<string, object> userBag)
{
if (!emulator.HasSavestates())
{
@ -34,6 +41,7 @@ namespace BizHawk.Client.Common
}
_movieSession = movieSession;
_quickBmpFile = quickBmpFile;
_userBag = userBag;
}
@ -81,7 +89,7 @@ namespace BizHawk.Client.Common
using (new SimpleTime("Save Framebuffer"))
{
bs.PutLump(BinaryStateLump.Framebuffer, s => QuickBmpFile.Save(_videoProvider, s, outWidth, outHeight));
bs.PutLump(BinaryStateLump.Framebuffer, s => _quickBmpFile.Save(_videoProvider, s, outWidth, outHeight));
}
}
}
@ -154,7 +162,7 @@ namespace BizHawk.Client.Common
if (_videoProvider != null)
{
bl.GetLump(BinaryStateLump.Framebuffer, false, br => PopulateFramebuffer(br, _videoProvider));
bl.GetLump(BinaryStateLump.Framebuffer, false, br => PopulateFramebuffer(br, _videoProvider, _quickBmpFile));
}
string userData = "";
@ -199,13 +207,13 @@ namespace BizHawk.Client.Common
return false;
}
private static void PopulateFramebuffer(BinaryReader br, IVideoProvider videoProvider)
private static void PopulateFramebuffer(BinaryReader br, IVideoProvider videoProvider, IQuickBmpFile quickBmpFile)
{
try
{
using (new SimpleTime("Load Framebuffer"))
{
QuickBmpFile.Load(videoProvider, br.BaseStream);
quickBmpFile.Load(videoProvider, br.BaseStream);
}
}
catch

3
src/BizHawk.Client.EmuHawk/IMainFormForTools.cs
View File

@ -41,6 +41,9 @@ namespace BizHawk.Client.EmuHawk
/// <remarks>only referenced from <see cref="PlaybackBox"/></remarks>
bool PressRewind { set; }
/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
IQuickBmpFile QuickBmpFile { get; }
/// <remarks>only referenced from <see cref="GenericDebugger"/></remarks>
event Action<bool> OnPauseChanged;

7
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -319,6 +319,7 @@ namespace BizHawk.Client.EmuHawk
Config.Movies,
Config.PathEntries.MovieBackupsAbsolutePath(),
this,
QuickBmpFile,
AddOnScreenMessage,
PauseEmulator,
SetMainformMovieInfo);
@ -4091,7 +4092,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
if (new SavestateFile(Emulator, MovieSession, MovieSession.UserBag).Load(path))
if (new SavestateFile(Emulator, MovieSession, QuickBmpFile, MovieSession.UserBag).Load(path))
{
OSD.ClearGuiText();
EmuClient.OnStateLoaded(this, userFriendlyStateName);
@ -4170,7 +4171,7 @@ namespace BizHawk.Client.EmuHawk
try
{
new SavestateFile(Emulator, MovieSession, MovieSession.UserBag).Create(path, Config.Savestates);
new SavestateFile(Emulator, MovieSession, QuickBmpFile, MovieSession.UserBag).Create(path, Config.Savestates);
EmuClient.OnStateSaved(this, userFriendlyStateName);
@ -4737,5 +4738,7 @@ namespace BizHawk.Client.EmuHawk
//BANZAIIIIIIIIIIIIIIIIIIIIIIIIIII
LoadRom(args[0]);
}
public IQuickBmpFile QuickBmpFile { get; } = new QuickBmpFile();
}
}

2
src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -201,7 +201,7 @@ namespace BizHawk.Client.EmuHawk
Movie.LoadBranch(branch);
Tastudio.LoadState(new KeyValuePair<int, Stream>(branch.Frame, new MemoryStream(branch.CoreData, false)));
Movie.TasStateManager.Capture(Tastudio.Emulator.Frame, Tastudio.Emulator.AsStatable());
QuickBmpFile.Copy(new BitmapBufferVideoProvider(branch.CoreFrameBuffer), Tastudio.VideoProvider);
Tastudio.MainForm.QuickBmpFile.Copy(new BitmapBufferVideoProvider(branch.CoreFrameBuffer), Tastudio.VideoProvider);
if (Tastudio.Settings.OldControlSchemeForBranches && Tastudio.TasPlaybackBox.RecordingMode)
Movie.Truncate(branch.Frame);