diff --git a/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
index b1b2c4d8b2..1cb1a882c3 100644
--- a/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
+++ b/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
@@ -12,14 +12,20 @@ namespace BizHawk.Client.EmuHawk
///
public partial class VideoWriterChooserForm : Form
{
- private readonly int _captureWidth, _captureHeight;
+ private readonly int _captureWidth = 640;
+ private readonly int _captureHeight = 480;
private VideoWriterChooserForm(MainForm mainForm, IEmulator emulator, Config config)
{
InitializeComponent();
- _captureWidth = emulator.CoreComm.NominalWidth;
- _captureHeight = emulator.CoreComm.NominalHeight;
+ // TODO: do we want to use virtual w/h?
+ if (emulator.HasVideoProvider())
+ {
+ var videoProvider = emulator.AsVideoProvider();
+ _captureWidth = videoProvider.BufferWidth;
+ _captureHeight = videoProvider.BufferHeight;
+ }
if (config.AviCaptureOsd)
{
diff --git a/BizHawk.Emulation.Common/CoreComms.cs b/BizHawk.Emulation.Common/CoreComms.cs
index 9a4a3a56a4..3583327722 100644
--- a/BizHawk.Emulation.Common/CoreComms.cs
+++ b/BizHawk.Emulation.Common/CoreComms.cs
@@ -25,10 +25,6 @@ namespace BizHawk.Emulation.Common
public string RomStatusAnnotation { get; set; }
public string RomStatusDetails { get; set; }
- // size hint to a/v out resizer. this probably belongs in VideoProvider? but it's somewhat different than VirtualWidth...
- public int NominalWidth { get; set; } = 640;
- public int NominalHeight { get; set; } = 480;
-
///
/// Gets a message to show. reasonably annoying (dialog box), shouldn't be used most of the time
///
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
index 5e1fd50329..f000310679 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs
@@ -53,8 +53,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
ServiceProvider = ser;
CoreComm = comm;
- CoreComm.NominalWidth = 240;
- CoreComm.NominalHeight = 160;
PutSettings(_settings);
_tracer = new TraceBuffer
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
index dff975142e..2ca2657c63 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
@@ -69,9 +69,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
};
ser.Register(Tracer);
- CoreComm.NominalWidth = 240;
- CoreComm.NominalHeight = 160;
-
GameCode = Encoding.ASCII.GetString(file, 0xac, 4);
Console.WriteLine("Game code \"{0}\"", GameCode);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
index 52bc80cb98..141e9cd76c 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -36,9 +36,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
InitMemoryCallbacks();
CoreComm = comm;
- comm.NominalWidth = 160;
- comm.NominalHeight = 144;
-
ThrowExceptionForBadRom(file);
BoardName = MapperName(file);
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
index 7d08326ccd..7d9f89b527 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.cs
@@ -31,8 +31,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
R.ConnectMemoryCallbackSystem(_memorycallbacks);
comm.RomStatusDetails = "LEFT:\r\n" + L.CoreComm.RomStatusDetails + "RIGHT:\r\n" + R.CoreComm.RomStatusDetails;
- comm.NominalWidth = L.CoreComm.NominalWidth + R.CoreComm.NominalWidth;
- comm.NominalHeight = L.CoreComm.NominalHeight;
LinkConnected = true;