Merge from TASVideo

.gitignore

@@ -257,3 +257,5 @@
 .hgignore
 .hgtags
 /output/*.manifest
+/output/dll/*.iobj
+/output/dll/*.ipdb

BizHawk.Client.Common/BinarySaveStates.cs

@@ -47,9 +47,10 @@ public class BinaryStateLump
 		public static BinaryStateLump ClientSettings { get; private set; }
 		[Name("VerificationLog", "txt")]
 		public static BinaryStateLump VerificationLog { get; private set; }
-
 		[Name("UserData", "txt")]
 		public static BinaryStateLump UserData { get; private set; }
+		[Name("Session", "txt")]
+		public static BinaryStateLump Session { get; private set; }
 
 		// branchstuff
 		[Name("Branches\\CoreData", "bin")]
@@ -64,6 +65,8 @@ public class BinaryStateLump
 		public static BinaryStateLump BranchHeader { get; private set; }
 		[Name("Branches\\Markers", "txt")]
 		public static BinaryStateLump BranchMarkers { get; private set; }
+		[Name("Branches\\GreenZone")]
+		public static BinaryStateLump BranchStateHistory { get; private set; }
 
 		[AttributeUsage(AttributeTargets.Property)]
 		private class NameAttribute : Attribute

BizHawk.Client.Common/BizHawk.Client.Common.csproj

@@ -52,7 +52,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -113,9 +112,6 @@
     <Compile Include="CoreFileProvider.cs" />
     <Compile Include="ExceptionClasses.cs" />
     <Compile Include="FirmwareManager.cs" />
-    <Compile Include="GLManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Global.cs" />
     <Compile Include="inputAdapters\AutoPattern.cs" />
     <Compile Include="inputAdapters\BitwiseAdapters.cs" />
@@ -158,6 +154,7 @@
     <Compile Include="movie\bk2\Bk2Movie.HeaderApi.cs">
       <DependentUpon>Bk2Movie.cs</DependentUpon>
     </Compile>
+    <Compile Include="movie\import\PXMImport.cs" />
     <Compile Include="movie\tasproj\StateManagerState.cs" />
     <Compile Include="movie\tasproj\TasBranch.cs" />
     <Compile Include="movie\tasproj\TasMovie.History.cs" />
@@ -212,6 +209,7 @@
     </Compile>
     <Compile Include="movie\tasproj\TasMovie.cs" />
     <Compile Include="movie\tasproj\TasMovieMarker.cs" />
+    <Compile Include="movie\tasproj\TasSession.cs" />
     <Compile Include="movie\tasproj\TasStateManager.cs" />
     <Compile Include="movie\tasproj\TasMovieRecord.cs" />
     <Compile Include="movie\tasproj\TasStateManagerSettings.cs" />
@@ -231,12 +229,12 @@
     <Compile Include="SevenZipWriter.cs" />
     <Compile Include="SharpZipWriter.cs" />
     <Compile Include="SystemInfo.cs" />
+    <Compile Include="TempFileCleaner.cs" />
     <Compile Include="tools\Cheat.cs" />
     <Compile Include="tools\CheatList.cs" />
     <Compile Include="tools\RamSearchEngine.cs" />
     <Compile Include="tools\Watch.cs" />
     <Compile Include="tools\WatchList.cs" />
-    <Compile Include="UIHelper.cs" />
     <Compile Include="XmlGame.cs" />
   </ItemGroup>
   <ItemGroup>

BizHawk.Client.Common/RomLoader.cs

@@ -31,7 +31,7 @@ namespace BizHawk.Client.Common
 {
 	public class RomLoader
 	{
-		public enum LoadErrorType { Unknown, MissingFirmware, XML }
+		public enum LoadErrorType { Unknown, MissingFirmware, XML, DiscError }
 
 		// helper methods for the settings events
 		private object GetCoreSettings<T>()
@@ -265,7 +265,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
 
 							if (discMountJob.OUT_SlowLoadAborted)
 							{
-								System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
+								DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "", LoadErrorType.DiscError);
 								return false;
 							}
 
@@ -324,7 +324,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
 
 						if (discMountJob.OUT_SlowLoadAborted)
 						{
-							System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
+							DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "", LoadErrorType.DiscError);
 							return false;
 						}
 
@@ -460,7 +460,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
 
 										if (discMountJob.OUT_SlowLoadAborted)
 										{
-											System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
+											DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "PSX", LoadErrorType.DiscError);
 											return false;
 										}
 
@@ -515,7 +515,7 @@ public bool LoadRom(string path, CoreComm nextComm, bool forceAccurateCore = fal
 							{
 								// need to get rid of this hack at some point
 								rom = new RomGame(file);
-								((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", String.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename
+								((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", string.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename
 								byte[] romData = null;
 								byte[] xmlData = rom.FileData;
 

BizHawk.Client.Common/TempFileCleaner.cs

@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+
+namespace BizHawk.Client.Common
+{
+	/// <summary>
+	/// Starts a thread which cleans any filenames in %temp% beginning with bizhawk.bizdelete.
+	/// Files shouldn't be named that unless they're safe to delete, but notably, they may stil be in use. That won't hurt this component.
+	/// When they're no longer in use, this component will then be able to delete them.
+	/// </summary>
+	public static class TempFileCleaner
+	{
+		//todo - manage paths other than %temp%, make not static, or allow adding multiple paths to static instance
+
+		public static void Start()
+		{
+			lock (typeof(TempFileCleaner))
+			{
+				if (thread != null)
+					return;
+
+				thread = new System.Threading.Thread(ThreadProc);
+				thread.IsBackground = true;
+				thread.Priority = System.Threading.ThreadPriority.Lowest;
+				thread.Start();
+			}
+		}
+
+		static void ThreadProc()
+		{
+			var di = new DirectoryInfo(Path.GetTempPath());
+			for (; ; )
+			{
+				var fis = di.GetFiles("bizhawk.bizdelete*");
+				foreach (var fi in fis)
+				{
+					try
+					{
+						fi.Delete();
+					}
+					catch
+					{
+					}
+
+					//try not to do more than one thing per frame
+					System.Threading.Thread.Sleep(100);
+				}
+
+				//try not to slam the filesystem too hard, we dont want this to cause any hiccups
+				System.Threading.Thread.Sleep(5000);
+			}
+		}
+
+		public static void Stop()
+		{
+		}
+
+		static System.Threading.Thread thread;
+	}
+
+}

BizHawk.Client.Common/config/Config.cs

@@ -116,7 +116,11 @@ public enum EDispMethod { OpenGL, GdiPlus, SlimDX9 };
 
 		public enum ESoundOutputMethod { DirectSound, XAudio2, OpenAL, Dummy };
 
-		public enum EDispManagerAR { None, System, Custom };
+		public enum EDispManagerAR { None, System, 
+			//actually, custom SIZE (fixme on major release)
+			Custom, 
+			CustomRatio
+		};
 
 		public enum SaveStateTypeE { Default, Binary, Text };
 
@@ -273,9 +277,14 @@ public const int
 		public bool DispChrome_Fullscreen_AutohideMouse = true;
 		public bool DispChrome_AllowDoubleClickFullscreen = true;
 
-		public EDispManagerAR DispManagerAR = EDispManagerAR.System; 
-		public int DispCustomUserARWidth = 1;
-		public int DispCustomUserARHeight = 1;
+		public EDispManagerAR DispManagerAR = EDispManagerAR.System;
+
+		//these are misnomers. they're actually a fixed size (fixme on major release)
+		public int DispCustomUserARWidth = -1;
+		public int DispCustomUserARHeight = -1;
+		//these are more like the actual AR ratio (i.e. 4:3) (fixme on major release)
+		public float DispCustomUserARX = -1;
+		public float DispCustomUserARY = -1;
 
 		// Sound options
 #if WINDOWS

BizHawk.Client.Common/lua/LuaFile.cs

@@ -9,8 +9,7 @@ public LuaFile(string path)
 		{
 			Name = string.Empty;
 			Path = path;
-			Enabled = true;
-			Paused = false;
+			State = RunState.Running;
 			FrameWaiting = false;
 		}
 
@@ -29,51 +28,60 @@ public LuaFile(bool isSeparator)
 			IsSeparator = isSeparator;
 			Name = string.Empty;
 			Path = string.Empty;
-			Enabled = false;
+			State = RunState.Disabled;
 		}
 
 		public LuaFile(LuaFile file)
 		{
 			Name = file.Name;
 			Path = file.Path;
-			Enabled = file.Enabled;
-			Paused = file.Paused;
+			State = file.State;
 			IsSeparator = file.IsSeparator;
 			CurrentDirectory = file.CurrentDirectory;
 		}
 
 		public string Name { get; set; }
 		public string Path { get; set; }
-		public bool Enabled { get; set; }
-		public bool Paused { get; set; }
+		public bool Enabled { get { return State != RunState.Disabled; } }
+		public bool Paused { get { return State == RunState.Paused; } }
 		public bool IsSeparator { get; set; }
 		public LuaInterface.Lua Thread { get; set; }
 		public bool FrameWaiting { get; set; }
 		public string CurrentDirectory { get; set; }
 
+		public enum RunState
+		{
+			Disabled, Running, Paused
+		}
+
+		public RunState State { get; set; }
+
 		public static LuaFile SeparatorInstance
 		{
 			get { return new LuaFile(true); }
 		}
 
 		public void Stop()
 		{
-			Enabled = false;
+			State = RunState.Disabled;
 			Thread = null;
 		}
 
 		public void Toggle()
 		{
-			Enabled ^= true;
-			if (Enabled)
-			{
-				Paused = false;
-			}
+			if (State == RunState.Paused)
+				State = RunState.Running;
+			else if (State == RunState.Disabled)
+				State = RunState.Running;
+			else State = RunState.Disabled;
 		}
 
 		public void TogglePause()
 		{
-			Paused ^= true;
+			if (State == RunState.Paused)
+				State = RunState.Running;
+			else if(State == RunState.Running)
+				State = RunState.Paused;
 		}
 	}
 }

BizHawk.Client.Common/lua/LuaFileList.cs

@@ -45,7 +45,7 @@ public string Filename
 
 		public void StopAllScripts()
 		{
-			ForEach(x => x.Enabled = false);
+			ForEach(x => x.State = LuaFile.RunState.Disabled);
 		}
 
 		public new void Clear()
@@ -105,8 +105,10 @@ public bool LoadLuaSession(string path)
 
 							Add(new LuaFile(scriptPath)
 							{
-								Enabled = !Global.Config.DisableLuaScriptsOnLoad &&
-								line.Substring(0, 1) == "1",
+								State = (
+										!Global.Config.DisableLuaScriptsOnLoad 
+										&& line.Substring(0, 1) == "1"
+									) ? LuaFile.RunState.Running : LuaFile.RunState.Disabled
 							});
 						}
 					}

BizHawk.Client.Common/lua/LuaFunctionList.cs

@@ -18,12 +18,12 @@ public NamedLuaFunction this[string guid]
 
 		public new bool Remove(NamedLuaFunction function)
 		{
-			if (Global.Emulator.CanPollInput())
+			if (Global.Emulator.InputCallbacksAvailable())
 			{
 				Global.Emulator.AsInputPollable().InputCallbacks.Remove(function.Callback);
 			}
 
-			if (Global.Emulator.CanDebug() && Global.Emulator.MemoryCallbacksAvailable())
+			if (Global.Emulator.MemoryCallbacksAvailable())
 			{
 				Global.Emulator.AsDebuggable().MemoryCallbacks.Remove(function.Callback);
 			}
@@ -33,22 +33,15 @@ public NamedLuaFunction this[string guid]
 
 		public void ClearAll()
 		{
-			if (Global.Emulator.CanPollInput())
+			if (Global.Emulator.InputCallbacksAvailable())
 			{
 				Global.Emulator.AsInputPollable().InputCallbacks.RemoveAll(this.Select(x => x.Callback));
 			}
 
-			if (Global.Emulator.CanDebug())
+			if (Global.Emulator.MemoryCallbacksAvailable())
 			{
-				try
-				{
-					var cbSys = Global.Emulator.AsDebuggable().MemoryCallbacks;
-					cbSys.RemoveAll(this.Select(x => x.Callback));
-				}
-				catch
-				{
-					//swallow exceptions here. many cores havent implemented memorycallbacks, we ought to have more granular feature querying
-				}
+				var cbSys = Global.Emulator.AsDebuggable().MemoryCallbacks;
+				cbSys.RemoveAll(this.Select(x => x.Callback));
 			}
 
 			Clear();