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

remove MovieSession convenience property that isn't that convenient anyway

This commit is contained in:
adelikat 2020-04-14 20:58:02 -05:00
parent 0d2f014621
commit ab7225c955
8 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/Api/Classes/MovieApi.cs
View File

@ -45,7 +45,7 @@ namespace BizHawk.Client.Common
return string.Empty; return string.Empty;
} }
var lg = Global.MovieSession.LogGeneratorInstance( var lg = Global.MovieSession.Movie.LogGeneratorInstance(
Global.MovieSession.Movie.GetInputState(frame)); Global.MovieSession.Movie.GetInputState(frame));
return lg.GenerateLogEntry(); return lg.GenerateLogEntry();
} }

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

@ -58,14 +58,6 @@ namespace BizHawk.Client.Common
return new Bk2Controller("", definition); return new Bk2Controller("", definition);
} }
/// <summary>
/// Simply shortens the verbosity necessary otherwise
/// </summary>
public ILogEntryGenerator LogGeneratorInstance(IController source)
{
return Movie.LogGeneratorInstance(source);
}
// Convenience property that gets the controller state from the movie for the most recent frame // Convenience property that gets the controller state from the movie for the most recent frame
public IController CurrentInput public IController CurrentInput
{ {

2
BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
View File

@ -33,8 +33,6 @@ namespace BizHawk.Client.Common
bool CheckSavestateTimeline(TextReader reader); bool CheckSavestateTimeline(TextReader reader);
bool HandleMovieLoadState(TextReader reader); bool HandleMovieLoadState(TextReader reader);
ILogEntryGenerator LogGeneratorInstance(IController source);
void QueueNewMovie(IMovie movie, bool record, IEmulator emulator); void QueueNewMovie(IMovie movie, bool record, IEmulator emulator);
void RunQueuedMovie(bool recordMode); void RunQueuedMovie(bool recordMode);

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

@ -224,7 +224,7 @@ namespace BizHawk.Client.EmuHawk
private string MakeStringFor(IController controller) private string MakeStringFor(IController controller)
{ {
return Global.MovieSession.LogGeneratorInstance(controller).GenerateInputDisplay(); return Global.MovieSession.Movie.LogGeneratorInstance(controller).GenerateInputDisplay();
} }
public string MakeIntersectImmediatePrevious() public string MakeIntersectImmediatePrevious()

2
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -976,7 +976,7 @@ namespace BizHawk.Client.EmuHawk
UpdateBotStatusIcon(); UpdateBotStatusIcon();
MessageLabel.Text = "Running..."; MessageLabel.Text = "Running...";
_cachedControlProbabilities = ControlProbabilities; _cachedControlProbabilities = ControlProbabilities;
_logGenerator = Global.MovieSession.LogGeneratorInstance(Global.InputManager.ClickyVirtualPadController); _logGenerator = Global.MovieSession.Movie.LogGeneratorInstance(Global.InputManager.ClickyVirtualPadController);
} }
private string CanStart() private string CanStart()

2
BizHawk.Client.EmuHawk/tools/Macros/MacroInput.ButtonSelect.cs
View File

@ -48,7 +48,7 @@ namespace BizHawk.Client.EmuHawk
s.Refresh(); s.Refresh();
// Update the selected zone's key // Update the selected zone's key
var lg = Global.MovieSession.LogGeneratorInstance(Global.MovieSession.MovieController); var lg = Global.MovieSession.Movie.LogGeneratorInstance(Global.MovieSession.MovieController);
string key = lg.GenerateLogKey(); string key = lg.GenerateLogKey();
key = key.Replace("LogKey:", "").Replace("#", ""); key = key.Replace("LogKey:", "").Replace("#", "");

8
BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs
View File

@ -54,7 +54,7 @@ namespace BizHawk.Client.EmuHawk
} }
_controller = new Bk2Controller(d); _controller = new Bk2Controller(d);
var logGenerator = Global.MovieSession.LogGeneratorInstance(_controller); var logGenerator = Global.MovieSession.Movie.LogGeneratorInstance(_controller);
logGenerator.GenerateLogEntry(); // Reference and create all buttons. logGenerator.GenerateLogEntry(); // Reference and create all buttons.
string movieKey = logGenerator.GenerateLogKey().Replace("LogKey:", "").Replace("#", ""); string movieKey = logGenerator.GenerateLogKey().Replace("LogKey:", "").Replace("#", "");
@ -107,11 +107,11 @@ namespace BizHawk.Client.EmuHawk
} }
var newController = new Bk2Controller(d); var newController = new Bk2Controller(d);
var logGenerator = Global.MovieSession.LogGeneratorInstance(newController); var logGenerator = Global.MovieSession.Movie.LogGeneratorInstance(newController);
logGenerator.GenerateLogEntry(); // Reference and create all buttons. logGenerator.GenerateLogEntry(); // Reference and create all buttons.
// Reset all buttons in targetController (it may still have buttons that aren't being set here set true) // Reset all buttons in targetController (it may still have buttons that aren't being set here set true)
var tC = Global.MovieSession.LogGeneratorInstance(_targetController); var tC = Global.MovieSession.Movie.LogGeneratorInstance(_targetController);
_targetController.SetFromMnemonic(tC.EmptyEntry); _targetController.SetFromMnemonic(tC.EmptyEntry);
for (int i = 0; i < Length; i++) for (int i = 0; i < Length; i++)
{ {
@ -224,7 +224,7 @@ namespace BizHawk.Client.EmuHawk
// If the LogKey contains buttons/controls not accepted by the emulator, // If the LogKey contains buttons/controls not accepted by the emulator,
// tell the user and display the macro's controller name and player count // tell the user and display the macro's controller name and player count
_inputKey = readText[0]; _inputKey = readText[0];
var lg = Global.MovieSession.LogGeneratorInstance(Global.MovieSession.MovieController); var lg = Global.MovieSession.Movie.LogGeneratorInstance(Global.MovieSession.MovieController);
string key = lg.GenerateLogKey(); string key = lg.GenerateLogKey();
key = key.Replace("LogKey:", "").Replace("#", ""); key = key.Replace("LogKey:", "").Replace("#", "");
key = key.Substring(0, key.Length - 1); key = key.Substring(0, key.Length - 1);

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

@ -413,7 +413,7 @@ namespace BizHawk.Client.EmuHawk
Rotatable = true Rotatable = true
}); });
var columnNames = Global.MovieSession var columnNames = Global.MovieSession.Movie
.LogGeneratorInstance(Global.MovieSession.MovieController) .LogGeneratorInstance(Global.MovieSession.MovieController)
.Map(); .Map();