LinGui: make Help->Guide work on windows/mingw

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

diff --git a/win/C#/Services/Encode.cs b/win/C#/Services/Encode.cs
index 677c62c..a6da850 100644 (file)
--- a/win/C#/Services/Encode.cs
+++ b/win/C#/Services/Encode.cs
@@ -104,7 +104,7 @@ namespace Handbrake.Services
         /// </param>\r
         public void CreatePreviewSample(string query)\r
         {\r
-            this.Run(new Job { Query = query });\r
+            this.Run(new Job { Query = query }, true);\r
         }\r
 \r
         /// <summary>\r
@@ -148,82 +148,77 @@ namespace Handbrake.Services
         /// <param name="encJob">\r
         /// The enc Job.\r
         /// </param>\r
-        protected void Run(Job encJob)\r
+        /// <param name="RequireStandardOuput">\r
+        /// Set to True to show no window and force standard output redirect\r
+        /// </param>\r
+        protected void Run(Job encJob, bool RequireStandardOuput)\r
         {\r
             this.job = encJob;\r
             try\r
             {\r
                 ResetLogReader();\r
-\r
-                if (this.EncodeStarted != null)\r
-                    this.EncodeStarted(this, new EventArgs());\r
-\r
                 IsEncoding = true;\r
 \r
                 string handbrakeCLIPath = Path.Combine(Application.StartupPath, "HandBrakeCLI.exe");\r
-                string logPath =\r
-                    Path.Combine(\r
-                        Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs",\r
-                        "last_encode_log.txt");\r
-                string strCmdLine = String.Format(@" /C """"{0}"" {1} 2>""{2}"" """, handbrakeCLIPath, encJob.Query,\r
-                                                  logPath);\r
+                string logPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs", "last_encode_log.txt");\r
+                string strCmdLine = String.Format(@" /C """"{0}"" {1} 2>""{2}"" """, handbrakeCLIPath, encJob.Query, logPath);\r
                 var cliStart = new ProcessStartInfo("CMD.exe", strCmdLine);\r
 \r
-                if (Settings.Default.enocdeStatusInGui)\r
+                if (Settings.Default.enocdeStatusInGui || RequireStandardOuput)\r
                 {\r
                     cliStart.RedirectStandardOutput = true;\r
                     cliStart.UseShellExecute = false;\r
-                    if (!Settings.Default.showCliForInGuiEncodeStatus)\r
+                    if (!Settings.Default.showCliForInGuiEncodeStatus || RequireStandardOuput)\r
                         cliStart.CreateNoWindow = true;\r
                 }\r
                 if (Settings.Default.cli_minimized)\r
                     cliStart.WindowStyle = ProcessWindowStyle.Minimized;\r
 \r
                 Process[] before = Process.GetProcesses(); // Get a list of running processes before starting.\r
-                Process startProcess = Process.Start(cliStart);\r
-\r
+                HbProcess = Process.Start(cliStart);\r
                 this.processID = Main.GetCliProcess(before);\r
 \r
-                // Fire the Encode Started Event\r
-                if (this.EncodeStarted != null)\r
-                    this.EncodeStarted(this, new EventArgs());\r
-\r
-                if (startProcess != null)\r
-                    this.processHandle = startProcess.MainWindowHandle; // Set the process Handle\r
-\r
+                if (HbProcess != null)\r
+                    this.processHandle = HbProcess.MainWindowHandle; // Set the process Handle\r
+      \r
                 // Start the Log Monitor\r
                 windowTimer = new Timer(new TimerCallback(ReadFile), null, 1000, 1000);\r
 \r
                 // Set the process Priority\r
+                Process hbCliProcess = null;\r
                 if (this.processID != -1)\r
                 {\r
-                    HbProcess = Process.GetProcessById(this.processID);\r
-                    HbProcess.EnableRaisingEvents = true;\r
-                    HbProcess.Exited += new EventHandler(HbProcess_Exited);\r
+                    hbCliProcess = Process.GetProcessById(this.processID);\r
+                    hbCliProcess.EnableRaisingEvents = true;\r
+                    hbCliProcess.Exited += new EventHandler(HbProcess_Exited);\r
                 }\r
 \r
-                if (HbProcess != null)\r
+                if (hbCliProcess != null)\r
                     switch (Settings.Default.processPriority)\r
                     {\r
                         case "Realtime":\r
-                            HbProcess.PriorityClass = ProcessPriorityClass.RealTime;\r
+                            hbCliProcess.PriorityClass = ProcessPriorityClass.RealTime;\r
                             break;\r
                         case "High":\r
-                            HbProcess.PriorityClass = ProcessPriorityClass.High;\r
+                            hbCliProcess.PriorityClass = ProcessPriorityClass.High;\r
                             break;\r
                         case "Above Normal":\r
-                            HbProcess.PriorityClass = ProcessPriorityClass.AboveNormal;\r
+                            hbCliProcess.PriorityClass = ProcessPriorityClass.AboveNormal;\r
                             break;\r
                         case "Normal":\r
-                            HbProcess.PriorityClass = ProcessPriorityClass.Normal;\r
+                            hbCliProcess.PriorityClass = ProcessPriorityClass.Normal;\r
                             break;\r
                         case "Low":\r
-                            HbProcess.PriorityClass = ProcessPriorityClass.Idle;\r
+                            hbCliProcess.PriorityClass = ProcessPriorityClass.Idle;\r
                             break;\r
                         default:\r
-                            HbProcess.PriorityClass = ProcessPriorityClass.BelowNormal;\r
+                            hbCliProcess.PriorityClass = ProcessPriorityClass.BelowNormal;\r
                             break;\r
                     }\r
+\r
+                // Fire the Encode Started Event\r
+                if (this.EncodeStarted != null)\r
+                    this.EncodeStarted(this, new EventArgs());\r
             }\r
             catch (Exception exc)\r
             {\r