WinGui:

misc UI control placement changes
updates to some FormBorderStyle's
converted Parsing code to use regex instead of substrings and string splitting
added a couple of additional code comments

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

1 files changed, 7 insertions, 6 deletions

diff --git a/win/C#/Parsing/DVD.cs b/win/C#/Parsing/DVD.cs
index 1c2e0d0e7..025961240 100644
--- a/win/C#/Parsing/DVD.cs
+++ b/win/C#/Parsing/DVD.cs
@@ -2,8 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using System.IO;

-using System.Windows.Forms;

-

+using System.Text.RegularExpressions;

 

 namespace Handbrake.Parsing

 {

@@ -37,11 +36,13 @@ namespace Handbrake.Parsing
             DVD thisDVD = new DVD();

             while (!output.EndOfStream)

             {

-                string curLine = output.ReadLine();

-

-                if (curLine.Contains("Scanning title"))

+                if ((char)output.Peek() == '+')

+                {

+                    thisDVD.m_titles.AddRange(Title.ParseList(output.ReadToEnd()));

+                }

+                else

                 {

-                    thisDVD.m_titles.AddRange(Title.ParseList(output));

+                    output.ReadLine();

                 }

             }

             return thisDVD;