From 2295d471926d8e6ec7c50e2242aad315b0dda101 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Tue, 1 Dec 2020 02:59:22 +1000
Subject: [PATCH] Add superinterface IDialogController for
 IMainFormForConfig/Tools

---
 src/BizHawk.Client.EmuHawk/IDialogController.cs  | 15 +++++++++++++++
 src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs |  4 +---
 src/BizHawk.Client.EmuHawk/IMainFormForTools.cs  |  8 +-------
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 src/BizHawk.Client.EmuHawk/IDialogController.cs

diff --git a/src/BizHawk.Client.EmuHawk/IDialogController.cs b/src/BizHawk.Client.EmuHawk/IDialogController.cs
new file mode 100644
index 0000000000..97033dde1e
--- /dev/null
+++ b/src/BizHawk.Client.EmuHawk/IDialogController.cs
@@ -0,0 +1,15 @@
+#nullable enable
+
+using System.Windows.Forms;
+
+namespace BizHawk.Client.EmuHawk
+{
+	public interface IDialogController
+	{
+		DialogResult ShowDialogAsChild(Form dialog);
+
+		void StartSound();
+
+		void StopSound();
+	}
+}
diff --git a/src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs b/src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs
index 41bd4edc1b..fdacd42cd7 100644
--- a/src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/IMainFormForConfig.cs
@@ -5,7 +5,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public interface IMainFormForConfig
+	public interface IMainFormForConfig : IDialogController
 	{
 		/// <remarks>only referenced from <see cref="GenericCoreConfig"/></remarks>
 		IEmulator Emulator { get; }
@@ -20,7 +20,5 @@ namespace BizHawk.Client.EmuHawk
 		void PutCoreSettings(object o);
 
 		void PutCoreSyncSettings(object o);
-
-		DialogResult ShowDialogAsChild(Form dialog);
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs b/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs
index e2d62014cc..711bab718e 100644
--- a/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs
+++ b/src/BizHawk.Client.EmuHawk/IMainFormForTools.cs
@@ -7,7 +7,7 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.EmuHawk
 {
-	public interface IMainFormForTools
+	public interface IMainFormForTools : IDialogController
 	{
 		CheatCollection CheatList { get; }
 
@@ -90,9 +90,6 @@ namespace BizHawk.Client.EmuHawk
 		/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
 		void SetWindowText();
 
-		/// <remarks>only referenced from <see cref="VideoWriterChooserForm"/></remarks>
-		DialogResult ShowDialogAsChild(Form dialog);
-
 		bool StartNewMovie(IMovie movie, bool record);
 
 		/// <remarks>only referenced from <see cref="TAStudio"/></remarks>
@@ -114,8 +111,5 @@ namespace BizHawk.Client.EmuHawk
 
 		/// <remarks>only referenced from <see cref="BookmarksBranchesBox"/></remarks>
 		void UpdateStatusSlots();
-
-		void StartSound();
-		void StopSound();
 	}
 }