WinGui:

- Initial tempory workaround for the hbcli issue with the parser.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@762 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 43 insertions, 19 deletions

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 50121cbce..b4da2a353 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -161,7 +161,7 @@
   <ItemGroup>

     <Content Include="handbrakepineapple.ico" />

     <None Include="Resources\tempSplash.jpg" />

-    <None Include="splash.jpg" />

+    <None Include="Resources\splash.jpg" />

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index 98a62259e..e079a0a73 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -119,7 +119,7 @@
   </resheader>

   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="splash" type="System.Resources.ResXFileRef, System.Windows.Forms">

-    <value>..\splash.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+    <value>..\Resources\splash.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

   <data name="tempSplash" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\tempSplash.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

diff --git a/win/C#/Resources/splash.jpg b/win/C#/Resources/splash.jpg
new file mode 100644
index 000000000..b930b77ac
--- /dev/null
+++ b/win/C#/Resources/splash.jpg
diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs
index 06ca59932..9e798ea93 100644
--- a/win/C#/frmDvdInfo.cs
+++ b/win/C#/frmDvdInfo.cs
@@ -40,5 +40,6 @@ namespace Handbrake
             this.Hide();

             base.OnClosing(e);

         }

+

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index bcd0ef929..39d29ca3d 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -549,7 +549,7 @@ namespace Handbrake
             String filename ="";

             text_source.Text = "";

             

-            int scanTwice = 0;

+            //int scanTwice = 0;

 

             if (RadioDVD.Checked)

             {

@@ -578,7 +578,8 @@ namespace Handbrake
             // If there isn't any, rescan the DVD. hbcli occasionally fails (see bug in encode) with standard error.

             if (filename != "")

             {

-                if (drp_dvdtitle.Items.Count == 0) 

+               // Disbaled the 2nd pass for the time being.

+               /* if (drp_dvdtitle.Items.Count == 0) 

                 {

                     if (scanTwice == 0)

                     {

@@ -588,7 +589,7 @@ namespace Handbrake
                         frmRD.ShowDialog();

                         scanTwice = 1;

                     }

-                }

+                }*/

             }

             else

             {

@@ -597,7 +598,7 @@ namespace Handbrake
 

             if (drp_dvdtitle.Items.Count == 0)

             {

-                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ for details.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);

+                MessageBox.Show("No Title(s) found. Please make sure you have selected a valid, non-copy protected source. Please refer to the FAQ (see Help Menu).", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);

            }

 

         }

@@ -699,7 +700,7 @@ namespace Handbrake
             }

             else

             {

-                hbProc = process.runCli(this, (string)state, false, false, false, false);

+                hbProc = process.runCli(this, (string)state, true, true, false, false);

 

                 MessageBox.Show("The encode process has now started.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);

 

@@ -713,17 +714,17 @@ namespace Handbrake
                     // Maybe an issue with the Parser cauing the CLI to hickup/pause?

                     //*****************************************************************************************

 

-                    /*

-                    Parsing.Parser encode = new Parsing.Parser(hbProc.StandardError.BaseStream);

+                    

+                    /*Parsing.Parser encode = new Parsing.Parser(hbProc.StandardError.BaseStream);

                     encode.OnEncodeProgress += encode_OnEncodeProgress;

                     while (!encode.EndOfStream)

                     {

                         encode.ReadLine();

-                    }*/

+                    }

 

                     hbProc.WaitForExit();

                     process.closeCLI();

-                    

+                    */

                 }

                 catch (Exception)

                 {

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 0a7108893..92c3a4751 100644
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -61,18 +61,40 @@ namespace Handbrake
         Functions.CLI process = new Functions.CLI();

         private void startProc(object state)

         {

-            string query = "-i " + '"' + inputFile + '"' + " -t0";

-          

-            

-            hbProc = process.runCli(this, query, true, true, false, true);

+            //string query = "-i " + '"' + inputFile + '"' + " -t0";

+            // hbProc = process.runCli(this, query, true, true, false, true);

+

+            //*********************************************************************************************************************************************

+            /*

+             * Quick and Dirty hack to get around the stderr crashes of hbcli. Lets try feeding brians parser text straight from a text file.

+             */

+            string appPath = Application.StartupPath.ToString();

+            appPath = appPath + "\\";

+            string strCmdLine = "cmd /c " + '"' + '"' + appPath + "\\hbcli.exe" + '"' +  " -i" + '"' + inputFile + '"' + " -t0 >" + '"'+ appPath + "\\dvdinfo.dat" + '"' + " 2>&1" + '"';

+            Process hbproc = Process.Start("CMD.exe", strCmdLine);

+            hbproc.WaitForExit();

+

+

+            StreamReader sr = new StreamReader(appPath + "dvdinfo.dat");

+    

+            thisDvd = Parsing.DVD.Parse(sr);

 

+            sr.Close();

+            Console.ReadLine();

+            updateUIElements();

+            //*********************************************************************************************************************************************

+

+            /*

+             * This has been temporily disabled due to the stderr issue

+             * 

+             * 

             Parsing.Parser readData = new Parsing.Parser(hbProc.StandardError.BaseStream);

             readData.OnScanProgress += Parser_OnScanProgress;

             readData.OnReadLine += dvdInfo.HandleParsedData;

             readData.OnReadToEnd += dvdInfo.HandleParsedData;

 

             // Setup the parser

-            thisDvd = Parsing.DVD.Parse(readData);

+            

 

             if (cancel != 1)

             {

@@ -80,6 +102,7 @@ namespace Handbrake
                 process.killCLI();

                 process.closeCLI();

             }

+            */

         }

 

         private void Parser_OnScanProgress(object Sender, int CurrentTitle, int TitleCount)

@@ -99,10 +122,9 @@ namespace Handbrake
 

         private void btn_skip_Click(object sender, EventArgs e)

         {

-            process.killCLI();

+            //process.killCLI();

             this.Close();

-            cancel = 1;

-            

+            cancel = 1;  

         }

 

     }