X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmPreview.cs;h=10bd1cf4cfbebc7f828e95a462764d8c451eb7e2;hb=3166f4bf518b12ef658ce4a249f9a265b16693bd;hp=3a8a2207c8b663327de134d8eb5f54c64024b87d;hpb=8a1e450ed0024507e43726c1f0f722549f3ccd39;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs index 3a8a2207..10bd1cf4 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; @@ -42,7 +43,7 @@ namespace Handbrake /// /// The encode queue /// - private readonly IQueue encodeQueue = new Queue(); + private readonly IEncode encodeQueue = new Encode(); /// /// What is currently playing @@ -99,7 +100,7 @@ namespace Handbrake cb_preview.SelectedIndex = 0; encodeQueue.EncodeStarted += this.EncodeQueueEncodeStarted; - encodeQueue.EncodeEnded += this.EncodeQueueEncodeEnded; + encodeQueue.EncodeCompleted += this.EncodeQueueEncodeEnded; } #region Delegates @@ -192,11 +193,11 @@ namespace Handbrake /// /// The e. /// - private void EncodeQueueEncodeStatusChanged(object sender, HandBrake.ApplicationServices.EncodeProgressEventArgs e) + private void EncodeQueueEncodeStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs e) { 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); } }