WinGui:

[handbrake-jp/handbrake-jp-git.git] / win / C# / frmQueue.cs

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index c7b280e..d52545b 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -9,22 +9,23 @@ using System.Collections.Generic;
 using System.ComponentModel;\r
 using System.Windows.Forms;\r
 using Handbrake.EncodeQueue;\r
+using System.Collections.ObjectModel;\r
 \r
 namespace Handbrake\r
 {\r
     public partial class frmQueue : Form\r
     {\r
         private delegate void UpdateHandler();\r
-        QueueHandler queue;\r
+        private QueueHandler queue;\r
 \r
         public frmQueue(QueueHandler q)\r
         {\r
             InitializeComponent();\r
 \r
             this.queue = q;\r
-            queue.OnEncodeStart += new EventHandler(queueOnEncodeStart);\r
-            queue.OnQueueFinished += new EventHandler(queueOnQueueFinished);\r
-            queue.OnPaused += new EventHandler(queueOnPaused);\r
+            queue.NewJobStarted += new EventHandler(queueOnEncodeStart);\r
+            queue.QueueCompleted += new EventHandler(queueOnQueueFinished);\r
+            queue.QueuePauseRequested += new EventHandler(queueOnPaused);\r
         }\r
         void queueOnPaused(object sender, EventArgs e)\r
         {\r
@@ -74,19 +75,19 @@ namespace Handbrake
         // Start and Stop Controls\r
         private void btn_encode_Click(object sender, EventArgs e)\r
         {\r
-            if (queue.isPaused)\r
+            if (queue.PauseRequested)\r
             {\r
                 setUIEncodeStarted();\r
                 MessageBox.Show("Encoding restarted", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);\r
             }\r
 \r
-            if (!queue.isEncodeStarted)\r
-                queue.startEncode();\r
+            if (!queue.IsEncoding)\r
+                queue.StartEncodeQueue();\r
 \r
         }\r
         private void btn_pause_Click(object sender, EventArgs e)\r
         {\r
-            queue.pauseEncodeQueue();\r
+            queue.RequestPause();\r
             setUIEncodeFinished();\r
             resetQueue();\r
             MessageBox.Show("No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
@@ -141,7 +142,7 @@ namespace Handbrake
             }\r
 \r
             list_queue.Items.Clear();\r
-            List<Job> theQueue = queue.getQueue();\r
+            ReadOnlyCollection<Job> theQueue = queue.CurrentQueue;\r
             foreach (Job queue_item in theQueue)\r
             {\r
                 string q_item = queue_item.Query;\r
@@ -203,9 +204,9 @@ namespace Handbrake
                 }\r
 \r
                 // found query is a global varible\r
-                Functions.QueryParser parsed = Functions.QueryParser.Parse(queue.lastQueueItem.Query);\r
-                lbl_source.Text = queue.lastQueueItem.Source;\r
-                lbl_dest.Text = queue.lastQueueItem.Destination;\r
+                Functions.QueryParser parsed = Functions.QueryParser.Parse(queue.LastEncode.Query);\r
+                lbl_source.Text = queue.LastEncode.Source;\r
+                lbl_dest.Text = queue.LastEncode.Destination;\r
 \r
                 lbl_title.Text = parsed.DVDTitle == 0 ? "Auto" : parsed.DVDTitle.ToString();\r
 \r
@@ -254,7 +255,7 @@ namespace Handbrake
 \r
                 // Remove each selected item\r
                 foreach (int selectedIndex in selectedIndices)\r
-                    queue.remove(selectedIndex);\r
+                    queue.RemoveJob(selectedIndex);\r
 \r
                 updateUIElements();\r
 \r
@@ -308,7 +309,7 @@ namespace Handbrake
 \r
                 // Move up each selected item\r
                 foreach (int selectedIndex in selectedIndices)\r
-                    queue.moveUp(selectedIndex);\r
+                    queue.MoveUp(selectedIndex);\r
 \r
                 updateUIElements();\r
 \r
@@ -336,7 +337,7 @@ namespace Handbrake
 \r
                 // Move down each selected item\r
                 foreach (int selectedIndex in selectedIndices)\r
-                    queue.moveDown(selectedIndex);\r
+                    queue.MoveDown(selectedIndex);\r
 \r
                 updateUIElements();\r
 \r
@@ -356,7 +357,7 @@ namespace Handbrake
             SaveFile.Filter = "Batch|.bat";\r
             SaveFile.ShowDialog();\r
             if (SaveFile.FileName != String.Empty)\r
-                queue.writeBatchScript(SaveFile.FileName);\r
+                queue.WriteBatchScriptToFile(SaveFile.FileName);\r
         }\r
         private void mnu_export_Click(object sender, EventArgs e)\r
         {\r
@@ -364,21 +365,21 @@ namespace Handbrake
             SaveFile.Filter = "HandBrake Queue|*.queue";\r
             SaveFile.ShowDialog();\r
             if (SaveFile.FileName != String.Empty)\r
-                queue.updateQueueRecoveryFile(SaveFile.FileName);\r
+                queue.WriteQueueStateToFile(SaveFile.FileName);\r
         }\r
         private void mnu_import_Click(object sender, EventArgs e)\r
         {\r
             OpenFile.FileName = "";\r
             OpenFile.ShowDialog();\r
             if (OpenFile.FileName != String.Empty)\r
-                queue.recoverQueue(OpenFile.FileName);\r
+                queue.LoadQueueFromFile(OpenFile.FileName);\r
             updateUIElements();\r
         }\r
         private void mnu_readd_Click(object sender, EventArgs e)\r
         {\r
-            if (queue.lastQueueItem != null)\r
+            if (!queue.LastEncode.IsEmpty)\r
             {\r
-                queue.add(queue.lastQueueItem.Query, queue.lastQueueItem.Source, queue.lastQueueItem.Destination);\r
+                queue.AddJob(queue.LastEncode.Query, queue.LastEncode.Source, queue.LastEncode.Destination);\r
                 updateUIElements();\r
             }\r
         }\r