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

simplify Bkm importing

This commit is contained in:
adelikat 2020-05-23 20:58:00 -05:00
parent 1a6931bdb1
commit 340370fd68
3 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Client.Common/movie/import/BkmImport.cs
View File

@ -16,7 +16,7 @@
}
Result.Movie.HeaderEntries.Clear();
foreach (var kvp in bkm.HeaderEntries)
foreach (var kvp in bkm.Header)
{
Result.Movie.HeaderEntries[kvp.Key] = kvp.Value;
}
@ -35,7 +35,6 @@
Result.Movie.Subtitles.Add(sub);
}
Result.Movie.TextSavestate = bkm.TextSavestate;
Result.Movie.BinarySavestate = bkm.BinarySavestate;
}
}

21
src/BizHawk.Client.Common/movie/import/bkm/BkmHeader.cs
View File

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Text;
namespace BizHawk.Client.Common
{
@ -7,7 +6,6 @@ namespace BizHawk.Client.Common
{
public BkmHeader()
{
this[HeaderKeys.EmulationVersion] = VersionInfo.GetEmuVersion();
this[HeaderKeys.GameName] = "";
this[HeaderKeys.Author] = "";
this[HeaderKeys.Rerecords] = "0";
@ -58,25 +56,6 @@ namespace BizHawk.Client.Common
base.Clear();
}
public override string ToString()
{
var sb = new StringBuilder();
foreach (var kvp in this)
{
sb
.Append(kvp.Key)
.Append(' ')
.Append(kvp.Value)
.AppendLine();
}
sb.Append(Subtitles);
Comments.ForEach(comment => sb.AppendLine(comment));
return sb.ToString();
}
public bool ParseLineFromFile(string line)
{
if (!string.IsNullOrWhiteSpace(line))

13
src/BizHawk.Client.Common/movie/import/bkm/BkmMovie.cs
View File

@ -7,20 +7,14 @@ namespace BizHawk.Client.Common
internal class BkmMovie
{
private readonly List<string> _log = new List<string>();
public string PreferredExtension => "bkm";
public BkmHeader Header { get; } = new BkmHeader();
public string Filename { get; set; } = "";
public bool Loaded { get; private set; }
public int InputLogLength => _log.Count;
public int FrameCount => Loaded ? _log.Count : 0;
public int InputLogLength => Loaded ? _log.Count : 0;
public BkmControllerAdapter GetInputState(int frame)
{
if (frame < FrameCount && frame >= 0)
if (frame < InputLogLength && frame >= 0)
{
var adapter = new BkmControllerAdapter
{
@ -33,8 +27,6 @@ namespace BizHawk.Client.Common
return null;
}
public IDictionary<string, string> HeaderEntries => Header;
public SubtitleList Subtitles => Header.Subtitles;
public IList<string> Comments => Header.Comments;
@ -45,7 +37,6 @@ namespace BizHawk.Client.Common
set => Header[HeaderKeys.SyncSettings] = value;
}
public string TextSavestate { get; set; }
public byte[] BinarySavestate { get; set; }
public bool Load()