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

Play/Reocrd movie dialogs - pass in mainform

This commit is contained in:
adelikat 2019-12-17 11:24:34 -06:00
parent 35ff30cc01
commit 5fe25d03ad
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -489,13 +489,13 @@ namespace BizHawk.Client.EmuHawk
// Inaccurate core but allow the user to continue anyway
}
using var form = new RecordMovie(Emulator);
using var form = new RecordMovie(this, Emulator);
form.ShowDialog();
}
private void PlayMovieMenuItem_Click(object sender, EventArgs e)
{
using var form = new PlayMovie();
using var form = new PlayMovie(this);
form.ShowDialog();
}

8
BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -15,6 +15,7 @@ namespace BizHawk.Client.EmuHawk
{
public partial class PlayMovie : Form
{
private readonly MainForm _mainForm;
private readonly PlatformFrameRates _platformFrameRates = new PlatformFrameRates();
private List<IMovie> _movieList = new List<IMovie>();
@ -24,8 +25,9 @@ namespace BizHawk.Client.EmuHawk
private bool _sortDetailsReverse;
private string _sortedDetailsCol;
public PlayMovie()
public PlayMovie(MainForm mainForm)
{
_mainForm = mainForm;
InitializeComponent();
MovieView.RetrieveVirtualItem += MovieView_QueryItemText;
MovieView.VirtualMode = true;
@ -59,7 +61,7 @@ namespace BizHawk.Client.EmuHawk
var indices = MovieView.SelectedIndices;
if (indices.Count > 0) // Import file if necessary
{
GlobalWin.MainForm.StartNewMovie(_movieList[MovieView.SelectedIndices[0]], false);
_mainForm.StartNewMovie(_movieList[MovieView.SelectedIndices[0]], false);
}
}
@ -607,7 +609,7 @@ namespace BizHawk.Client.EmuHawk
if (StopOnFrameCheckbox.Checked &&
(StopOnFrameTextBox.ToRawInt().HasValue || LastFrameCheckbox.Checked))
{
GlobalWin.MainForm.PauseOnFrame = LastFrameCheckbox.Checked
_mainForm.PauseOnFrame = LastFrameCheckbox.Checked
? Global.MovieSession.Movie.InputLogLength
: StopOnFrameTextBox.ToRawInt();
}

11
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -12,16 +12,17 @@ using BizHawk.Client.EmuHawk.WinFormExtensions;
namespace BizHawk.Client.EmuHawk
{
// TODO - Allow relative paths in record textbox
// TODO - Allow relative paths in record TextBox
public partial class RecordMovie : Form
{
private readonly MainForm _mainForm;
private readonly IEmulator _emulator;
public RecordMovie(IEmulator core)
public RecordMovie(MainForm mainForm, IEmulator core)
{
InitializeComponent();
_mainForm = mainForm;
_emulator = core;
InitializeComponent();
if (!_emulator.HasSavestates())
{
@ -126,7 +127,7 @@ namespace BizHawk.Client.EmuHawk
movieToRecord.PopulateWithDefaultHeaderValues(AuthorBox.Text);
movieToRecord.Save();
GlobalWin.MainForm.StartNewMovie(movieToRecord, true);
_mainForm.StartNewMovie(movieToRecord, true);
Global.Config.UseDefaultAuthor = DefaultAuthorCheckBox.Checked;
if (DefaultAuthorCheckBox.Checked)