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

Communicate with IMovie via MnemonicsGenerator objects

This commit is contained in:
adelikat 2013-12-03 02:10:17 +00:00
parent a2b3201912
commit b80f5a07ea
7 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/movie/IMovie.cs
View File

@ -84,14 +84,14 @@ namespace BizHawk.Client.Common
#region Editing API
void ClearFrame(int frame);
void AppendFrame(string record);
void AppendFrame(MnemonicsGenerator mg);
void Truncate(int frame);
#endregion
#region Dubious, should reconsider
void CommitFrame(int frameNum, IController source); // Why pass in frameNum? Calling api
void CommitFrame(int frameNum, MnemonicsGenerator mg); // Why pass in frameNum? Calling api
void PokeFrame(int frameNum, string input); // Why does this exist as something different than Commit Frame?
LoadStateResult CheckTimeLines(TextReader reader, bool onlyGuid, bool ignoreGuidMismatch, out string errorMessage); // No need to return a status, no reason to have hacky flags, no need to pass a textreader

2
BizHawk.Client.Common/movie/IMovieRecord.cs
View File

@ -13,7 +13,7 @@ namespace BizHawk.Client.Common
/// <summary>
/// String representation of the controller input as a series of mnemonics
/// </summary>
string Input { get; }
string Input { get; set; }
/// <summary>
/// Whether or not this was a lag frame,

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

@ -349,9 +349,9 @@ namespace BizHawk.Client.Common
_changes = true;
}
public void AppendFrame(string record)
public void AppendFrame(MnemonicsGenerator mg)
{
_log.AppendFrame(record);
_log.AppendFrame(mg.GetControllersAsMnemonic());
_changes = true;
}
@ -372,7 +372,7 @@ namespace BizHawk.Client.Common
_log.SetFrameAt(frameNum, input);
}
public void CommitFrame(int frameNum, IController source)
public void CommitFrame(int frameNum, MnemonicsGenerator mg)
{
// Note: Truncation here instead of loadstate will make VBA style loadstates
// (Where an entire movie is loaded then truncated on the next frame
@ -386,8 +386,6 @@ namespace BizHawk.Client.Common
}
_changes = true;
var mg = new MnemonicsGenerator();
mg.SetSource(source);
_log.SetFrameAt(frameNum, mg.GetControllersAsMnemonic());
}

28
BizHawk.Client.Common/movie/MovieImport.cs
View File

@ -250,7 +250,7 @@ namespace BizHawk.Client.Common
}
// Convert the data for the controllers to a mnemonic and add it as a frame.
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
return m;
}
@ -576,7 +576,6 @@ namespace BizHawk.Client.Common
while (frame <= frameCount)
{
mg.SetSource(controllers);
string mnemonic = mg.GetControllersAsMnemonic();
byte update = r.ReadByte();
// aa: Number of delta bytes to follow
int delta = (update >> 5) & 0x3;
@ -597,11 +596,10 @@ namespace BizHawk.Client.Common
frame += frames;
while (frames > 0)
{
m.AppendFrame(mnemonic);
m.AppendFrame(mg);
if (controllers["Reset"])
{
controllers["Reset"] = false;
mnemonic = mg.GetControllersAsMnemonic();
}
frames--;
}
@ -856,7 +854,7 @@ namespace BizHawk.Client.Common
}
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
r.Close();
fs.Close();
@ -983,7 +981,7 @@ namespace BizHawk.Client.Common
}
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
return m;
}
@ -1330,7 +1328,7 @@ namespace BizHawk.Client.Common
warningMsg = "Control commands are not properly supported.";
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
r.Close();
fs.Close();
@ -1452,7 +1450,7 @@ namespace BizHawk.Client.Common
}
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
r.Close();
fs.Close();
@ -1682,7 +1680,7 @@ namespace BizHawk.Client.Common
}
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
r.Close();
fs.Close();
@ -1954,7 +1952,7 @@ namespace BizHawk.Client.Common
continue;
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
r.Close();
fs.Close();
@ -2226,7 +2224,7 @@ namespace BizHawk.Client.Common
}
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
r.Close();
fs.Close();
@ -2446,7 +2444,7 @@ namespace BizHawk.Client.Common
}
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
r.Close();
fs.Close();
@ -2614,7 +2612,7 @@ namespace BizHawk.Client.Common
{
controllers["Reset"] = true;
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
controllers["Reset"] = false;
}
// TODO: Other commands.
@ -2630,7 +2628,7 @@ namespace BizHawk.Client.Common
mg.SetSource(controllers);
for (; frames <= frame; frames++)
{
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
}
}
else if (((flag >> 2) & 0x1) != 0)
@ -2743,7 +2741,7 @@ namespace BizHawk.Client.Common
}
}
mg.SetSource(controllers);
m.AppendFrame(mg.GetControllersAsMnemonic());
m.AppendFrame(mg);
frames++;
}
}

2
BizHawk.Client.Common/movie/MovieRecord.cs
View File

@ -9,7 +9,7 @@ namespace BizHawk.Client.Common
{
private List<byte> _state = new List<byte>();
public string Input { get; private set; }
public string Input { get; set; }
public bool Lagged { get; private set; }
public IEnumerable<byte> State
{

4
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -182,7 +182,9 @@ namespace BizHawk.Client.Common
}
//the movie session makes sure that the correct input has been read and merged to its MovieControllerAdapter;
//this has been wired to Global.MovieOutputHardpoint in RewireInputChain
Movie.CommitFrame(Global.Emulator.Frame, Global.MovieOutputHardpoint);
var mg = new MnemonicsGenerator();
mg.SetSource(Global.MovieOutputHardpoint);
Movie.CommitFrame(Global.Emulator.Frame, mg);
}
}

9
BizHawk.Client.Common/movie/TasMovie.cs
View File

@ -172,12 +172,15 @@ namespace BizHawk.Client.Common
throw new NotImplementedException();
}
public void AppendFrame(string record)
public void AppendFrame(MnemonicsGenerator mg)
{
throw new NotImplementedException();
_records.Add(new MovieRecord()
{
Input = mg.GetControllersAsMnemonic(),
});
}
public void CommitFrame(int frameNum, Emulation.Common.IController source)
public void CommitFrame(int frameNum, MnemonicsGenerator mg)
{
throw new NotImplementedException();
}