From fc66bbb5949b6524e478aeb4ddeca814bdbb8977 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Mon, 14 Jan 2013 08:13:34 +0000
Subject: [PATCH] fix calculation of movie lengths for pal games

---
 BizHawk.MultiClient/PlayMovie.Designer.cs | 2 +-
 BizHawk.MultiClient/movie/Movie.cs        | 5 ++++-
 BizHawk.MultiClient/movie/MovieHeader.cs  | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/BizHawk.MultiClient/PlayMovie.Designer.cs b/BizHawk.MultiClient/PlayMovie.Designer.cs
index 752e00e7ed..34b0f06ef4 100644
--- a/BizHawk.MultiClient/PlayMovie.Designer.cs
+++ b/BizHawk.MultiClient/PlayMovie.Designer.cs
@@ -273,7 +273,7 @@
 			// 
 			// columnHeader4
 			// 
-			this.columnHeader4.Text = "Length";
+			this.columnHeader4.Text = "Length (est.)";
 			this.columnHeader4.Width = 64;
 			// 
 			// PlayMovie
diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index fac21a99f9..157e0a6854 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -1040,7 +1040,10 @@ namespace BizHawk.MultiClient
 			if (frames < 1)
 				return seconds;
 
-			bool pal = false; //TODO: pal flag
+			bool pal = false;
+			if (Header.HeaderParams.ContainsKey(MovieHeader.PAL))
+				if (Header.HeaderParams[MovieHeader.PAL] == "1")
+					pal = true;
 
 			switch (Header.GetHeaderLine(MovieHeader.PLATFORM))
 			{
diff --git a/BizHawk.MultiClient/movie/MovieHeader.cs b/BizHawk.MultiClient/movie/MovieHeader.cs
index be40f36ebd..e2adc02659 100644
--- a/BizHawk.MultiClient/movie/MovieHeader.cs
+++ b/BizHawk.MultiClient/movie/MovieHeader.cs
@@ -203,6 +203,11 @@ namespace BizHawk.MultiClient
 				line = ParseHeader(line, MovieHeader.SGB);
 				AddHeaderLine(MovieHeader.SGB, line);
 			}
+			else if (line.Contains(MovieHeader.PAL))
+			{
+				line = ParseHeader(line, MovieHeader.PAL);
+				AddHeaderLine(MovieHeader.PAL, line);
+			}
 			else if (line.StartsWith("subtitle") || line.StartsWith("sub"))
 			{
 				return false;