WinGui: Numerous bug fixes to the services library.

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

1 files changed, 0 insertions, 33 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs
index 7f79e8aec..f17a6a51b 100644
--- a/win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs
+++ b/win/CS/HandBrake.ApplicationServices/Parsing/Parser.cs
@@ -78,10 +78,6 @@ namespace HandBrake.ApplicationServices.Parsing
         /// </summary>

         public event ScanProgressEventHandler OnScanProgress;

 

-        /// <summary>

-        /// Raised upon the catching of a "Scanning title # of #..." in the stream

-        /// </summary>

-        public event EncodeProgressEventHandler OnEncodeProgress;

 

         /// <summary>

         /// Gets the buffer of data that came from the CLI standard input/error

@@ -133,34 +129,5 @@ namespace HandBrake.ApplicationServices.Parsing
 

             return tmp;

         }

-

-        /// <summary>

-        /// Pase the CLI status output (from standard output)

-        /// </summary>

-        public void ReadEncodeStatus()

-        {

-            string tmp = base.ReadLine();

-

-            Match m = Regex.Match(tmp, @"^Encoding: task ([0-9]*) of ([0-9]*), ([0-9]*\.[0-9]*) %( \(([0-9]*\.[0-9]*) fps, avg ([0-9]*\.[0-9]*) fps, ETA ([0-9]{2})h([0-9]{2})m([0-9]{2})s\))?");

-            if (m.Success && OnEncodeProgress != null)

-            {

-                int currentTask = int.Parse(m.Groups[1].Value);

-                int totalTasks = int.Parse(m.Groups[2].Value);

-                float percent = float.Parse(m.Groups[3].Value, CultureInfo.InvariantCulture);

-                float currentFps = m.Groups[5].Value == string.Empty ? 0.0F : float.Parse(m.Groups[5].Value, CultureInfo.InvariantCulture);

-                float avgFps = m.Groups[6].Value == string.Empty ? 0.0F : float.Parse(m.Groups[6].Value, CultureInfo.InvariantCulture);

-                string remaining = string.Empty;

-                if (m.Groups[7].Value != string.Empty)

-                {

-                    remaining = m.Groups[7].Value + ":" + m.Groups[8].Value + ":" + m.Groups[9].Value;

-                }

-                if (string.IsNullOrEmpty(remaining))

-                {

-                    remaining = "Calculating ...";

-                }

-

-                OnEncodeProgress(this, currentTask, totalTasks, percent, currentFps, avgFps, remaining);

-            }

-        }

     }

 }
\ No newline at end of file