OSDN Git Service

WinGui:
[handbrake-jp/handbrake-jp-git.git] / win / C# / frmPreview.cs
index 3a8a220..10bd1cf 100644 (file)
@@ -14,6 +14,7 @@ namespace Handbrake
     using System.Windows.Forms;\r
     using Functions;\r
 \r
+    using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Services;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
 \r
@@ -42,7 +43,7 @@ namespace Handbrake
         /// <summary>\r
         /// The encode queue\r
         /// </summary>\r
-        private readonly IQueue encodeQueue = new Queue();\r
+        private readonly IEncode encodeQueue = new Encode();\r
 \r
         /// <summary>\r
         /// What is currently playing\r
@@ -99,7 +100,7 @@ namespace Handbrake
             cb_preview.SelectedIndex = 0;\r
 \r
             encodeQueue.EncodeStarted += this.EncodeQueueEncodeStarted;\r
-            encodeQueue.EncodeEnded += this.EncodeQueueEncodeEnded;\r
+            encodeQueue.EncodeCompleted += this.EncodeQueueEncodeEnded;\r
         }\r
 \r
         #region Delegates\r
@@ -192,11 +193,11 @@ namespace Handbrake
         /// <param name="e">\r
         /// The e.\r
         /// </param>\r
-        private void EncodeQueueEncodeStatusChanged(object sender, HandBrake.ApplicationServices.EncodeProgressEventArgs e)\r
+        private void EncodeQueueEncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e)\r
         {\r
             if (this.InvokeRequired)\r
             {\r
-                this.BeginInvoke(new Encode.EncodeProgessStatus(this.EncodeQueueEncodeStatusChanged), new[] { sender, e });\r
+                this.BeginInvoke(new EncodeProgessStatus(this.EncodeQueueEncodeStatusChanged), new[] { sender, e });\r
                 return;\r
             }\r
 \r
@@ -323,7 +324,8 @@ namespace Handbrake
                 return;\r
             }\r
 \r
-            encodeQueue.CreatePreviewSample((string)state);\r
+            QueueTask task = new QueueTask((string)state);\r
+            encodeQueue.Start(task, false);\r
         }\r
 \r
         #endregion\r
@@ -434,7 +436,7 @@ namespace Handbrake
         protected override void OnClosing(System.ComponentModel.CancelEventArgs e)\r
         {\r
             encodeQueue.EncodeStarted -= this.EncodeQueueEncodeStarted;\r
-            encodeQueue.EncodeEnded -= this.EncodeQueueEncodeEnded;\r
+            encodeQueue.EncodeCompleted -= this.EncodeQueueEncodeEnded;\r
             base.OnClosing(e);\r
         }\r
     }\r