From cf6e72aad4054530dffc511b8fca1bb7065700d8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 25 Oct 2013 17:14:24 +0000
Subject: [PATCH] Move controller binding to client.common, and some global
 stuff

---
 BizHawk.Client.Common/BizHawk.Client.Common.csproj           | 1 +
 .../Input => BizHawk.Client.Common}/ControllerBinding.cs     | 4 +---
 BizHawk.Client.Common/Global.cs                              | 5 +++++
 BizHawk.MultiClient/BizHawk.MultiClient.csproj               | 1 -
 BizHawk.MultiClient/GlobalWinF.cs                            | 5 -----
 BizHawk.MultiClient/MainForm.cs                              | 2 +-
 BizHawk.MultiClient/RenderPanel.cs                           | 2 +-
 BizHawk.MultiClient/Sound.cs                                 | 2 +-
 8 files changed, 10 insertions(+), 12 deletions(-)
 rename {BizHawk.MultiClient/Input => BizHawk.Client.Common}/ControllerBinding.cs (95%)

diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 8238808354..e6a8feecc2 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -89,6 +89,7 @@
     <Compile Include="config\Binding.cs" />
     <Compile Include="config\Config.cs" />
     <Compile Include="config\ConfigService.cs" />
+    <Compile Include="ControllerBinding.cs" />
     <Compile Include="CoreFileProvider.cs" />
     <Compile Include="FirmwareManager.cs" />
     <Compile Include="Global.cs" />
diff --git a/BizHawk.MultiClient/Input/ControllerBinding.cs b/BizHawk.Client.Common/ControllerBinding.cs
similarity index 95%
rename from BizHawk.MultiClient/Input/ControllerBinding.cs
rename to BizHawk.Client.Common/ControllerBinding.cs
index 80a11ea5be..8d4b24d5f5 100644
--- a/BizHawk.MultiClient/Input/ControllerBinding.cs
+++ b/BizHawk.Client.Common/ControllerBinding.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using BizHawk.Client.Common;
-
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class Controller : IController
 	{
diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs
index 91de5f80a6..a24c9a26c9 100644
--- a/BizHawk.Client.Common/Global.cs
+++ b/BizHawk.Client.Common/Global.cs
@@ -14,5 +14,10 @@
 		/// </summary>
 		public static MultitrackRewiringControllerAdapter MultitrackRewiringControllerAdapter = new MultitrackRewiringControllerAdapter();
 		public static MovieSession MovieSession = new MovieSession();
+
+		/// <summary>
+		/// whether throttling is force-disabled by use of fast forward
+		/// </summary>
+		public static bool ForceNoThrottle;
 	}
 }
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 88b6f21ab6..5647d7a041 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -280,7 +280,6 @@
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\Filters\Hq2x.cs" />
     <Compile Include="GlobalWinF.cs" />
-    <Compile Include="Input\ControllerBinding.cs" />
     <Compile Include="Input\GamePad.cs" Condition=" '$(OS)' == 'Windows_NT' " />
     <Compile Include="Input\GamePad360.cs" />
     <Compile Include="Input\Input.cs" />
diff --git a/BizHawk.MultiClient/GlobalWinF.cs b/BizHawk.MultiClient/GlobalWinF.cs
index ce1b5ef693..a0a03530d0 100644
--- a/BizHawk.MultiClient/GlobalWinF.cs
+++ b/BizHawk.MultiClient/GlobalWinF.cs
@@ -22,11 +22,6 @@ namespace BizHawk.MultiClient
 		public static Controller NullControls;
 		public static AutofireController AutofireNullControls;
 
-		/// <summary>
-		/// whether throttling is force-disabled by use of fast forward
-		/// </summary>
-		public static bool ForceNoThrottle;
-
 		//the movie will be spliced inbetween these if it is present
 		public static CopyControllerAdapter MovieInputSourceAdapter = new CopyControllerAdapter();
 		public static CopyControllerAdapter MovieOutputHardpoint = new CopyControllerAdapter();
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index ac8fd5a7ef..4e9f292a2d 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -625,7 +625,7 @@ namespace BizHawk.MultiClient
 		{
 			bool fastforward = GlobalWinF.ClientControls["Fast Forward"] || FastForward;
 			bool superfastforward = GlobalWinF.ClientControls["Turbo"];
-			GlobalWinF.ForceNoThrottle = unthrottled || fastforward;
+			Global.ForceNoThrottle = unthrottled || fastforward;
 
 			// realtime throttle is never going to be so exact that using a double here is wrong
 			throttle.SetCoreFps(Global.Emulator.CoreComm.VsyncRate);
diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs
index bdec14fb5c..37e1876dd2 100644
--- a/BizHawk.MultiClient/RenderPanel.cs
+++ b/BizHawk.MultiClient/RenderPanel.cs
@@ -392,7 +392,7 @@ namespace BizHawk.MultiClient
 		{
 			get
 			{
-				if (GlobalWinF.ForceNoThrottle)
+				if (Global.ForceNoThrottle)
 					return false;
 				return Global.Config.VSyncThrottle || Global.Config.VSync;
 			}
diff --git a/BizHawk.MultiClient/Sound.cs b/BizHawk.MultiClient/Sound.cs
index a481e17934..c114ce516f 100644
--- a/BizHawk.MultiClient/Sound.cs
+++ b/BizHawk.MultiClient/Sound.cs
@@ -208,7 +208,7 @@ namespace BizHawk.MultiClient
 
 				samplesProvided = 2 * nsampgot;
 
-				if (!GlobalWinF.ForceNoThrottle)
+				if (!Global.ForceNoThrottle)
 					while (samplesNeeded < samplesProvided)
 					{
 						System.Threading.Thread.Sleep((samplesProvided - samplesNeeded) / 88); // let audio clock control sleep time