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..86c2b6e 100644 (file)
--- a/win/C#/Parsing/AudioTrack.cs
+++ b/win/C#/Parsing/AudioTrack.cs
@@ -79,8 +79,8 @@ 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
@@ -91,25 +91,30 @@ namespace Handbrake.Parsing
             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
+                var thisTrack = new AudioTrack\r
+                                    {\r
+                                        m_trackNumber = int.Parse(m.Groups[1].Value.Trim()),\r
+                                        m_language = m.Groups[2].Value,\r
+                                        m_format = m.Groups[3].Value,\r
+                                        m_subFormat = m.Groups[4].Value,\r
+                                        m_frequency = int.Parse(m.Groups[5].Value.Trim()),\r
+                                        m_bitrate = int.Parse(m.Groups[6].Value.Trim())\r
+                                    };\r
                 return thisTrack;\r
             }\r
-            else if (y.Success)\r
+            \r
+            if (y.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
+                var thisTrack = new AudioTrack\r
+                                    {\r
+                                        m_trackNumber = int.Parse(y.Groups[1].Value.Trim()),\r
+                                        m_language = y.Groups[2].Value,\r
+                                        m_format = y.Groups[3].Value\r
+                                    };\r
                 return thisTrack;\r
             }\r
-            else\r
-                return null;\r
+            \r
+            return null;\r
         }\r
 \r
         public static AudioTrack[] ParseList(StringReader output)\r