move some more movie classes to Client.Common

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" />

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)

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
 				}
 			}
 		}

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
 	{

BizHawk.Client.Common/movie/MultitrackRecording.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.MultiClient
+namespace BizHawk.Client.Common
 {
 	public class MultitrackRecording
 	{

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>

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
 {

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