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

VideoWriterChooserForm - pass in dependencies

This commit is contained in:
adelikat 2019-12-17 09:50:38 -06:00
parent 6be6dbbce6
commit 28305339f9
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -11,16 +12,18 @@ namespace BizHawk.Client.EmuHawk
/// </summary> /// </summary>
public partial class VideoWriterChooserForm : Form public partial class VideoWriterChooserForm : Form
{ {
private VideoWriterChooserForm() private readonly int _captureWidth, _captureHeight;
private VideoWriterChooserForm(MainForm mainForm, IEmulator emulator, Config config)
{ {
InitializeComponent(); InitializeComponent();
_captureWidth = Global.Emulator.CoreComm.NominalWidth; _captureWidth = emulator.CoreComm.NominalWidth;
_captureHeight = Global.Emulator.CoreComm.NominalHeight; _captureHeight = emulator.CoreComm.NominalHeight;
if (Global.Config.AVI_CaptureOSD) if (config.AVI_CaptureOSD)
{ {
using var bb = GlobalWin.MainForm.CaptureOSD(); using var bb = mainForm.CaptureOSD();
_captureWidth = bb.Width; _captureWidth = bb.Width;
_captureHeight = bb.Height; _captureHeight = bb.Height;
} }
@ -37,17 +40,24 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private readonly int _captureWidth, _captureHeight;
/// <summary> /// <summary>
/// chose an IVideoWriter /// chose an IVideoWriter
/// </summary> /// </summary>
/// <param name="list">list of IVideoWriters to choose from</param> /// <param name="list">list of IVideoWriters to choose from</param>
/// <param name="owner">parent window</param> /// <param name="owner">parent window</param>
/// <param name="emulator">The current emulator</param>
/// <returns>user choice, or null on Cancel\Close\invalid</returns> /// <returns>user choice, or null on Cancel\Close\invalid</returns>
public static IVideoWriter DoVideoWriterChooserDlg(IEnumerable<VideoWriterInfo> list, IWin32Window owner, out int resizeW, out int resizeH, out bool pad, ref bool audioSync) public static IVideoWriter DoVideoWriterChooserDlg(
IEnumerable<VideoWriterInfo> list,
MainForm owner,
IEmulator emulator,
Config config,
out int resizeW,
out int resizeH,
out bool pad,
ref bool audioSync)
{ {
var dlg = new VideoWriterChooserForm var dlg = new VideoWriterChooserForm(owner, emulator, config)
{ {
labelDescriptionBody = { Text = "" } labelDescriptionBody = { Text = "" }
}; };
@ -58,7 +68,7 @@ namespace BizHawk.Client.EmuHawk
foreach (var vw in list) foreach (var vw in list)
{ {
dlg.listBox1.Items.Add(vw); dlg.listBox1.Items.Add(vw);
if (vw.Attribs.ShortName == Global.Config.VideoWriter) if (vw.Attribs.ShortName == config.VideoWriter)
{ {
idxSelect = idx; idxSelect = idx;
} }
@ -83,7 +93,7 @@ namespace BizHawk.Client.EmuHawk
{ {
var vwi = (VideoWriterInfo)dlg.listBox1.SelectedItem; var vwi = (VideoWriterInfo)dlg.listBox1.SelectedItem;
ret = vwi.Create(); ret = vwi.Create();
Global.Config.VideoWriter = vwi.Attribs.ShortName; config.VideoWriter = vwi.Attribs.ShortName;
} }
else else
{ {

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

@ -3218,8 +3218,15 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
aw = VideoWriterChooserForm.DoVideoWriterChoserDlg(VideoWriterInventory.GetAllWriters(), this, aw = VideoWriterChooserForm.DoVideoWriterChooserDlg(
out _avwriterResizew, out _avwriterResizeh, out _avwriterpad, ref _dumpaudiosync); VideoWriterInventory.GetAllWriters(),
this,
Emulator,
Global.Config,
out _avwriterResizew,
out _avwriterResizeh,
out _avwriterpad,
ref _dumpaudiosync);
} }
if (aw == null) if (aw == null)