merge 0.9.4 to jp

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

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 6f8efaa..ff7de82 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -95,6 +95,14 @@ namespace Handbrake.Functions
                 string csv = sr.ReadLine();\r
                 while (csv != null)\r
                 {\r
+/*\r
+                    DataGridViewRow row = new DataGridViewRow();\r
+\r
+                    data_chpt.Rows.Insert(i, row);\r
+                    data_chpt.Rows[i].Cells[0].Value = (i + 1);\r
+                    data_chpt.Rows[i].Cells[1].Value = "\83`\83\83\83v\83^\81[ " + (i + 1);\r
+                    i++;\r
+*/\r
                     if (csv.Trim() != "")\r
                     {\r
                         string[] contents = csv.Split(',');\r
@@ -156,6 +164,14 @@ namespace Handbrake.Functions
                 // Add the appropriate file extension\r
                 if (mainWindow.drop_format.SelectedIndex == 0)\r
                 {\r
+/*\r
+                    string filePath = "";\r
+                    if (Properties.Settings.Default.autoNamePath.Trim() != "")\r
+                    {\r
+                        if (Properties.Settings.Default.autoNamePath.Trim() != "\83u\83\89\83E\83Y\83{\83^\83\93\82Å\83f\83t\83H\83\8b\83g\82Ì\95Û\91¶\90æ\82ð\8ew\92è...")\r
+                            filePath = Properties.Settings.Default.autoNamePath + "\\";\r
+                    }\r
+*/\r
                     if (Properties.Settings.Default.useM4v || mainWindow.Check_ChapterMarkers.Checked || mainWindow.AudioSettings.RequiresM4V() || mainWindow.Subtitles.RequiresM4V())\r
                         destinationFilename += ".m4v";\r
                     else\r
@@ -250,6 +266,10 @@ namespace Handbrake.Functions
             }\r
             catch (Exception e)\r
             {\r
+/*\r
+                if (debug == true)\r
+                    MessageBox.Show("\83A\83b\83v\83f\81[\83g\82Ì\8am\94F\82ª\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81B\n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+*/\r
                 MessageBox.Show("Unable to retrieve version information from the CLI. \nError:\n" + e);\r
             }\r
         }\r
@@ -310,6 +330,11 @@ namespace Handbrake.Functions
             Process hbProcess = null;\r
             foreach (Process process in hbProcesses)\r
             {\r
+/*\r
+                line = stdOutput.ReadLine();\r
+                if (line == null) line = "";\r
+                Match m = Regex.Match(line, @"HandBrake ([0-9\.a-zA-Z-]*)*(svn[0-9]*[M]*)* \([0-9]*\)");\r
+*/\r
                 Boolean found = false;\r
                 // Check if the current CLI instance was running before we started the current one\r
                 foreach (Process bprocess in before)\r