WinGui: (WPF) Further work on the WPF UI and associated servies and utilities. Started working on wiring up the ability to encode.

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

2 files changed, 12 insertions, 3 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
index 1dab6aa6c..033f16018 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
@@ -50,6 +50,11 @@ namespace HandBrake.ApplicationServices.Services
         /// </summary>

         private readonly StringBuilder logging;

 

+        /// <summary>

+        /// The Current source scan path.

+        /// </summary>

+        private string currentSourceScanPath;

+

         #endregion

 

         /// <summary>

@@ -168,14 +173,17 @@ namespace HandBrake.ApplicationServices.Services
             {

                 this.logging.Clear();

 

+                string source = sourcePath.ToString().EndsWith("\\") ? sourcePath.ToString() : "\"" + sourcePath + "\"";

+                currentSourceScanPath = source;

+

                 IsScanning = true;

                 if (this.ScanStared != null)

                     this.ScanStared(this, new EventArgs());

 

                 if (title != 0)

-                    instance.StartScan(sourcePath.ToString(), previewCount, title);

+                    instance.StartScan(source, previewCount, title);

                 else

-                    instance.StartScan(sourcePath.ToString(), previewCount);

+                    instance.StartScan(source, previewCount);

             }

             catch (Exception exc)

             {

@@ -200,7 +208,7 @@ namespace HandBrake.ApplicationServices.Services
         /// </param>

         private void InstanceScanCompleted(object sender, EventArgs e)

         {

-            this.SouceData = new Source { Titles = ConvertTitles(this.instance.Titles) };

+            this.SouceData = new Source { Titles = ConvertTitles(this.instance.Titles), ScanPath = currentSourceScanPath};

 

             IsScanning = false;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs b/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs
index 3b2543264..781aa40ec 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs
@@ -231,6 +231,7 @@ namespace HandBrake.ApplicationServices.Services
                 this.readData = new Parser(this.hbProc.StandardError.BaseStream);

                 this.readData.OnScanProgress += this.OnScanProgress;

                 this.SouceData = Source.Parse(this.readData);

+                this.SouceData.ScanPath = source;

 

                 // Write the Buffer out to file.

                 using (StreamWriter scanLog = new StreamWriter(dvdInfoPath))