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

use Globals less in Tastudio sub-components

This commit is contained in:
adelikat 2019-12-31 16:31:32 -06:00
parent 1c472ad253
commit 18975e390d
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Client.Common/movie/interfaces/IMovie.cs
View File

@ -246,11 +246,11 @@ namespace BizHawk.Client.Common
public static class MovieExtensions
{
public static bool IsActive(this IMovie movie) => movie.Mode != MovieMode.Inactive;
public static bool NotActive(this IMovie movie) => movie.Mode == MovieMode.Inactive;
public static bool IsPlaying(this IMovie movie) => movie.Mode == MovieMode.Play || movie.Mode == MovieMode.Finished;
public static bool IsRecording(this IMovie movie) => movie.Mode == MovieMode.Record;
public static bool IsActive(this IMovie movie) => movie?.Mode != MovieMode.Inactive;
public static bool NotActive(this IMovie movie) => movie == null || movie.Mode == MovieMode.Inactive;
public static bool IsPlaying(this IMovie movie) => movie?.Mode == MovieMode.Play || movie?.Mode == MovieMode.Finished;
public static bool IsRecording(this IMovie movie) => movie?.Mode == MovieMode.Record;
public static bool IsFinished(this IMovie movie) => movie.Mode == MovieMode.Finished;
public static bool IsPlayingOrRecording(this IMovie movie) => movie.Mode == MovieMode.Play && movie.Mode == MovieMode.Record;
public static bool IsPlayingOrRecording(this IMovie movie) => movie?.Mode == MovieMode.Play && movie.Mode == MovieMode.Record;
}
}

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

@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk
private readonly ScreenshotForm _screenshot = new ScreenshotForm();
private TasMovie Movie => Tastudio.CurrentTasMovie;
private MainForm MainForm => GlobalWin.MainForm; // TODO: pass this in
private MainForm MainForm => Tastudio.MainForm;
private TasBranch _backupBranch;
private BranchUndo _branchUndo = BranchUndo.None;

30
BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
View File

@ -16,7 +16,7 @@ namespace BizHawk.Client.EmuHawk
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool TurboSeek
{
get => Global.Config.TurboSeek;
get => Tastudio.Config.TurboSeek;
set => TurboSeekCheckbox.Checked = value;
}
@ -40,21 +40,21 @@ namespace BizHawk.Client.EmuHawk
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public bool RecordingMode
{
get => Global.MovieSession.Movie.IsRecording();
get => Tastudio.CurrentTasMovie.IsRecording();
set
{
RecordingModeCheckbox.Checked = value;
Global.MovieSession.ReadOnly = !value;
if (RecordingModeCheckbox.Checked)
{
Global.MovieSession.Movie.SwitchToRecord();
Tastudio.CurrentTasMovie.SwitchToRecord();
}
else
{
Global.MovieSession.Movie.SwitchToPlay();
Tastudio.CurrentTasMovie.SwitchToPlay();
}
GlobalWin.MainForm.SetMainformMovieInfo();
Tastudio.MainForm.SetMainformMovieInfo();
}
}
@ -67,13 +67,9 @@ namespace BizHawk.Client.EmuHawk
{
base.OnLoad(e);
if (Global.Config != null) // For the designer
{
TurboSeekCheckbox.Checked = Global.Config.TurboSeek;
}
if (Tastudio != null) // For the designer
{
TurboSeekCheckbox.Checked = Tastudio.Config?.TurboSeek ?? false;
AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition;
FollowCursorCheckbox.Checked = Tastudio.Settings.FollowCursor;
RecordingModeCheckbox.Checked = RecordingMode;
@ -101,7 +97,7 @@ namespace BizHawk.Client.EmuHawk
{
if (!_loading)
{
Global.Config.TurboSeek ^= true;
Tastudio.Config.TurboSeek ^= true;
}
}
@ -135,32 +131,32 @@ namespace BizHawk.Client.EmuHawk
private void RewindButton_MouseDown(object sender, MouseEventArgs e)
{
GlobalWin.MainForm.PressRewind = true;
Tastudio.MainForm.PressRewind = true;
}
private void RewindButton_MouseUp(object sender, MouseEventArgs e)
{
GlobalWin.MainForm.PressRewind = false;
Tastudio.MainForm.PressRewind = false;
}
private void RewindButton_MouseLeave(object sender, EventArgs e)
{
GlobalWin.MainForm.PressRewind = false;
Tastudio.MainForm.PressRewind = false;
}
private void FrameAdvanceButton_MouseDown(object sender, MouseEventArgs e)
{
GlobalWin.MainForm.HoldFrameAdvance = true;
Tastudio.MainForm.HoldFrameAdvance = true;
}
private void FrameAdvanceButton_MouseLeave(object sender, EventArgs e)
{
GlobalWin.MainForm.HoldFrameAdvance = false;
Tastudio.MainForm.HoldFrameAdvance = false;
}
private void FrameAdvanceButton_MouseUp(object sender, MouseEventArgs e)
{
GlobalWin.MainForm.HoldFrameAdvance = false;
Tastudio.MainForm.HoldFrameAdvance = false;
}
}
}