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

small cleanup

This commit is contained in:
adelikat 2019-12-21 15:55:01 -06:00
parent 7cfbd1cead
commit d26cb7d272
4 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ namespace BizHawk.Client.Common
Truncate(Log.Count); Truncate(Log.Count);
} }
Mode = Moviemode.Finished; Mode = MovieMode.Finished;
} }
if (IsCountingRerecords) if (IsCountingRerecords)
@ -267,18 +267,18 @@ namespace BizHawk.Client.Common
if (stateFrame > newLog.Count) // stateFrame is greater than state input log, so movie finished mode if (stateFrame > newLog.Count) // stateFrame is greater than state input log, so movie finished mode
{ {
if (Mode == Moviemode.Play || Mode == Moviemode.Finished) if (Mode == MovieMode.Play || Mode == MovieMode.Finished)
{ {
Mode = Moviemode.Finished; Mode = MovieMode.Finished;
return true; return true;
} }
return false; return false;
} }
if (Mode == Moviemode.Finished) if (Mode == MovieMode.Finished)
{ {
Mode = Moviemode.Play; Mode = MovieMode.Play;
} }
return true; return true;

26
BizHawk.Client.Common/movie/bk2/Bk2Movie.ModeApi.cs
View File

@ -4,24 +4,24 @@ namespace BizHawk.Client.Common
{ {
public partial class Bk2Movie public partial class Bk2Movie
{ {
protected enum Moviemode protected enum MovieMode
{ {
Inactive, Play, Record, Finished Inactive, Play, Record, Finished
} }
protected Moviemode Mode { get; set; } = Moviemode.Inactive; protected MovieMode Mode { get; set; } = MovieMode.Inactive;
public bool IsActive => Mode != Moviemode.Inactive; public bool IsActive => Mode != MovieMode.Inactive;
public bool IsPlaying => Mode == Moviemode.Play || Mode == Moviemode.Finished; public bool IsPlaying => Mode == MovieMode.Play || Mode == MovieMode.Finished;
public bool IsRecording => Mode == Moviemode.Record; public bool IsRecording => Mode == MovieMode.Record;
public bool IsFinished => Mode == Moviemode.Finished; public bool IsFinished => Mode == MovieMode.Finished;
public virtual void StartNewRecording() public virtual void StartNewRecording()
{ {
Mode = Moviemode.Record; Mode = MovieMode.Record;
if (Global.Config.EnableBackupMovies && MakeBackup && Log.Any()) if (Global.Config.EnableBackupMovies && MakeBackup && Log.Any())
{ {
SaveBackup(); SaveBackup();
@ -33,17 +33,17 @@ namespace BizHawk.Client.Common
public virtual void StartNewPlayback() public virtual void StartNewPlayback()
{ {
Mode = Moviemode.Play; Mode = MovieMode.Play;
} }
public virtual void SwitchToRecord() public virtual void SwitchToRecord()
{ {
Mode = Moviemode.Record; Mode = MovieMode.Record;
} }
public virtual void SwitchToPlay() public virtual void SwitchToPlay()
{ {
Mode = Moviemode.Play; Mode = MovieMode.Play;
} }
public virtual bool Stop(bool saveChanges = true) public virtual bool Stop(bool saveChanges = true)
@ -51,7 +51,7 @@ namespace BizHawk.Client.Common
bool saved = false; bool saved = false;
if (saveChanges) if (saveChanges)
{ {
if (Mode == Moviemode.Record || (IsActive && Changes)) if (Mode == MovieMode.Record || (IsActive && Changes))
{ {
Save(); Save();
saved = true; saved = true;
@ -59,14 +59,14 @@ namespace BizHawk.Client.Common
} }
Changes = false; Changes = false;
Mode = Moviemode.Inactive; Mode = MovieMode.Inactive;
return saved; return saved;
} }
public void FinishedMode() public void FinishedMode()
{ {
Mode = Moviemode.Finished; Mode = MovieMode.Finished;
} }
} }
} }

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

@ -23,7 +23,7 @@ namespace BizHawk.Client.Common
Filename = ""; Filename = "";
IsCountingRerecords = true; IsCountingRerecords = true;
Mode = Moviemode.Inactive; Mode = MovieMode.Inactive;
MakeBackup = true; MakeBackup = true;
Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0.0"; Header[HeaderKeys.MOVIEVERSION] = "BizHawk v2.0.0";

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

@ -90,11 +90,6 @@ namespace BizHawk.Client.EmuHawk
return sb.ToString(); return sb.ToString();
} }
if (Global.MovieSession.Movie.IsRecording)
{
return Global.Emulator.Frame.ToString();
}
return Global.Emulator.Frame.ToString(); return Global.Emulator.Frame.ToString();
} }