import 0.9.4

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

diff --git a/win/C#/Parsing/Chapter.cs b/win/C#/Parsing/Chapter.cs
index 5269675..1bf38f4 100644 (file)
--- a/win/C#/Parsing/Chapter.cs
+++ b/win/C#/Parsing/Chapter.cs
@@ -17,27 +17,23 @@ namespace Handbrake.Parsing
     public class Chapter\r
     {\r
         private int m_chapterNumber;\r
+\r
+        private TimeSpan m_duration;\r
+\r
         /// <summary>\r
         /// The number of this Chapter, in regards to it's parent Title\r
         /// </summary>\r
         public int ChapterNumber\r
         {\r
-            get\r
-            {\r
-                return this.m_chapterNumber;\r
-            }\r
+            get { return m_chapterNumber; }\r
         }\r
 \r
-        private TimeSpan m_duration;\r
         /// <summary>\r
         /// The length in time this Chapter spans\r
         /// </summary>\r
         public TimeSpan Duration\r
         {\r
-            get\r
-            {\r
-                return this.m_duration;\r
-            }\r
+            get { return m_duration; }\r
         }\r
 \r
         /// <summary>\r
@@ -46,26 +42,28 @@ namespace Handbrake.Parsing
         /// <returns>A string formatted as: {chapter #}</returns>\r
         public override string ToString()\r
         {\r
-            return this.m_chapterNumber.ToString();\r
+            return m_chapterNumber.ToString();\r
         }\r
 \r
         public static Chapter Parse(StringReader output)\r
         {\r
-            Match m = Regex.Match(output.ReadLine(), @"^    \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");\r
+            Match m = Regex.Match(output.ReadLine(),\r
+                                  @"^    \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");\r
             if (m.Success)\r
             {\r
-                Chapter thisChapter = new Chapter();\r
-                thisChapter.m_chapterNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
-                thisChapter.m_duration = TimeSpan.Parse(m.Groups[5].Value);\r
+                var thisChapter = new Chapter\r
+                                      {\r
+                                          m_chapterNumber = int.Parse(m.Groups[1].Value.Trim()),\r
+                                          m_duration = TimeSpan.Parse(m.Groups[5].Value)\r
+                                      };\r
                 return thisChapter;\r
             }\r
-            else\r
-                return null;\r
+            return null;\r
         }\r
 \r
         public static Chapter[] ParseList(StringReader output)\r
         {\r
-            List<Chapter> chapters = new List<Chapter>();\r
+            var chapters = new List<Chapter>();\r
 \r
             // this is to read the "  + chapters:" line from the buffer\r
             // so we can start reading the chapters themselvs\r
@@ -74,7 +72,7 @@ namespace Handbrake.Parsing
             while (true)\r
             {\r
                 // Start of the chapter list for this Title\r
-                Chapter thisChapter = Chapter.Parse(output);\r
+                Chapter thisChapter = Parse(output);\r
 \r
                 if (thisChapter != null)\r
                     chapters.Add(thisChapter);\r
@@ -84,4 +82,4 @@ namespace Handbrake.Parsing
             return chapters.ToArray();\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file