WinGui: API Tidyup Part 1 of many

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

2 files changed, 13 insertions, 11 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs
index 7b63ec149..93aa13a0c 100644
--- a/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs
+++ b/win/CS/HandBrake.ApplicationServices/Parsing/Source.cs
@@ -49,18 +49,20 @@ namespace HandBrake.ApplicationServices.Parsing
         /// <param name="output">

         /// The output.

         /// </param>

-        /// <param name="userSettingService"> </param>

+        /// <param name="isDvdNavDisabled">

+        /// The is Dvd Nav Disabled.

+        /// </param>

         /// <returns>

         /// A DVD object which contains a list of title inforamtion

         /// </returns>

-        public static Source Parse(StreamReader output, IUserSettingService userSettingService)

+        public static Source Parse(StreamReader output, bool isDvdNavDisabled)

         {

             var thisDVD = new Source();

 

             while (!output.EndOfStream)

             {

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

-                    thisDVD.Titles.AddRange(Title.ParseList(output.ReadToEnd(), userSettingService));

+                    thisDVD.Titles.AddRange(Title.ParseList(output.ReadToEnd(), isDvdNavDisabled));

                 else

                     output.ReadLine();

             }

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
index f19861cfd..04d00c1f2 100644
--- a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
+++ b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
@@ -123,13 +123,13 @@ namespace HandBrake.ApplicationServices.Parsing
         /// <param name="output">

         /// A StringReader of output data

         /// </param>

-        /// <param name="userSettingService">

-        /// The user Setting Service.

+        /// <param name="isDvdNavDisabled">

+        /// The is Dvd Nav Disabled.

         /// </param>

         /// <returns>

         /// A Title Object

         /// </returns>

-        public static Title Parse(StringReader output, IUserSettingService userSettingService)

+        public static Title Parse(StringReader output, bool isDvdNavDisabled)

         {

             var thisTitle = new Title();

             string nextLine = output.ReadLine();

@@ -172,7 +172,7 @@ namespace HandBrake.ApplicationServices.Parsing
             }

        

             // Multi-Angle Support if LibDvdNav is enabled

-            if (!userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))

+            if (!isDvdNavDisabled)

             {

                 m = Regex.Match(nextLine, @"  \+ angle\(s\) ([0-9])");

                 if (m.Success)

@@ -229,13 +229,13 @@ namespace HandBrake.ApplicationServices.Parsing
         /// <param name="output">

         /// The Output

         /// </param>

-        /// <param name="userSettingService">

-        /// The user Setting Service.

+        /// <param name="isDvdNavDisabled">

+        /// The is Dvd Nav Disabled.

         /// </param>

         /// <returns>

         /// A List of titles

         /// </returns>

-        public static Title[] ParseList(string output, IUserSettingService userSettingService)

+        public static Title[] ParseList(string output, bool isDvdNavDisabled)

         {

             var titles = new List<Title>();

             var sr = new StringReader(output);

@@ -246,7 +246,7 @@ namespace HandBrake.ApplicationServices.Parsing
                 if (sr.Peek() == ' ') // If the character is a space, then chances are it's the combing detected line.

                     sr.ReadLine(); // Skip over it

                 else

-                    titles.Add(Parse(sr, userSettingService));

+                    titles.Add(Parse(sr, isDvdNavDisabled));

             }

 

             return titles.ToArray();