From 30825c54ac68aa875da2553581a8710afbaf90e8 Mon Sep 17 00:00:00 2001 From: nattthebear Date: Thu, 15 Jun 2017 20:40:38 -0400 Subject: [PATCH] protip: When refactoring, it's not OK to just make it not work. Fixes #873 --- BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs | 14 +++++--------- BizHawk.Client.EmuHawk/MainForm.cs | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs b/BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs index fe641166ea..0045e87c1c 100644 --- a/BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs +++ b/BizHawk.Client.EmuHawk/AVOut/BmpVideoProvder.cs @@ -12,9 +12,11 @@ namespace BizHawk.Client.EmuHawk { private Bitmap _bmp; - public BmpVideoProvider(Bitmap bmp) + public BmpVideoProvider(Bitmap bmp, int vsyncnum, int vsyncden) { _bmp = bmp; + VsyncNumerator = vsyncnum; + VsyncDenominator = vsyncden; } public void Dispose() @@ -50,14 +52,8 @@ namespace BizHawk.Client.EmuHawk public int BackgroundColor => 0; - public int VsyncNumerator - { - get { throw new InvalidOperationException(); } - } + public int VsyncNumerator { get; private set; } - public int VsyncDenominator - { - get { throw new InvalidOperationException(); } - } + public int VsyncDenominator { get; private set; } } } diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index fbe6691143..e6d6fb61db 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -3402,7 +3402,7 @@ namespace BizHawk.Client.EmuHawk } } - output = new BmpVideoProvider(bmpout); + output = new BmpVideoProvider(bmpout, _currentVideoProvider.VsyncNumerator, _currentVideoProvider.VsyncDenominator); disposableOutput = (IDisposable)output; } finally