WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / Parsing / AudioTrack.cs

diff --git a/win/C#/Parsing/AudioTrack.cs b/win/C#/Parsing/AudioTrack.cs
index d2d6f3f..56a3519 100644 (file)
--- a/win/C#/Parsing/AudioTrack.cs
+++ b/win/C#/Parsing/AudioTrack.cs
@@ -22,6 +22,7 @@ namespace Handbrake.Parsing
         private string m_language;\r
         private string m_subFormat;\r
         private int m_trackNumber;\r
+        private string m_iso639_2;\r
 \r
         /// <summary>\r
         /// The track number of this Audio Track\r
@@ -71,6 +72,11 @@ namespace Handbrake.Parsing
             get { return m_bitrate; }\r
         }\r
 \r
+        public string ISO639_2\r
+        {\r
+            get { return m_iso639_2;  }\r
+        }\r
+\r
         /// <summary>\r
         /// Override of the ToString method to make this object easier to use in the UI\r
         /// </summary>\r
@@ -79,37 +85,39 @@ namespace Handbrake.Parsing
         {\r
             if (m_subFormat == null)\r
                 return string.Format("{0} {1} ({2})", m_trackNumber, m_language, m_format);\r
-            else\r
-                return string.Format("{0} {1} ({2}) ({3})", m_trackNumber, m_language, m_format, m_subFormat);\r
+            \r
+            return string.Format("{0} {1} ({2}) ({3})", m_trackNumber, m_language, m_format, m_subFormat);\r
         }\r
 \r
         public static AudioTrack Parse(StringReader output)\r
         {\r
             String audio_track = output.ReadLine();\r
-            Match m = Regex.Match(audio_track,\r
-                                  @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\), ([0-9]*)Hz, ([0-9]*)bps");\r
-            Match y = Regex.Match(audio_track, @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\)");\r
-            if (m.Success)\r
-            {\r
-                var thisTrack = new AudioTrack();\r
-                thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value.Trim());\r
-                thisTrack.m_language = m.Groups[2].Value;\r
-                thisTrack.m_format = m.Groups[3].Value;\r
-                thisTrack.m_subFormat = m.Groups[4].Value;\r
-                thisTrack.m_frequency = int.Parse(m.Groups[5].Value.Trim());\r
-                thisTrack.m_bitrate = int.Parse(m.Groups[6].Value.Trim());\r
-                return thisTrack;\r
-            }\r
-            else if (y.Success)\r
+            Match m = Regex.Match(audio_track, @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\)");\r
+            Match track = Regex.Match(audio_track, @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\)"); // ID and Language\r
+            Match iso639_2 = Regex.Match(audio_track, @"iso639-2: ([a-zA-Z]*)\)");\r
+            Match samplerate = Regex.Match(audio_track, @"([0-9]*)Hz");\r
+            Match bitrate = Regex.Match(audio_track, @"([0-9]*)bps");\r
+\r
+            string subformat = m.Groups[4].Value.Trim().Contains("iso639") ? null : m.Groups[4].Value;\r
+            string samplerateVal = samplerate.Success ? samplerate.Groups[0].Value.Replace("Hz", "").Trim() : "0";\r
+            string bitrateVal = bitrate.Success ? bitrate.Groups[0].Value.Replace("bps", "").Trim() : "0";\r
+\r
+            if (track.Success)\r
             {\r
-                var thisTrack = new AudioTrack();\r
-                thisTrack.m_trackNumber = int.Parse(y.Groups[1].Value.Trim());\r
-                thisTrack.m_language = y.Groups[2].Value;\r
-                thisTrack.m_format = y.Groups[3].Value;\r
-                return thisTrack;\r
+                var thisTrack = new AudioTrack\r
+                {\r
+                    m_trackNumber = int.Parse(track.Groups[1].Value.Trim()),\r
+                    m_language = track.Groups[2].Value,\r
+                    m_format = m.Groups[3].Value,\r
+                    m_subFormat = subformat,\r
+                    m_frequency = int.Parse(samplerateVal),\r
+                    m_bitrate = int.Parse(bitrateVal),\r
+                    m_iso639_2 = iso639_2.Value.Replace("iso639-2: ", "").Replace(")", "")\r
+                };\r
+                return thisTrack; \r
             }\r
-            else\r
-                return null;\r
+          \r
+            return null;\r
         }\r
 \r
         public static AudioTrack[] ParseList(StringReader output)\r