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

rename IMovieController methods and classes to better describe what they are

This commit is contained in:
adelikat 2020-04-14 20:10:50 -05:00
parent 919266d2dc
commit cdfeda8b71
16 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/inputAdapters/InputManager.cs
View File

@ -65,13 +65,13 @@ namespace BizHawk.Client.Common
MovieInputSourceAdapter.Source = MultitrackRewiringAdapter; MovieInputSourceAdapter.Source = MultitrackRewiringAdapter;
ControllerOutput.Source = MovieOutputHardpoint; ControllerOutput.Source = MovieOutputHardpoint;
Global.MovieSession.SetMovieController(MovieInputSourceAdapter.Definition); Global.MovieSession.CreateMovieController(MovieInputSourceAdapter.Definition);
// connect the movie session before MovieOutputHardpoint if it is doing anything // connect the movie session before MovieOutputHardpoint if it is doing anything
// otherwise connect the MovieInputSourceAdapter to it, effectively bypassing the movie session // otherwise connect the MovieInputSourceAdapter to it, effectively bypassing the movie session
if (Global.MovieSession != null) if (Global.MovieSession != null)
{ {
MovieOutputHardpoint.Source = Global.MovieSession.MovieControllerAdapter; MovieOutputHardpoint.Source = Global.MovieSession.MovieController;
} }
else else
{ {

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

@ -27,7 +27,7 @@ namespace BizHawk.Client.Common
public bool MovieIsQueued => QueuedMovie != null; public bool MovieIsQueued => QueuedMovie != null;
public MultitrackRecorder MultiTrack { get; } = new MultitrackRecorder(); public MultitrackRecorder MultiTrack { get; } = new MultitrackRecorder();
public IMovieController MovieControllerAdapter { get; set; } = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter; public IMovieController MovieController { get; set; } = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter;
public IMovie Movie { get; set; } public IMovie Movie { get; set; }
public bool ReadOnly { get; set; } = true; public bool ReadOnly { get; set; } = true;
@ -47,9 +47,9 @@ namespace BizHawk.Client.Common
/// </summary> /// </summary>
public Action ModeChangedCallback { get; set; } public Action ModeChangedCallback { get; set; }
public void SetMovieController(ControllerDefinition definition) public void CreateMovieController(ControllerDefinition definition)
{ {
MovieControllerAdapter = new Bk2Controller(definition); MovieController = new Bk2Controller(definition);
} }
/// <summary> /// <summary>
@ -118,16 +118,16 @@ namespace BizHawk.Client.Common
if (Movie.InputLogLength > Global.Emulator.Frame) if (Movie.InputLogLength > Global.Emulator.Frame)
{ {
var input = Movie.GetInputState(Global.Emulator.Frame); var input = Movie.GetInputState(Global.Emulator.Frame);
MovieControllerAdapter.LatchFrom(input); MovieController.SetFrom(input);
} }
MovieControllerAdapter.LatchPlayerFrom(rewiredSource, MultiTrack.CurrentPlayer); MovieController.SetPlayerFrom(rewiredSource, MultiTrack.CurrentPlayer);
} }
} }
public void LatchInputFromPlayer(IController source) public void LatchInputFromPlayer(IController source)
{ {
MovieControllerAdapter.LatchFrom(source); MovieController.SetFrom(source);
} }
/// <summary> /// <summary>
@ -149,10 +149,10 @@ namespace BizHawk.Client.Common
return; return;
} }
MovieControllerAdapter.LatchFrom(input); MovieController.SetFrom(input);
if (MultiTrack.IsActive) if (MultiTrack.IsActive)
{ {
Global.InputManager.MultitrackRewiringAdapter.Source = MovieControllerAdapter; Global.InputManager.MultitrackRewiringAdapter.Source = MovieController;
} }
} }
@ -304,7 +304,7 @@ namespace BizHawk.Client.Common
// we don't want TasMovie to latch user input outside its internal recording mode, so limit it to autohold // we don't want TasMovie to latch user input outside its internal recording mode, so limit it to autohold
if (Movie is TasMovie && Movie.IsPlaying()) if (Movie is TasMovie && Movie.IsPlaying())
{ {
MovieControllerAdapter.LatchFromSticky(Global.InputManager.AutofireStickyXorAdapter); MovieController.SetFromSticky(Global.InputManager.AutofireStickyXorAdapter);
} }
else else
{ {

6
BizHawk.Client.Common/movie/bk2/Bk2Controller.cs
View File

@ -49,7 +49,7 @@ namespace BizHawk.Client.Common
#region IMovieController Implementation #region IMovieController Implementation
public void LatchFrom(IController source) public void SetFrom(IController source)
{ {
foreach (var button in Definition.BoolButtons) foreach (var button in Definition.BoolButtons)
{ {
@ -62,7 +62,7 @@ namespace BizHawk.Client.Common
} }
} }
public void LatchPlayerFrom(IController playerSource, int controllerNum) public void SetPlayerFrom(IController playerSource, int controllerNum)
{ {
foreach (var button in playerSource.Definition.BoolButtons) foreach (var button in playerSource.Definition.BoolButtons)
{ {
@ -92,7 +92,7 @@ namespace BizHawk.Client.Common
} }
} }
public void LatchFromSticky(IStickyController controller) public void SetFromSticky(IStickyController controller)
{ {
foreach (var button in Definition.BoolButtons) foreach (var button in Definition.BoolButtons)
{ {

2
BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
View File

@ -125,7 +125,7 @@ namespace BizHawk.Client.Common
{ {
if (frame < FrameCount && frame >= 0) if (frame < FrameCount && frame >= 0)
{ {
_adapter ??= new Bk2Controller(Global.MovieSession.MovieControllerAdapter.Definition); _adapter ??= new Bk2Controller(Global.MovieSession.MovieController.Definition);
int getFrame; int getFrame;

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

@ -59,7 +59,7 @@ namespace BizHawk.Client.Common
var adapter = new BkmControllerAdapter var adapter = new BkmControllerAdapter
{ {
Definition = Global.MovieSession.MovieControllerAdapter.Definition Definition = Global.MovieSession.MovieController.Definition
}; };
adapter.SetControllersAsMnemonic(_log[getFrame]); adapter.SetControllersAsMnemonic(_log[getFrame]);
return adapter; return adapter;

6
BizHawk.Client.Common/movie/interfaces/IMovieController.cs
View File

@ -7,18 +7,18 @@ namespace BizHawk.Client.Common
/// <summary> /// <summary>
/// Latches to the given <see cref="IController" /> /// Latches to the given <see cref="IController" />
/// </summary> /// </summary>
void LatchFrom(IController source); void SetFrom(IController source);
/// <summary> /// <summary>
/// Latches to only the buttons in the given <see cref="IController" /> for the given controller /// Latches to only the buttons in the given <see cref="IController" /> for the given controller
/// </summary> /// </summary>
void LatchPlayerFrom(IController playerSource, int controllerNum); void SetPlayerFrom(IController playerSource, int controllerNum);
/// <summary> /// <summary>
/// Latches to the given <see cref="IStickyController" /> /// Latches to the given <see cref="IStickyController" />
/// For buttons it latches autohold state, for analogs it latches mid value. /// For buttons it latches autohold state, for analogs it latches mid value.
/// </summary> /// </summary>
void LatchFromSticky(IStickyController controller); void SetFromSticky(IStickyController controller);
/// <summary> /// <summary>
/// Sets the controller to the state represented by the given mnemonic string /// Sets the controller to the state represented by the given mnemonic string

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

@ -7,14 +7,14 @@ namespace BizHawk.Client.Common
{ {
IMovie Movie { get; set; } IMovie Movie { get; set; }
IMovie QueuedMovie { get; } IMovie QueuedMovie { get; }
IMovieController MovieControllerAdapter { get; } IMovieController MovieController { get; }
IMovieController MovieControllerInstance(); IMovieController MovieControllerInstance();
MultitrackRecorder MultiTrack { get; } MultitrackRecorder MultiTrack { get; }
IController PreviousFrame { get; } IController PreviousFrame { get; }
IController CurrentInput { get; } IController CurrentInput { get; }
void SetMovieController(ControllerDefinition definition); void CreateMovieController(ControllerDefinition definition);
bool ReadOnly { get; set; } bool ReadOnly { get; set; }
bool MovieIsQueued { get; } bool MovieIsQueued { get; }

2
BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
View File

@ -393,7 +393,7 @@ namespace BizHawk.Client.Common
int oldLength = InputLogLength; int oldLength = InputLogLength;
ChangeLog.AddGeneralUndo(oldLength, oldLength + numFrames - 1); ChangeLog.AddGeneralUndo(oldLength, oldLength + numFrames - 1);
Global.MovieSession.MovieControllerAdapter.LatchFromSticky(Global.InputManager.AutofireStickyXorAdapter); Global.MovieSession.MovieController.SetFromSticky(Global.InputManager.AutofireStickyXorAdapter);
var lg = LogGeneratorInstance(); var lg = LogGeneratorInstance();
lg.SetSource(Global.InputManager.MovieOutputHardpoint); // account for autohold. needs autohold pattern to be already recorded in the current frame lg.SetSource(Global.InputManager.MovieOutputHardpoint); // account for autohold. needs autohold pattern to be already recorded in the current frame

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

@ -188,7 +188,7 @@ namespace BizHawk.Client.EmuHawk
public string InputStrMovie() public string InputStrMovie()
{ {
return MakeStringFor(Global.MovieSession.MovieControllerAdapter); return MakeStringFor(Global.MovieSession.MovieController);
} }
public string InputStrImmediate() public string InputStrImmediate()

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -210,7 +210,7 @@ namespace BizHawk.Client.EmuHawk
MovieSession = new MovieSession MovieSession = new MovieSession
{ {
Movie = MovieService.DefaultInstance, Movie = MovieService.DefaultInstance,
MovieControllerAdapter = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter, MovieController = MovieService.DefaultInstance.LogGeneratorInstance().MovieControllerAdapter,
MessageCallback = AddOnScreenMessage, MessageCallback = AddOnScreenMessage,
PopupCallback = ShowMessageCoreComm, PopupCallback = ShowMessageCoreComm,
AskYesNoCallback = StateErrorAskUser, AskYesNoCallback = StateErrorAskUser,

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs
View File

@ -375,7 +375,7 @@ namespace BizHawk.Client.EmuHawk
var branch = Tastudio.CurrentTasMovie.Branches.FirstOrDefault(b => b.UniqueIdentifier.ToString() == branchId); var branch = Tastudio.CurrentTasMovie.Branches.FirstOrDefault(b => b.UniqueIdentifier.ToString() == branchId);
if (branch != null && frame < branch.InputLog.Count) if (branch != null && frame < branch.InputLog.Count)
{ {
var adapter = new Bk2Controller(Global.MovieSession.MovieControllerAdapter.Definition); var adapter = new Bk2Controller(Global.MovieSession.MovieController.Definition);
adapter.SetFromMnemonic(branch.InputLog[frame]); adapter.SetFromMnemonic(branch.InputLog[frame]);
foreach (var button in adapter.Definition.BoolButtons) foreach (var button in adapter.Definition.BoolButtons)

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.MovieControllerAdapter); var lg = Global.MovieSession.LogGeneratorInstance(Global.MovieSession.MovieController);
string key = lg.GenerateLogKey(); string key = lg.GenerateLogKey();
key = key.Replace("LogKey:", "").Replace("#", ""); key = key.Replace("LogKey:", "").Replace("#", "");

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

@ -21,9 +21,9 @@ namespace BizHawk.Client.EmuHawk
_emulator = emulator; _emulator = emulator;
_tools = tools; _tools = tools;
var lg = movie.LogGeneratorInstance(); var lg = movie.LogGeneratorInstance();
lg.SetSource(Global.MovieSession.MovieControllerAdapter); lg.SetSource(Global.MovieSession.MovieController);
_targetController = new Bk2Controller(_emulator.ControllerDefinition); _targetController = new Bk2Controller(_emulator.ControllerDefinition);
_targetController.LatchFrom(_targetController); // Reference and create all buttons _targetController.SetFrom(_targetController); // Reference and create all buttons
if (key == "") if (key == "")
{ {
@ -72,7 +72,7 @@ namespace BizHawk.Client.EmuHawk
{ {
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {
_controller.LatchFrom(movie.GetInputState(i + start)); _controller.SetFrom(movie.GetInputState(i + start));
_log[i] = logGenerator.GenerateLogEntry(); _log[i] = logGenerator.GenerateLogEntry();
} }
} }
@ -122,7 +122,7 @@ namespace BizHawk.Client.EmuHawk
{ {
_controller.SetFromMnemonic(_log[i]); _controller.SetFromMnemonic(_log[i]);
LatchFromSourceButtons(_targetController, _controller); LatchFromSourceButtons(_targetController, _controller);
newController.LatchFrom(_targetController); newController.SetFrom(_targetController);
_log[i] = logGenerator.GenerateLogEntry(); _log[i] = logGenerator.GenerateLogEntry();
} }
@ -229,7 +229,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.MovieControllerAdapter); var lg = Global.MovieSession.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);
@ -258,7 +258,7 @@ namespace BizHawk.Client.EmuHawk
// Adapters // Adapters
_targetController = new Bk2Controller(_emulator.ControllerDefinition); _targetController = new Bk2Controller(_emulator.ControllerDefinition);
_targetController.LatchFrom(_targetController); // Reference and create all buttons _targetController.SetFrom(_targetController); // Reference and create all buttons
string[] keys = _inputKey.Split('|'); string[] keys = _inputKey.Split('|');
var d = new ControllerDefinition(_emulator.ControllerDefinition); var d = new ControllerDefinition(_emulator.ControllerDefinition);
foreach (var k in keys) foreach (var k in keys)

18
BizHawk.Client.EmuHawk/tools/TAStudio/PatternsForm.cs
View File

@ -17,19 +17,19 @@ namespace BizHawk.Client.EmuHawk
private string SelectedButton => ButtonBox.Text; private string SelectedButton => ButtonBox.Text;
private bool IsBool => SelectedButton == "Default bool Auto-Fire" || Global.MovieSession.MovieControllerAdapter.Definition.BoolButtons.Contains(SelectedButton); private bool IsBool => SelectedButton == "Default bool Auto-Fire" || Global.MovieSession.MovieController.Definition.BoolButtons.Contains(SelectedButton);
public PatternsForm(TAStudio owner) public PatternsForm(TAStudio owner)
{ {
InitializeComponent(); InitializeComponent();
_tastudio = owner; _tastudio = owner;
foreach (var button in Global.MovieSession.MovieControllerAdapter.Definition.BoolButtons) foreach (var button in Global.MovieSession.MovieController.Definition.BoolButtons)
{ {
ButtonBox.Items.Add(button); ButtonBox.Items.Add(button);
} }
foreach (var button in Global.MovieSession.MovieControllerAdapter.Definition.AxisControls) foreach (var button in Global.MovieSession.MovieController.Definition.AxisControls)
{ {
ButtonBox.Items.Add(button); ButtonBox.Items.Add(button);
} }
@ -182,7 +182,7 @@ namespace BizHawk.Client.EmuHawk
if (PatternList.SelectedIndex != -1 && PatternList.SelectedIndex < _values.Count) if (PatternList.SelectedIndex != -1 && PatternList.SelectedIndex < _values.Count)
{ {
index = Global.MovieSession.MovieControllerAdapter.Definition.BoolButtons.IndexOf(SelectedButton); index = Global.MovieSession.MovieController.Definition.BoolButtons.IndexOf(SelectedButton);
if (SelectedButton == "Default bool Auto-Fire") if (SelectedButton == "Default bool Auto-Fire")
{ {
index = _tastudio.BoolPatterns.Length - 1; index = _tastudio.BoolPatterns.Length - 1;
@ -202,7 +202,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
index = Global.MovieSession.MovieControllerAdapter.Definition.AxisControls.IndexOf(SelectedButton); index = Global.MovieSession.MovieController.Definition.AxisControls.IndexOf(SelectedButton);
} }
LagBox.Checked = _tastudio.FloatPatterns[index].SkipsLag; LagBox.Checked = _tastudio.FloatPatterns[index].SkipsLag;
@ -221,7 +221,7 @@ namespace BizHawk.Client.EmuHawk
private void UpdatePattern() private void UpdatePattern()
{ {
int index = Global.MovieSession.MovieControllerAdapter.Definition.BoolButtons.IndexOf(SelectedButton); int index = Global.MovieSession.MovieController.Definition.BoolButtons.IndexOf(SelectedButton);
if (SelectedButton == "Default bool Auto-Fire") if (SelectedButton == "Default bool Auto-Fire")
{ {
index = _tastudio.BoolPatterns.Length - 1; index = _tastudio.BoolPatterns.Length - 1;
@ -248,7 +248,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
index = Global.MovieSession.MovieControllerAdapter.Definition.AxisControls.IndexOf(SelectedButton); index = Global.MovieSession.MovieController.Definition.AxisControls.IndexOf(SelectedButton);
} }
List<float> p = new List<float>(); List<float> p = new List<float>();
@ -271,7 +271,7 @@ namespace BizHawk.Client.EmuHawk
private void GetPattern() private void GetPattern()
{ {
int index = Global.MovieSession.MovieControllerAdapter.Definition.BoolButtons.IndexOf(SelectedButton); int index = Global.MovieSession.MovieController.Definition.BoolButtons.IndexOf(SelectedButton);
if (SelectedButton == "Default bool Auto-Fire") if (SelectedButton == "Default bool Auto-Fire")
{ {
@ -310,7 +310,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
index = Global.MovieSession.MovieControllerAdapter.Definition.AxisControls.IndexOf(SelectedButton); index = Global.MovieSession.MovieController.Definition.AxisControls.IndexOf(SelectedButton);
} }
float[] p = _tastudio.FloatPatterns[index].Pattern; float[] p = _tastudio.FloatPatterns[index].Pattern;

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

@ -60,7 +60,7 @@ namespace BizHawk.Client.EmuHawk
private int? _seekStartFrame; private int? _seekStartFrame;
private bool _unpauseAfterSeeking; private bool _unpauseAfterSeeking;
private ControllerDefinition ControllerType => Global.MovieSession.MovieControllerAdapter.Definition; private ControllerDefinition ControllerType => Global.MovieSession.MovieController.Definition;
public bool WasRecording { get; set; } public bool WasRecording { get; set; }
public AutoPatternBool[] BoolPatterns; public AutoPatternBool[] BoolPatterns;

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

@ -414,7 +414,7 @@ namespace BizHawk.Client.EmuHawk
}); });
var columnNames = Global.MovieSession var columnNames = Global.MovieSession
.LogGeneratorInstance(Global.MovieSession.MovieControllerAdapter) .LogGeneratorInstance(Global.MovieSession.MovieController)
.Map(); .Map();
foreach (var kvp in columnNames) foreach (var kvp in columnNames)