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

remove built-in multitrack movie recorder, justification: tastudio is a much better alternative, it isn't used, and it's causing strain on better movie architecture, also this logic is easily done via lua script. It could be built from scratch one day in a way that plays nice with better movie architecture, if there's demand, but we need to remove this to keep moving forward

This commit is contained in:
adelikat 2020-06-13 09:49:25 -05:00
parent 03d10cebb9
commit 268ab96ae9
13 changed files with 26 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BizHawk.Client.Common/config/Binding.cs
View File

@ -186,11 +186,6 @@ namespace BizHawk.Client.Common
Bind("Movie", "Stop Movie"),
Bind("Movie", "Play from beginning"),
Bind("Movie", "Save Movie"),
Bind("Movie", "Toggle MultiTrack"),
Bind("Movie", "MT Select All"),
Bind("Movie", "MT Select None"),
Bind("Movie", "MT Increment Player"),
Bind("Movie", "MT Decrement Player"),
Bind("Tools", "RAM Watch"),
Bind("Tools", "RAM Search"),

63
src/BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -38,8 +38,6 @@ namespace BizHawk.Client.Common
?? throw new ArgumentNullException($"{nameof(pauseCallback)} cannot be null.");
_modeChangedCallback = modeChangedCallback
?? throw new ArgumentNullException($"{nameof(modeChangedCallback)} CannotUnloadAppDomainException be null.");
MultiTrack.RewiringAdapter.Source = MovieIn;
}
public IMovieConfig Settings { get; }
@ -57,8 +55,6 @@ namespace BizHawk.Client.Common
public IMovieController MovieController { get; private set; } = new Bk2Controller("", NullController.Instance.Definition);
public MultitrackRecorder MultiTrack { get; } = new MultitrackRecorder();
public IMovieController GenerateMovieController(ControllerDefinition definition = null)
{
// TODO: expose Movie.LogKey and pass in here
@ -242,7 +238,6 @@ namespace BizHawk.Client.Common
Movie = _queuedMovie;
_queuedMovie = null;
MultiTrack.Restart(Movie.Emulator.ControllerDefinition.PlayerCount);
Movie.ProcessSavestate(Movie.Emulator);
Movie.ProcessSram(Movie.Emulator);
@ -258,31 +253,6 @@ namespace BizHawk.Client.Common
}
}
public void ToggleMultitrack()
{
if (Movie.IsActive())
{
if (Settings.VBAStyleMovieLoadState)
{
Output("Multi-track can not be used in Full Movie Loadstates mode");
}
else if (Movie is ITasMovie)
{
Output("Multi-track can not be used with tasproj movies");
}
else
{
MultiTrack.IsActive ^= true;
MultiTrack.SelectNone();
Output(MultiTrack.IsActive ? "MultiTrack Enabled" : "MultiTrack Disabled");
}
}
else
{
Output("MultiTrack cannot be enabled while not recording.");
}
}
public void StopMovie(bool saveChanges = true)
{
if (Movie.IsActive())
@ -299,8 +269,6 @@ namespace BizHawk.Client.Common
message += "stopped.";
MultiTrack.Restart(1);
var result = Movie.Stop(saveChanges);
if (result)
{
@ -347,28 +315,6 @@ namespace BizHawk.Client.Common
_messageCallback?.Invoke(message);
}
private void LatchInputToMultitrackUser()
{
if (MultiTrack.IsActive)
{
var rewiredSource = MultiTrack.RewiringAdapter;
rewiredSource.PlayerSource = 1;
rewiredSource.PlayerTargetMask = 1 << MultiTrack.CurrentPlayer;
if (MultiTrack.RecordAll)
{
rewiredSource.PlayerTargetMask = unchecked((int)0xFFFFFFFF);
}
if (Movie.InputLogLength > Movie.Emulator.Frame)
{
var input = Movie.GetInputState(Movie.Emulator.Frame);
MovieController.SetFrom(input);
}
MovieController.SetPlayerFrom(rewiredSource, MultiTrack.CurrentPlayer);
}
}
private void LatchInputToUser()
{
MovieOut.Source = MovieIn;
@ -439,14 +385,7 @@ namespace BizHawk.Client.Common
}
else
{
if (MultiTrack.IsActive)
{
LatchInputToMultitrackUser();
}
else
{
LatchInputToUser();
}
LatchInputToUser();
}
Movie.RecordFrame(Movie.Emulator.Frame, MovieController);

30
src/BizHawk.Client.Common/movie/bk2/Bk2Controller.cs
View File

@ -59,36 +59,6 @@ namespace BizHawk.Client.Common
}
}
public void SetPlayerFrom(IController playerSource, int controllerNum)
{
foreach (var button in playerSource.Definition.BoolButtons)
{
var bnp = ButtonNameParser.Parse(button);
if (bnp?.PlayerNum != controllerNum)
{
continue;
}
var val = playerSource.IsPressed(button);
_myBoolButtons[button] = val;
}
foreach (var button in Definition.AxisControls)
{
var bnp = ButtonNameParser.Parse(button);
if (bnp?.PlayerNum != controllerNum)
{
continue;
}
var val = playerSource.AxisValue(button);
_myAxisControls[button] = val;
}
}
public void SetFromSticky(IStickyController controller)
{
foreach (var button in Definition.BoolButtons)

77
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs
View File

@ -38,70 +38,37 @@ namespace BizHawk.Client.Common
int? stateFrame = null;
// We are in record mode so replace the movie log with the one from the savestate
if (!Session.MultiTrack.IsActive)
if (Session.Settings.EnableBackupMovies && MakeBackup && Log.Count != 0)
{
if (Session.Settings.EnableBackupMovies && MakeBackup && Log.Count != 0)
{
SaveBackup();
MakeBackup = false;
}
Log.Clear();
string line;
while ((line = reader.ReadLine()) != null)
{
if (line.StartsWith("|"))
{
Log.Add(line);
}
else if (line.StartsWith("Frame "))
{
var strs = line.Split(' ');
try
{
stateFrame = int.Parse(strs[1]);
}
catch
{
errorMessage = "Savestate Frame number failed to parse";
return false;
}
}
else if (line.StartsWith("LogKey:"))
{
LogKey = line.Replace("LogKey:", "");
}
}
SaveBackup();
MakeBackup = false;
}
else
Log.Clear();
string line;
while ((line = reader.ReadLine()) != null)
{
var i = 0;
string line;
while ((line = reader.ReadLine()) != null)
if (line.StartsWith("|"))
{
if (line.StartsWith("|"))
Log.Add(line);
}
else if (line.StartsWith("Frame "))
{
var strs = line.Split(' ');
try
{
SetFrameAt(i, line);
i++;
stateFrame = int.Parse(strs[1]);
}
else if (line.StartsWith("Frame "))
catch
{
var strs = line.Split(' ');
try
{
stateFrame = int.Parse(strs[1]);
}
catch
{
errorMessage = "Savestate Frame number failed to parse";
return false;
}
}
else if (line.StartsWith("LogKey:"))
{
LogKey = line.Replace("LogKey:", "");
errorMessage = "Savestate Frame number failed to parse";
return false;
}
}
else if (line.StartsWith("LogKey:"))
{
LogKey = line.Replace("LogKey:", "");
}
}
if (!stateFrame.HasValue)

10
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
View File

@ -130,14 +130,10 @@ namespace BizHawk.Client.Common
public virtual void Truncate(int frame)
{
// This is a bad way to do multitrack logic, pass the info in instead of going to the global
// and it is weird for Truncate to possibly not truncate
if (!Session.MultiTrack.IsActive)
if (frame < Log.Count)
{
if (frame < Log.Count)
{
Log.RemoveRange(frame, Log.Count - frame);
Changes = true;
}
Log.RemoveRange(frame, Log.Count - frame);
Changes = true;
}
}

5
src/BizHawk.Client.Common/movie/interfaces/IMovieController.cs
View File

@ -9,11 +9,6 @@ namespace BizHawk.Client.Common
/// </summary>
void SetFrom(IController source);
/// <summary>
/// Latches to only the buttons in the given <see cref="IController" /> for the given controller
/// </summary>
void SetPlayerFrom(IController playerSource, int controllerNum);
/// <summary>
/// Latches to the given <see cref="IStickyController" />
/// For buttons it latches autohold state, for analogs it latches mid value.

3
src/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
View File

@ -21,7 +21,6 @@ namespace BizHawk.Client.Common
string QueuedSyncSettings { get; }
IMovieController MovieController { get; }
MultitrackRecorder MultiTrack { get; }
/// <summary>
/// Provides a source for sticky controls ot use when recording
@ -69,8 +68,6 @@ namespace BizHawk.Client.Common
/// </summary>
void RunQueuedMovie(bool recordMode, IEmulator emulator, IDictionary<string, string> preferredCores);
void ToggleMultitrack();
void StopMovie(bool saveChanges = true);
/// <summary>

37
src/BizHawk.Client.Common/movie/multitrack/ButtonNameParser.cs
View File

@ -1,37 +0,0 @@
namespace BizHawk.Client.Common
{
internal class ButtonNameParser
{
public static ButtonNameParser Parse(string button)
{
// See if we're being asked for a button that we know how to rewire
var parts = button.Split(' ');
if (parts.Length < 2)
{
return null;
}
if (parts[0][0] != 'P')
{
return null;
}
if (!int.TryParse(parts[0].Substring(1), out var player))
{
return null;
}
return new ButtonNameParser
{
PlayerNum = player,
ButtonPart = button.Substring(parts[0].Length + 1)
};
}
public int PlayerNum { get; set; }
public string ButtonPart { get; private set; }
public override string ToString() => $"P{PlayerNum} {ButtonPart}";
}
}

83
src/BizHawk.Client.Common/movie/multitrack/MultitrackRecorder.cs
View File

@ -1,83 +0,0 @@
namespace BizHawk.Client.Common
{
public class MultitrackRecorder
{
public MultitrackRecorder()
{
Restart(1);
}
internal MultitrackRewiringControllerAdapter RewiringAdapter { get; } = new MultitrackRewiringControllerAdapter();
public bool IsActive { get; set; }
public int CurrentPlayer { get; private set; }
public int PlayerCount { get; private set; }
public bool RecordAll { get; private set; }
/// <summary>
/// Gets a user friendly multi-track status
/// </summary>
public string Status
{
get
{
if (!IsActive)
{
return "";
}
if (RecordAll)
{
return "Recording All";
}
if (CurrentPlayer == 0)
{
return "Recording None";
}
return $"Recording Player {CurrentPlayer}";
}
}
public void Restart(int playerCount)
{
PlayerCount = playerCount;
IsActive = false;
CurrentPlayer = 0;
RecordAll = false;
}
public void SelectAll()
{
CurrentPlayer = 0;
RecordAll = true;
}
public void SelectNone()
{
RecordAll = false;
CurrentPlayer = 0;
}
public void Increment()
{
RecordAll = false;
CurrentPlayer++;
if (CurrentPlayer > PlayerCount)
{
CurrentPlayer = 1;
}
}
public void Decrement()
{
RecordAll = false;
CurrentPlayer--;
if (CurrentPlayer < 1)
{
CurrentPlayer = PlayerCount;
}
}
}
}

55
src/BizHawk.Client.Common/movie/multitrack/MultitrackRewiringControllerAdapter.cs
View File

@ -1,55 +0,0 @@
using BizHawk.Emulation.Common;
namespace BizHawk.Client.Common
{
/// <summary>
/// rewires player1 controls to playerN
/// </summary>
internal class MultitrackRewiringControllerAdapter : IInputAdapter
{
public IController Source { get; set; }
public int PlayerSource { get; set; } = -1;
public int PlayerTargetMask { get; set; }
public ControllerDefinition Definition => Source.Definition;
public bool IsPressed(string button)
{
return Source.IsPressed(RemapButtonName(button));
}
public int AxisValue(string name)
{
return Source.AxisValue(RemapButtonName(name));
}
private string RemapButtonName(string button)
{
// Do we even have a source?
if (PlayerSource == -1)
{
return button;
}
// See if we're being asked for a button that we know how to rewire
var bnp = ButtonNameParser.Parse(button);
if (bnp == null)
{
return button;
}
// Ok, this looks like a normal `P1 Button` type thing. we can handle it
// Were we supposed to replace this one?
int foundPlayerMask = 1 << bnp.PlayerNum;
if ((PlayerTargetMask & foundPlayerMask) == 0)
{
return button;
}
// Ok, we were. swap out the source player and then grab his button
bnp.PlayerNum = PlayerSource;
return bnp.ToString();
}
}
}

6
src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -320,12 +320,6 @@ namespace BizHawk.Client.EmuHawk
}
}
if (GlobalWin.MovieSession.MultiTrack.IsActive)
{
var point = GetCoordinates(g, GlobalWin.Config.MultitrackRecorder, GlobalWin.MovieSession.MultiTrack.Status);
DrawOsdMessage(g, GlobalWin.MovieSession.MultiTrack.Status, FixedMessagesColor, point.X, point.Y);
}
if (GlobalWin.Config.DisplayFps && Fps != null)
{
var point = GetCoordinates(g, GlobalWin.Config.Fps, Fps);

1
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -231,7 +231,6 @@ namespace BizHawk.Client.EmuHawk
private void MovieSubMenu_DropDownOpened(object sender, EventArgs e)
{
FullMovieLoadstatesMenuItem.Enabled = !MovieSession.MultiTrack.IsActive;
StopMovieWithoutSavingMenuItem.Enabled = MovieSession.Movie.IsActive() && MovieSession.Movie.Changes;
StopMovieMenuItem.Enabled
= SaveMovieMenuItem.Enabled

15
src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -299,21 +299,6 @@ namespace BizHawk.Client.EmuHawk
case "Save Movie":
SaveMovie();
break;
case "Toggle MultiTrack":
MovieSession.ToggleMultitrack();
break;
case "MT Select All":
MovieSession.MultiTrack.SelectAll();
break;
case "MT Select None":
MovieSession.MultiTrack.SelectNone();
break;
case "MT Increment Player":
MovieSession.MultiTrack.Increment();
break;
case "MT Decrement Player":
MovieSession.MultiTrack.Decrement();
break;
// Tools
case "RAM Watch":