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

Movie 2.0 - simplify some code

This commit is contained in:
adelikat 2014-06-18 19:34:27 +00:00
parent 451049fee8
commit 9a16540e14
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
View File

@ -73,8 +73,7 @@ namespace BizHawk.Client.Common
)] )]
public void SetFromMnemonicStr(string inputLogEntry) public void SetFromMnemonicStr(string inputLogEntry)
{ {
var lg = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter; var lg = Global.MovieSession.MovieControllerInstance();
lg.Type = Global.MovieSession.MovieControllerAdapter.Type;
lg.SetControllersAsMnemonic(inputLogEntry); lg.SetControllersAsMnemonic(inputLogEntry);
foreach (var button in lg.Type.BoolButtons) foreach (var button in lg.Type.BoolButtons)

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

@ -25,6 +25,22 @@ namespace BizHawk.Client.Common
public Action<string> MessageCallback { get; set; } public Action<string> MessageCallback { get; set; }
public Func<string, string, bool> AskYesNoCallback { get; set; } public Func<string, string, bool> AskYesNoCallback { get; set; }
/// <summary>
/// Simply shortens the verbosity necessary otherwise
/// </summary>
/// <returns></returns>
public ILogEntryGenerator LogGeneratorInstance()
{
return Movie.LogGeneratorInstance();
}
public IMovieController MovieControllerInstance()
{
var adapter = Movie.LogGeneratorInstance().MovieControllerAdapter;
adapter.Type = MovieControllerAdapter.Type;
return adapter;
}
private void Output(string message) private void Output(string message)
{ {
if (MessageCallback != null) if (MessageCallback != null)

18
BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -223,7 +223,7 @@ namespace BizHawk.Client.EmuHawk
public string InputStrMovie() public string InputStrMovie()
{ {
var lg = Global.MovieSession.Movie.LogGeneratorInstance(); var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(Global.MovieSession.MovieControllerAdapter); lg.SetSource(Global.MovieSession.MovieControllerAdapter);
return lg.GenerateInputDisplay(); return lg.GenerateInputDisplay();
@ -231,7 +231,7 @@ namespace BizHawk.Client.EmuHawk
public string InputStrImmediate() public string InputStrImmediate()
{ {
var lg = Global.MovieSession.Movie.LogGeneratorInstance(); var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(Global.AutofireStickyXORAdapter); lg.SetSource(Global.AutofireStickyXORAdapter);
return lg.GenerateInputDisplay(); return lg.GenerateInputDisplay();
@ -241,7 +241,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Global.MovieSession.Movie.IsActive && !Global.MovieSession.Movie.IsFinished) if (Global.MovieSession.Movie.IsActive && !Global.MovieSession.Movie.IsFinished)
{ {
var lg = Global.MovieSession.Movie.LogGeneratorInstance(); var lg = Global.MovieSession.LogGeneratorInstance();
var state = Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1); var state = Global.MovieSession.Movie.GetInputState(Global.Emulator.Frame - 1);
if (state != null) if (state != null)
{ {
@ -255,8 +255,7 @@ namespace BizHawk.Client.EmuHawk
public string InputStrOrAll() public string InputStrOrAll()
{ {
var m = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter; var m = Global.MovieSession.MovieControllerInstance();
m.Type = Global.MovieSession.MovieControllerAdapter.Type;
if (Global.MovieSession.Movie.IsActive) if (Global.MovieSession.Movie.IsActive)
{ {
@ -270,7 +269,7 @@ namespace BizHawk.Client.EmuHawk
SourceOr = m SourceOr = m
}; };
var lg = Global.MovieSession.Movie.LogGeneratorInstance(); var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(orAdaptor); lg.SetSource(orAdaptor);
return lg.GenerateInputDisplay(); return lg.GenerateInputDisplay();
} }
@ -283,7 +282,7 @@ namespace BizHawk.Client.EmuHawk
SourceStickyOr = Global.AutofireStickyXORAdapter SourceStickyOr = Global.AutofireStickyXORAdapter
}; };
var lg = Global.MovieSession.Movie.LogGeneratorInstance(); var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(stickyOr); lg.SetSource(stickyOr);
return lg.GenerateInputDisplay(); return lg.GenerateInputDisplay();
} }
@ -292,8 +291,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Global.MovieSession.Movie.IsActive) if (Global.MovieSession.Movie.IsActive)
{ {
var m = Global.MovieSession.Movie.LogGeneratorInstance().MovieControllerAdapter; var m = Global.MovieSession.MovieControllerInstance();
m.Type = Global.MovieSession.MovieControllerAdapter.Type;
m.SetControllersAsMnemonic( m.SetControllersAsMnemonic(
Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1)); Global.MovieSession.Movie.GetInput(Global.Emulator.Frame - 1));
@ -303,7 +301,7 @@ namespace BizHawk.Client.EmuHawk
SourceAnd = m SourceAnd = m
}; };
var lg = Global.MovieSession.Movie.LogGeneratorInstance(); var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(andAdaptor); lg.SetSource(andAdaptor);
return lg.GenerateInputDisplay(); return lg.GenerateInputDisplay();
} }