WinGui:

- Change toString method in Parsing for timestamp return. removed h,m,s letters.

- Commented out some parsing code that is not needed at this stage.

- Most of the work for the Queue has now been done. Only some cross-thread UI element changes need done.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@679 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 16 insertions, 16 deletions

diff --git a/win/C#/Parsing/Chapter.cs b/win/C#/Parsing/Chapter.cs
index 630ab0905..0715e0cc5 100644
--- a/win/C#/Parsing/Chapter.cs
+++ b/win/C#/Parsing/Chapter.cs
@@ -16,7 +16,7 @@ namespace Handbrake.Parsing
             }

         }

 

-        private int[] m_cellRange;

+        /*private int[] m_cellRange;

         public int[] CellRange

         {

             get

@@ -32,7 +32,7 @@ namespace Handbrake.Parsing
             {

                 return this.m_blocks;

             }

-        }

+        }*/

 

         private TimeSpan m_duration;

         public TimeSpan Duration

@@ -51,8 +51,8 @@ namespace Handbrake.Parsing
                 Chapter thisChapter = new Chapter();

                 string[] splitter = curLine.Split(new string[] { "    + ", ": cells ", ", ", " blocks, duration ", "->" }, StringSplitOptions.RemoveEmptyEntries);

                 thisChapter.m_chapterNumber = int.Parse(splitter[0]);

-                thisChapter.m_cellRange = new int[2] { int.Parse(splitter[1]), int.Parse(splitter[2]) };

-                thisChapter.m_blocks = int.Parse(splitter[3]);

+                //thisChapter.m_cellRange = new int[2] { int.Parse(splitter[1]), int.Parse(splitter[2]) };

+                //thisChapter.m_blocks = int.Parse(splitter[3]);

                 thisChapter.m_duration = TimeSpan.Parse(splitter[4]);

                 return thisChapter;

             }

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index 99b32cd70..fab287b18 100644
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -35,7 +35,7 @@ namespace Handbrake.Parsing
             }

         }

 

-        private int m_vts;

+        /*private int m_vts;

         public int Vts

         {

             get

@@ -69,7 +69,7 @@ namespace Handbrake.Parsing
             {

                 return this.m_blockCount;

             }

-        }

+        }*/

 

         private int m_titleNumber;

         public int TitleNumber

@@ -107,14 +107,14 @@ namespace Handbrake.Parsing
             }

         }

 

-        private float m_fps;

+        /*private float m_fps;

         public float Fps

         {

             get

             {

                 return this.m_fps;

             }

-        }

+        }*/

 

         private int[] m_autoCrop;

         public int[] AutoCropDimensions

@@ -130,12 +130,12 @@ namespace Handbrake.Parsing
             this.m_audioTracks = new List<AudioTrack>();

             this.m_chapters = new List<Chapter>();

             this.m_subtitles = new List<Subtitle>();

-            this.m_cellRange = new int[2];

+            //this.m_cellRange = new int[2];

         }

 

         public override string ToString()

         {

-            return string.Format("{0} - {1}h{2}m{3}s", this.m_titleNumber, this.m_duration.Hours, 

+            return string.Format("{0} ({1}:{2}:{3})", this.m_titleNumber, this.m_duration.Hours, 

                 this.m_duration.Minutes, this.m_duration.Seconds);

         }

 

@@ -152,13 +152,13 @@ namespace Handbrake.Parsing
             thisTitle.m_titleNumber = int.Parse(curLine.Substring(curLine.Length - 2, 1));

             curLine = output.ReadLine();

             string[] splitter = curLine.Split(',');

-            thisTitle.m_vts = int.Parse(splitter[0].Substring(8));

-            thisTitle.m_ttn = int.Parse(splitter[1].Substring(5));

+            //thisTitle.m_vts = int.Parse(splitter[0].Substring(8));

+            //thisTitle.m_ttn = int.Parse(splitter[1].Substring(5));

             splitter = splitter[2].Trim().Split(' ', '(', ')');

-            thisTitle.m_blockCount = int.Parse(splitter[3]);

+            //thisTitle.m_blockCount = int.Parse(splitter[3]);

             splitter = splitter[1].Split('-', '>');

-            thisTitle.m_cellRange[0] = int.Parse(splitter[0]);

-            thisTitle.m_cellRange[1] = int.Parse(splitter[2]);

+            //thisTitle.m_cellRange[0] = int.Parse(splitter[0]);

+            //thisTitle.m_cellRange[1] = int.Parse(splitter[2]);

             curLine = output.ReadLine();

             splitter = curLine.Split(new string[] { "  + duration: " }, StringSplitOptions.RemoveEmptyEntries);

             thisTitle.m_duration = TimeSpan.Parse(splitter[0]);

@@ -166,7 +166,7 @@ namespace Handbrake.Parsing
             splitter = curLine.Split(new string[] { "  + size: ", "aspect: ", ", ", " fps", "x" }, StringSplitOptions.RemoveEmptyEntries);

             thisTitle.m_resolution = new Size(int.Parse(splitter[0]), int.Parse(splitter[1]));

             thisTitle.m_aspectRatio = float.Parse(splitter[2].ToString());

-            thisTitle.m_fps = float.Parse(splitter[3].ToString());

+            //thisTitle.m_fps = float.Parse(splitter[3].ToString());

             curLine = output.ReadLine();

             splitter = curLine.Split(new string[] { "  + autocrop: ", "/" }, StringSplitOptions.RemoveEmptyEntries);

             thisTitle.m_autoCrop = new int[4] { int.Parse(splitter[0]), int.Parse(splitter[1]), int.Parse(splitter[2]), int.Parse(splitter[3]) };