X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmPreview.cs;h=59e6c2520a3fc574164f9fb10034ef1494032eae;hb=31e8e90017a38e8b35b8297eb338d6f4f79de6f4;hp=748d6387673c8086405ecfdfabc39e0080902c83;hpb=a709d000095bfd6d0bb906cc721be94445337c07;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index 748d6387..59e6c252 100644
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.IO;
-using AxQTOControlLib;
+using Handbrake.EncodeQueue;
 using Handbrake.Functions;
 using QTOControlLib;
 using QTOLibrary;
@@ -15,11 +15,10 @@ namespace Handbrake
     {
 
         QueryGenerator hb_common_func = new QueryGenerator();
-        Functions.Encode process = new Functions.Encode();
+        EncodeAndQueueHandler process = new EncodeAndQueueHandler();
         private delegate void UpdateUIHandler();
         String currently_playing = "";
         readonly frmMain mainWindow;
-        private Process hbProc;
         private Thread player;
         private Boolean noQT;
 
@@ -31,7 +30,7 @@ namespace Handbrake
             }
             catch (Exception exc)
             {
-                MessageBox.Show(mw, "It would appear QuickTime 7 is not installed. QuickTime preview functionality will be disabled! \n\n Debug Info:\n" + exc, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show(mw, "It would appear QuickTime 7 is not installed or not accessible. QuickTime preview functionality will be disabled! \n\n Debug Info:\n" + exc, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 btn_playQT.Enabled = false;
                 noQT = true;
             }
@@ -58,39 +57,56 @@ namespace Handbrake
             btn_playQT.Enabled = false;
             btn_playVLC.Enabled = false;
             lbl_status.Text = "Encoding Sample for (VLC) ...";
-            String query = hb_common_func.GeneratePreviewQuery(mainWindow, cb_duration.Text, cb_preview.Text);
+            int duration;
+            int.TryParse(cb_duration.Text, out duration);
+            String query = hb_common_func.GenerateCLIQuery(mainWindow, duration, cb_preview.Text);
             ThreadPool.QueueUserWorkItem(procMonitor, query);
         }
         private void btn_playQT_Click(object sender, EventArgs e)
         {
-            lbl_status.Visible = true;
-            try
+            if (mainWindow.text_destination.Text.Contains(".mkv"))
             {
-                QTControl.URL = "";
-                if (File.Exists(currently_playing))
-                    File.Delete(currently_playing);
+                MessageBox.Show(this,
+                                "The QuickTime Control does not support MKV files, It is recommended you use VLC option instead.",
+                                "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
-            catch (Exception)
+            else
             {
-                MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
+                lbl_status.Visible = true;
+                try
+                {
+                    QTControl.URL = "";
+                    if (File.Exists(currently_playing))
+                        File.Delete(currently_playing);
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
 
-            btn_playQT.Enabled = false;
-            btn_playVLC.Enabled = false;
-            lbl_status.Text = "Encoding Sample for (QT) ...";
-            String query = hb_common_func.GeneratePreviewQuery(mainWindow, cb_duration.Text, cb_preview.Text);
-            ThreadPool.QueueUserWorkItem(procMonitor, query);
+                btn_playQT.Enabled = false;
+                btn_playVLC.Enabled = false;
+                lbl_status.Text = "Encoding Sample for (QT) ...";
+                int duration;
+                int.TryParse(cb_duration.Text, out duration);
+                String query = hb_common_func.GenerateCLIQuery(mainWindow, duration, cb_preview.Text);
+
+                ThreadPool.QueueUserWorkItem(procMonitor, query);
+            }
         }
         private void procMonitor(object state)
         {
             // Make sure we are not already encoding and if we are then display an error.
-            if (hbProc != null)
+            if (process.hbProcess != null)
                 MessageBox.Show(this, "Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             else
             {
-                hbProc = process.runCli(this, (string)state);
-                hbProc.WaitForExit();
-                hbProc = null;
+                process.RunCli((string)state);
+                if (process.hbProcess != null)
+                {
+                    process.hbProcess.WaitForExit();
+                    process.hbProcess = null;
+                }
                 encodeCompleted();
             }
         }
@@ -114,7 +130,7 @@ namespace Handbrake
 
                 // Get the sample filename
                 if (mainWindow.text_destination.Text != "")
-                    currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").Replace(".mkv", "_sample.mkv");;
+                    currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").Replace(".mkv", "_sample.mkv"); ;
 
                 // Play back in QT or VLC
                 if (playerSelection == "QT")
@@ -161,7 +177,7 @@ namespace Handbrake
                         lbl_status.Text = "VLC will now launch.";
                     }
                     else
-                        MessageBox.Show(this, "Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in the program options is correct.", "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        MessageBox.Show(this, "Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: \"Tools Menu > Options > Picture Tab\") ", "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 }
                 else
                     MessageBox.Show(this, "Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.", "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);
@@ -182,9 +198,9 @@ namespace Handbrake
                     BeginInvoke(new UpdateUIHandler(OpenMovie));
                     return;
                 }
-                QTControl.Sizing = QTSizingModeEnum.qtControlFitsMovie;
                 QTControl.URL = currently_playing;
-                QTControl.Sizing = QTSizingModeEnum.qtMovieFitsControl;
+                QTControl.SetSizing(QTSizingModeEnum.qtControlFitsMovie, true);
+                QTControl.URL = currently_playing;
                 QTControl.Show();
 
                 this.ClientSize = QTControl.Size;