WinGui:

- Missed some updates from from 3739

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

4 files changed, 14 insertions, 12 deletions

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index ee3d3bf75..ba606d5d3 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -137,12 +137,12 @@ namespace Handbrake
                     if (mode == ActivityLogMode.Scan)

                     {

                         scan.ScanCompleted += stopWindowRefresh;

-                        encode.EncodeEnded -= stopWindowRefresh;

+                        encode.EncodeCompleted -= stopWindowRefresh;

                     }

                     else

                     {

                         scan.ScanCompleted -= stopWindowRefresh;

-                        encode.EncodeEnded += stopWindowRefresh;

+                        encode.EncodeCompleted += stopWindowRefresh;

                     }

 

                     // Start a fresh window timer

@@ -466,7 +466,7 @@ namespace Handbrake
             encode.EncodeStarted -= encode_EncodeStarted;

 

             scan.ScanCompleted -= stopWindowRefresh;

-            encode.EncodeEnded -= stopWindowRefresh;

+            encode.EncodeCompleted -= stopWindowRefresh;

 

             windowTimer.Dispose();

             e.Cancel = true;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c614e318f..0b02d13ae 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -236,7 +236,7 @@ namespace Handbrake
 

             // Handle Encode Start / Finish / Pause

             encodeQueue.EncodeStarted += new EventHandler(encodeStarted);

-            encodeQueue.EncodeEnded += new EventHandler(encodeEnded);

+            encodeQueue.EncodeCompleted += encodeEnded;

 

             // Scan Started and Completed Events

             SourceScan.ScanStatusChanged += this.SourceScanScanStatusChanged;

@@ -1050,7 +1050,7 @@ namespace Handbrake
                     encodeQueue.Pause();

 

                     if (Settings.Default.showCliForInGuiEncodeStatus)

-                        encodeQueue.SafelyClose();

+                        encodeQueue.SafelyStop();

                     else

                         encodeQueue.Stop();

                 }

@@ -2422,7 +2422,7 @@ namespace Handbrake
         {

             if (this.InvokeRequired)

             {

-                this.BeginInvoke(new Encode.EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e });

+                this.BeginInvoke(new EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e });

                 return;

             }

 

diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index 30a57c862..9fb1d7a42 100644
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -14,6 +14,7 @@ namespace Handbrake
     using System.Windows.Forms;

     using Functions;

 

+    using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Services;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

@@ -99,7 +100,7 @@ namespace Handbrake
             cb_preview.SelectedIndex = 0;

 

             encodeQueue.EncodeStarted += this.EncodeQueueEncodeStarted;

-            encodeQueue.EncodeEnded += this.EncodeQueueEncodeEnded;

+            encodeQueue.EncodeCompleted += this.EncodeQueueEncodeEnded;

         }

 

         #region Delegates

@@ -196,7 +197,7 @@ namespace Handbrake
         {

             if (this.InvokeRequired)

             {

-                this.BeginInvoke(new Encode.EncodeProgessStatus(this.EncodeQueueEncodeStatusChanged), new[] { sender, e });

+                this.BeginInvoke(new EncodeProgessStatus(this.EncodeQueueEncodeStatusChanged), new[] { sender, e });

                 return;

             }

 

@@ -323,7 +324,8 @@ namespace Handbrake
                 return;

             }

 

-            encodeQueue.CreatePreviewSample((string)state);

+            QueueTask task = new QueueTask((string)state);

+            encodeQueue.Start(task, false);

         }

 

         #endregion

@@ -434,7 +436,7 @@ namespace Handbrake
         protected override void OnClosing(System.ComponentModel.CancelEventArgs e)

         {

             encodeQueue.EncodeStarted -= this.EncodeQueueEncodeStarted;

-            encodeQueue.EncodeEnded -= this.EncodeQueueEncodeEnded;

+            encodeQueue.EncodeCompleted -= this.EncodeQueueEncodeEnded;

             base.OnClosing(e);

         }

     }

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index d0ec62ed3..dab46a3fe 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -62,7 +62,7 @@ namespace Handbrake
             queue.QueueListChanged += new EventHandler(queue_QueueListChanged);

 

             queue.EncodeStarted += new EventHandler(queue_EncodeStarted);

-            queue.EncodeEnded += new EventHandler(queue_EncodeEnded);

+            queue.EncodeCompleted += queue_EncodeEnded;

 

             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;

         }

@@ -124,7 +124,7 @@ namespace Handbrake
         {

             if (this.InvokeRequired)

             {

-                this.BeginInvoke(new Encode.EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e });

+                this.BeginInvoke(new EncodeProgessStatus(EncodeQueue_EncodeStatusChanged), new[] { sender, e });

                 return;

             }