WinGui:

- Changes -a auto  to -a 1 (The CLI was throwing an error message with auto)
- Misc other changes and code cleanup.

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

6 files changed, 31 insertions, 20 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 4cd18b5d0..61bd8e5a1 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -769,7 +769,7 @@ namespace Handbrake.Functions
             // Audio Track Selections

             //

             if (track1 == "Automatic")

-                tracks = " -a auto";

+                tracks = " -a 1";

             else if (track1 == "")

                 tracks = "";

             else if (track1 == "None")

diff --git a/win/C#/Functions/x264Panel.cs b/win/C#/Functions/x264Panel.cs
index e585a3939..0aeac2920 100644
--- a/win/C#/Functions/x264Panel.cs
+++ b/win/C#/Functions/x264Panel.cs
@@ -557,6 +557,7 @@ namespace Handbrake.Functions
             /* Change the option string to reflect the new mod settings */

             mainWindow.rtf_x264Query.Text = changedOptString;

         }

+

         /*

          * Used by on_x264_WidgetChange()

          * Called when the current x264 option string contains no options.

@@ -920,6 +921,7 @@ namespace Handbrake.Functions
                 }

             }

         }

+

         /*

          * Take a single option and standardize it. Returns as a String

          * Input: String. - Single X264 Option. Name only

diff --git a/win/C#/app.config b/win/C#/app.config
index 1b9181203..83490f5ac 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -20,7 +20,7 @@
                 <value>Checked</value>

             </setting>

             <setting name="hb_version" serializeAs="String">

-                <value>0.9.3</value>

+                <value>SVN1457</value>

             </setting>

             <setting name="tooltipEnable" serializeAs="String">

                 <value>Checked</value>

@@ -32,7 +32,7 @@
                 <value>Checked</value>

             </setting>

             <setting name="hb_build" serializeAs="String">

-                <value>2008043001</value>

+                <value>2008051201</value>

             </setting>

             <setting name="skipversion" serializeAs="String">

                 <value>0</value>

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 7c4d302c0..73abbbe77 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -38,15 +38,19 @@ namespace Handbrake
             string logFile = Path.Combine(Path.GetTempPath(), read_file);

             if (File.Exists(logFile))

             {

-                monitorFile = new Thread(autoUpdate);

-                monitorFile.Start();

+                if (read_file == "dvdinfo.dat") // No need to refresh the window if we are viwing dvdinfo.dat

+                    updateTextFromThread();

+                else // however, we should refresh when reading the encode log file.

+                {

+                    monitorFile = new Thread(autoUpdate);

+                    monitorFile.Start();

+                }

             }

             else

-            {

                 MessageBox.Show("The log file could not be found. Maybe you cleared your system's tempory folder or maybe you just havn't run an encode yet.", "Notice", MessageBoxButtons.OK, MessageBoxIcon.Warning);

-            }

         }

 

+        // Update the Activity window every 5 seconds with the latest log data.

         private void autoUpdate(object state)

         {

             while (true)

@@ -59,17 +63,21 @@ namespace Handbrake
         private delegate void UpdateUIHandler();

         private void updateTextFromThread()

         {

-            if (this.InvokeRequired)

+            try

             {

-                this.BeginInvoke(new UpdateUIHandler(updateTextFromThread));

-                return;

+                if (this.InvokeRequired)

+                {

+                    this.BeginInvoke(new UpdateUIHandler(updateTextFromThread));

+                    return;

+                }

+                rtf_actLog.Text = readFile();

+                this.rtf_actLog.SelectionStart = this.rtf_actLog.Text.Length - 1;

+                this.rtf_actLog.ScrollToCaret();

+            }

+            catch (Exception exc)

+            {

+                MessageBox.Show(exc.ToString());

             }

-            rtf_actLog.Text = readFile();

-            this.rtf_actLog.SelectionStart = this.rtf_actLog.Text.Length - 1;

-            this.rtf_actLog.ScrollToCaret();

-

-            //if (rtf_actLog.Text.Contains("HandBrake has exited."))

-            //monitorFile.Abort();

         }

 

         private string readFile()

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 2ce420367..f11b56f87 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -966,9 +966,10 @@ namespace Handbrake
             // ISO_Open

             // 

             this.ISO_Open.DefaultExt = "ISO";

-            this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.m2t;*.vob;*.ts;*.mpeg;*.mpeg;";

+            this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.m2t;*.vob;*.ts;*.mpeg;*.mpeg;*.avi;*.mp4;*.mkv;";

             this.ISO_Open.RestoreDirectory = true;

             this.ISO_Open.SupportMultiDottedExtensions = true;

+  

             // 

             // FileToolStripMenuItem

             // 

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 76bb5f26c..12b51041b 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -150,6 +150,7 @@ namespace Handbrake
             Form splash = new frmSplashScreen();

             splash.Show();

         }

+

         private void setupH264Panel()

         {

             /*Set opt widget values here*/

@@ -275,6 +276,7 @@ namespace Handbrake
             /* Standardize the option string */

             rtf_x264Query.Text = "";

         }

+

         private void loadUserDefaults()

         {

             string userDefaults = Properties.Settings.Default.defaultUserSettings;

@@ -1971,10 +1973,8 @@ namespace Handbrake
         }

 

         #endregion

-

  

-

-

+        

         // This is the END of the road ------------------------------------------------------------------------------

     }

 }
\ No newline at end of file