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

make movie header savestates be binary, have their own key, and be stored in base64 form (actually, natt was right, they were stored as text, it's just that the "text" savestates from some cores are a ToHex'd byte array)

This commit is contained in:
zeromus 2014-04-25 02:19:46 +00:00
parent 8c0526b90f
commit c47a0c7426
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/movie/HeaderKeys.cs
View File

@ -14,6 +14,7 @@ namespace BizHawk.Client.Common
public const string AUTHOR = "Author";
public const string RERECORDS = "rerecordCount";
public const string STARTSFROMSAVESTATE = "StartsFromSavestate";
public const string SAVESTATEBINARYBASE64BLOB = "SavestateBinaryBase64Blob"; //this string will not contain base64: ; it's implicit (this is to avoid another big string op to dice off the base64: substring)
public const string FOURSCORE = "FourScore";
public const string SHA1 = "SHA1";
public const string FIRMWARESHA1 = "FirmwareSHA1";

1
BizHawk.Client.Common/movie/IMovieHeader.cs
View File

@ -10,6 +10,7 @@ namespace BizHawk.Client.Common
ulong Rerecords { get; set; }
bool StartsFromSavestate { get; set; }
string SavestateBinaryBase64Blob { get; set; }
string GameName { get; set; }
string SystemID { get; set; }

1
BizHawk.Client.Common/movie/Movie.cs
View File

@ -211,6 +211,7 @@ namespace BizHawk.Client.Common
/// <summary>
/// Load Header information only for displaying file information in dialogs such as play movie
/// TODO - consider not loading the SavestateBinaryBase64Blob key?
/// </summary>
public bool PreLoadText(HawkFile hawkFile)
{

12
BizHawk.Client.Common/movie/MovieHeader.cs
View File

@ -23,6 +23,18 @@ namespace BizHawk.Client.Common
public Dictionary<string, string> BoardProperties { get; private set; }
public SubtitleList Subtitles { get; private set; }
public string SavestateBinaryBase64Blob
{
get {
if (ContainsKey(HeaderKeys.SAVESTATEBINARYBASE64BLOB)) return this[HeaderKeys.SAVESTATEBINARYBASE64BLOB];
else return null;
}
set {
if (value == null) Remove(HeaderKeys.SAVESTATEBINARYBASE64BLOB);
else Add(HeaderKeys.SAVESTATEBINARYBASE64BLOB, value);
}
}
public ulong Rerecords
{
get

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

@ -93,7 +93,8 @@ namespace BizHawk.Client.EmuHawk
if (Global.MovieSession.Movie.Header.StartsFromSavestate)
{
LoadState(Global.MovieSession.Movie.Filename, Path.GetFileName(Global.MovieSession.Movie.Filename));
byte[] state = Convert.FromBase64String(Global.MovieSession.Movie.Header.SavestateBinaryBase64Blob);
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(state)));
Global.Emulator.ResetCounters();
}

22
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -81,23 +81,11 @@ namespace BizHawk.Client.EmuHawk
}
_movieToRecord = new Movie(path, startsFromSavestate: true);
var temppath = path;
var writer = new StreamWriter(temppath);
Global.Emulator.SaveStateText(writer);
writer.Close();
var file = new FileInfo(temppath);
using (var sr = file.OpenText())
{
string str;
while ((str = sr.ReadLine()) != null)
{
if (!String.IsNullOrWhiteSpace(str))
{
_movieToRecord.Header.Comments.Add(str);
}
}
}
//TODO - some emulators (c++ cores) are just returning a hex string already
//theres no sense hexifying those again. we need to record that fact in the IEmulator somehow
var bytestate = Global.Emulator.SaveStateBinary();
string stringstate = Convert.ToBase64String(bytestate);
_movieToRecord.Header.SavestateBinaryBase64Blob = stringstate;
}
else
{