From 1b6b53f68730a2b530f3e617639c0ca31019690c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 21 Oct 2013 21:55:19 +0000
Subject: [PATCH] move some more movie classes to Client.Common

---
 BizHawk.Client.Common/BizHawk.Client.Common.csproj     |  4 ++++
 .../movie/InputAdapters.cs                             |  4 +---
 .../movie/MovieLog.cs                                  | 10 +++++-----
 .../movie/MovieMnemonics.cs                            |  4 +---
 .../movie/MultitrackRecording.cs                       |  2 +-
 BizHawk.MultiClient/BizHawk.MultiClient.csproj         |  4 ----
 BizHawk.MultiClient/GlobalWinF.cs                      |  3 +--
 BizHawk.MultiClient/Input/Input.cs                     |  2 ++
 8 files changed, 15 insertions(+), 18 deletions(-)
 rename {BizHawk.MultiClient => BizHawk.Client.Common}/movie/InputAdapters.cs (95%)
 rename {BizHawk.MultiClient => BizHawk.Client.Common}/movie/MovieLog.cs (88%)
 rename {BizHawk.MultiClient => BizHawk.Client.Common}/movie/MovieMnemonics.cs (96%)
 rename {BizHawk.MultiClient => BizHawk.Client.Common}/movie/MultitrackRecording.cs (81%)

diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index f14b21d3b0..fcd4cb3aad 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -52,7 +52,11 @@
     <Compile Include="Global.cs" />
     <Compile Include="helpers\InputValidate.cs" />
     <Compile Include="KeyTurbo.cs" />
+    <Compile Include="movie\InputAdapters.cs" />
     <Compile Include="movie\MovieHeader.cs" />
+    <Compile Include="movie\MovieLog.cs" />
+    <Compile Include="movie\MovieMnemonics.cs" />
+    <Compile Include="movie\MultitrackRecording.cs" />
     <Compile Include="movie\Subtitle.cs" />
     <Compile Include="movie\SubtitleList.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.Client.Common/movie/InputAdapters.cs
similarity index 95%
rename from BizHawk.MultiClient/movie/InputAdapters.cs
rename to BizHawk.Client.Common/movie/InputAdapters.cs
index e33907107b..86fd7bf1e5 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.Client.Common/movie/InputAdapters.cs
@@ -2,9 +2,7 @@
 using System.Text;
 using System.Collections.Generic;
 
-using BizHawk.Client.Common;
-
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	/// <summary>
 	/// will hold buttons for 1 frame and then release them. (Calling Click() from your button click is what you want to do)
diff --git a/BizHawk.MultiClient/movie/MovieLog.cs b/BizHawk.Client.Common/movie/MovieLog.cs
similarity index 88%
rename from BizHawk.MultiClient/movie/MovieLog.cs
rename to BizHawk.Client.Common/movie/MovieLog.cs
index 9b5854ed38..ed3e25e254 100644
--- a/BizHawk.MultiClient/movie/MovieLog.cs
+++ b/BizHawk.Client.Common/movie/MovieLog.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.IO;
 
-using BizHawk.Client.Common;
-
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
+	//TODO: what is this object really trying to accomplish? COnsider making it a collection (ICollection, IEnumerable perhaps)
+
 	/// <summary>
 	/// Represents the controller key presses of a movie
 	/// </summary>
@@ -129,12 +129,12 @@ namespace BizHawk.MultiClient
 				if (frame <= StateFirstIndex)
 				{
 					_state_records.Clear();
-					GlobalWinF.MovieSession.Movie.RewindToFrame(0);
+					//Global.MovieSession.Movie.RewindToFrame(0); //TODO: unbreak this, also don't do it this way
 				}
 				else
 				{
 					_state_records.RemoveRange(frame - StateFirstIndex, StateLastIndex - frame + 1);
-					GlobalWinF.MovieSession.Movie.RewindToFrame(frame);
+					//Global.MovieSession.Movie.RewindToFrame(frame); //TODO: unbreak this, also don't do it this way
 				}
 			}
 		}
diff --git a/BizHawk.MultiClient/movie/MovieMnemonics.cs b/BizHawk.Client.Common/movie/MovieMnemonics.cs
similarity index 96%
rename from BizHawk.MultiClient/movie/MovieMnemonics.cs
rename to BizHawk.Client.Common/movie/MovieMnemonics.cs
index 8565cb6943..f75b642920 100644
--- a/BizHawk.MultiClient/movie/MovieMnemonics.cs
+++ b/BizHawk.Client.Common/movie/MovieMnemonics.cs
@@ -3,9 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using BizHawk.Client.Common;
-
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public static class MnemonicConstants
 	{
diff --git a/BizHawk.MultiClient/movie/MultitrackRecording.cs b/BizHawk.Client.Common/movie/MultitrackRecording.cs
similarity index 81%
rename from BizHawk.MultiClient/movie/MultitrackRecording.cs
rename to BizHawk.Client.Common/movie/MultitrackRecording.cs
index af5d9e236e..55727047ac 100644
--- a/BizHawk.MultiClient/movie/MultitrackRecording.cs
+++ b/BizHawk.Client.Common/movie/MultitrackRecording.cs
@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class MultitrackRecording
 	{
diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 8855839b56..83505bd74f 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -345,7 +345,6 @@
     <Compile Include="movie\EditCommentsForm.Designer.cs">
       <DependentUpon>EditCommentsForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="movie\InputAdapters.cs" />
     <Compile Include="Input\Keyboard.cs" Condition=" '$(OS)' == 'Windows_NT' " />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
@@ -365,10 +364,7 @@
     </Compile>
     <Compile Include="movie\Movie.cs" />
     <Compile Include="movie\MovieImport.cs" />
-    <Compile Include="movie\MovieLog.cs" />
-    <Compile Include="movie\MovieMnemonics.cs" />
     <Compile Include="movie\MovieSession.cs" />
-    <Compile Include="movie\MultitrackRecording.cs" />
     <Compile Include="movie\PlayMovie.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/BizHawk.MultiClient/GlobalWinF.cs b/BizHawk.MultiClient/GlobalWinF.cs
index bd8d394e95..8816b63d7f 100644
--- a/BizHawk.MultiClient/GlobalWinF.cs
+++ b/BizHawk.MultiClient/GlobalWinF.cs
@@ -1,9 +1,8 @@
 using BizHawk.DiscSystem;
 using SlimDX.Direct3D9;
 using SlimDX.DirectSound;
-#if WINDOWS
 
-#endif
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
diff --git a/BizHawk.MultiClient/Input/Input.cs b/BizHawk.MultiClient/Input/Input.cs
index b723da8fdc..b2c61dbb68 100644
--- a/BizHawk.MultiClient/Input/Input.cs
+++ b/BizHawk.MultiClient/Input/Input.cs
@@ -6,6 +6,8 @@ using System.Threading;
 using SlimDX.DirectInput;
 #endif
 
+using BizHawk.Client.Common;
+
 namespace BizHawk.MultiClient
 {
 	//coalesces events back into instantaneous states