WinGui:

- Added support for the new subtitle information in the log format. Will deal with the new GUI elements later.

git-svn-id: svn://localhost/HandBrake/trunk@2525 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 8e294d9..d0082e2 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -142,6 +142,12 @@
     <Compile Include="Controls\PictureSettings.Designer.cs">\r
       <DependentUpon>PictureSettings.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="Controls\Subtitles.cs">\r
+      <SubType>UserControl</SubType>\r
+    </Compile>\r
+    <Compile Include="Controls\Subtitles.Designer.cs">\r
+      <DependentUpon>Subtitles.cs</DependentUpon>\r
+    </Compile>\r
     <Compile Include="Controls\x264Panel.cs">\r
       <SubType>UserControl</SubType>\r
     </Compile>\r
@@ -251,6 +257,10 @@
       <DependentUpon>PictureSettings.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r
     </EmbeddedResource>\r
+    <EmbeddedResource Include="Controls\Subtitles.resx">\r
+      <DependentUpon>Subtitles.cs</DependentUpon>\r
+      <SubType>Designer</SubType>\r
+    </EmbeddedResource>\r
     <EmbeddedResource Include="Controls\x264Panel.resx">\r
       <DependentUpon>x264Panel.cs</DependentUpon>\r
       <SubType>Designer</SubType>\r

diff --git a/win/C#/Parsing/Subtitle.cs b/win/C#/Parsing/Subtitle.cs
index e3ff72a..1fe45c2 100644 (file)
--- a/win/C#/Parsing/Subtitle.cs
+++ b/win/C#/Parsing/Subtitle.cs
@@ -17,6 +17,8 @@ namespace Handbrake.Parsing
     {\r
         private string m_language;\r
         private int m_trackNumber;\r
+        private string m_type;\r
+        private string m_typecode;\r
 \r
         /// <summary>\r
         /// The track number of this Subtitle\r
@@ -35,6 +37,24 @@ namespace Handbrake.Parsing
         }\r
 \r
         /// <summary>\r
+        /// Langauage Code\r
+        /// </summary>\r
+        public string LanguageCode\r
+        {\r
+            get { return m_typecode; }\r
+        }\r
+\r
+\r
+        /// <summary>\r
+        /// Subtitle Type\r
+        /// </summary>\r
+        public string Type\r
+        {\r
+            get { return m_type; }\r
+        }\r
+\r
+\r
+        /// <summary>\r
         /// Override of the ToString method to make this object easier to use in the UI\r
         /// </summary>\r
         /// <returns>A string formatted as: {track #} {language}</returns>\r
@@ -47,13 +67,15 @@ namespace Handbrake.Parsing
         {\r
             string curLine = output.ReadLine();\r
 \r
-            Match m = Regex.Match(curLine, @"^    \+ ([0-9]*), ([A-Za-z, ]*) \((.*)\)");\r
+            Match m = Regex.Match(curLine, @"^    \+ ([0-9]*), ([A-Za-z, ]*) \((.*)\) \(([a-zA-Z]*)\)");\r
             if (m.Success && !curLine.Contains("HandBrake has exited."))\r
             {\r
                 var thisSubtitle = new Subtitle\r
                                        {\r
                                            m_trackNumber = int.Parse(m.Groups[1].Value.Trim()),\r
-                                           m_language = m.Groups[2].Value\r
+                                           m_language = m.Groups[2].Value,\r
+                                           m_typecode = m.Groups[3].Value,\r
+                                           m_type = m.Groups[4].Value\r
                                        };\r
                 return thisSubtitle;\r
             }\r