# Changed

- Initial work for multi-instance support. All CLI processes controled by their process ID, not Name. This prevents a scan from 1 instance killing a CLI encode from another.

# Fixed
- Disable angle dropdown when not using Libdvdnav
- Fixed issue with angle dropdown where first item is not selected. This caused the generate query to break due to "--angle" with no value.
- Fixed issue with the dropdown menu setup on the audio tab not working correctly due to updated encoder names and DTS support.
- Fixed an exception conditon on cancel scan.


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

1 files changed, 68 insertions, 68 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 6cab7baba..a732cf275 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -110,7 +110,7 @@ namespace Handbrake
             this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_qptest = new System.Windows.Forms.ToolStripMenuItem();

             this.gb_source = new System.Windows.Forms.GroupBox();

-            this.label4 = new System.Windows.Forms.Label();

+            this.lbl_angle = new System.Windows.Forms.Label();

             this.Label13 = new System.Windows.Forms.Label();

             this.Label17 = new System.Windows.Forms.Label();

             this.Label9 = new System.Windows.Forms.Label();

@@ -183,14 +183,9 @@ namespace Handbrake
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();

             this.tabs_panel = new System.Windows.Forms.TabControl();

             this.tab_Filters = new System.Windows.Forms.TabPage();

-            this.ctl_deinterlace = new Handbrake.Deinterlace();

-            this.ctl_denoise = new Handbrake.Denoise();

-            this.ctl_decomb = new Handbrake.Decomb();

-            this.ctl_detelecine = new Handbrake.Detelecine();

             this.tab_chapters = new System.Windows.Forms.TabPage();

             this.label31 = new System.Windows.Forms.Label();

             this.h264Tab = new System.Windows.Forms.TabPage();

-            this.x264Panel = new Handbrake.Controls.x264Panel();

             this.tab_query = new System.Windows.Forms.TabPage();

             this.btn_clear = new System.Windows.Forms.Button();

             this.label34 = new System.Windows.Forms.Label();

@@ -225,6 +220,11 @@ namespace Handbrake
             this.StatusStrip = new System.Windows.Forms.StatusStrip();

             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();

             this.hbproc = new System.Diagnostics.Process();

+            this.ctl_deinterlace = new Handbrake.Deinterlace();

+            this.ctl_denoise = new Handbrake.Denoise();

+            this.ctl_decomb = new Handbrake.Decomb();

+            this.ctl_detelecine = new Handbrake.Detelecine();

+            this.x264Panel = new Handbrake.Controls.x264Panel();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

@@ -716,13 +716,13 @@ namespace Handbrake
             // 

             // drop_angle

             // 

+            this.drop_angle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.drop_angle.FormattingEnabled = true;

             this.drop_angle.Location = new System.Drawing.Point(250, 52);

             this.drop_angle.Name = "drop_angle";

             this.drop_angle.Size = new System.Drawing.Size(45, 21);

             this.drop_angle.TabIndex = 45;

-            this.drop_angle.Text = "1";

             this.ToolTip.SetToolTip(this.drop_angle, "Select the chapter range you would like to enocde. (default: All Chapters)");

             // 

             // lbl_src_res

@@ -998,7 +998,7 @@ namespace Handbrake
             // gb_source

             // 

             this.gb_source.Controls.Add(this.drop_angle);

-            this.gb_source.Controls.Add(this.label4);

+            this.gb_source.Controls.Add(this.lbl_angle);

             this.gb_source.Controls.Add(this.lbl_duration);

             this.gb_source.Controls.Add(this.label_duration);

             this.gb_source.Controls.Add(this.Label13);

@@ -1018,16 +1018,16 @@ namespace Handbrake
             this.gb_source.TabStop = false;

             this.gb_source.Text = "Source";

             // 

-            // label4

+            // lbl_angle

             // 

-            this.label4.AutoSize = true;

-            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label4.ForeColor = System.Drawing.Color.Black;

-            this.label4.Location = new System.Drawing.Point(200, 55);

-            this.label4.Name = "label4";

-            this.label4.Size = new System.Drawing.Size(44, 13);

-            this.label4.TabIndex = 44;

-            this.label4.Text = "Angle:";

+            this.lbl_angle.AutoSize = true;

+            this.lbl_angle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.lbl_angle.ForeColor = System.Drawing.Color.Black;

+            this.lbl_angle.Location = new System.Drawing.Point(200, 55);

+            this.lbl_angle.Name = "lbl_angle";

+            this.lbl_angle.Size = new System.Drawing.Size(44, 13);

+            this.lbl_angle.TabIndex = 44;

+            this.lbl_angle.Text = "Angle:";

             // 

             // Label13

             // 

@@ -1877,48 +1877,6 @@ namespace Handbrake
             this.tab_Filters.Text = "Video Filters";

             this.tab_Filters.UseVisualStyleBackColor = true;

             // 

-            // ctl_deinterlace

-            // 

-            this.ctl_deinterlace.AutoSize = true;

-            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);

-            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_deinterlace.Name = "ctl_deinterlace";

-            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);

-            this.ctl_deinterlace.TabIndex = 41;

-            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);

-            // 

-            // ctl_denoise

-            // 

-            this.ctl_denoise.AutoSize = true;

-            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);

-            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_denoise.Name = "ctl_denoise";

-            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);

-            this.ctl_denoise.TabIndex = 40;

-            // 

-            // ctl_decomb

-            // 

-            this.ctl_decomb.AutoSize = true;

-            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);

-            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_decomb.Name = "ctl_decomb";

-            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);

-            this.ctl_decomb.TabIndex = 39;

-            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);

-            // 

-            // ctl_detelecine

-            // 

-            this.ctl_detelecine.AutoSize = true;

-            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);

-            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);

-            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);

-            this.ctl_detelecine.Name = "ctl_detelecine";

-            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);

-            this.ctl_detelecine.TabIndex = 38;

-            // 

             // tab_chapters

             // 

             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;

@@ -1956,14 +1914,6 @@ namespace Handbrake
             this.h264Tab.Text = "Advanced";

             this.h264Tab.UseVisualStyleBackColor = true;

             // 

-            // x264Panel

-            // 

-            this.x264Panel.Location = new System.Drawing.Point(0, 0);

-            this.x264Panel.Name = "x264Panel";

-            this.x264Panel.Size = new System.Drawing.Size(720, 306);

-            this.x264Panel.TabIndex = 0;

-            this.x264Panel.x264Query = "";

-            // 

             // tab_query

             // 

             this.tab_query.Controls.Add(this.btn_clear);

@@ -2323,6 +2273,56 @@ namespace Handbrake
             this.hbproc.StartInfo.UserName = "";

             this.hbproc.SynchronizingObject = this;

             // 

+            // ctl_deinterlace

+            // 

+            this.ctl_deinterlace.AutoSize = true;

+            this.ctl_deinterlace.Location = new System.Drawing.Point(19, 95);

+            this.ctl_deinterlace.Margin = new System.Windows.Forms.Padding(0);

+            this.ctl_deinterlace.MaximumSize = new System.Drawing.Size(400, 30);

+            this.ctl_deinterlace.Name = "ctl_deinterlace";

+            this.ctl_deinterlace.Size = new System.Drawing.Size(275, 28);

+            this.ctl_deinterlace.TabIndex = 41;

+            this.ctl_deinterlace.onChange += new System.EventHandler(this.ctl_deinterlace_changed);

+            // 

+            // ctl_denoise

+            // 

+            this.ctl_denoise.AutoSize = true;

+            this.ctl_denoise.Location = new System.Drawing.Point(19, 123);

+            this.ctl_denoise.Margin = new System.Windows.Forms.Padding(0);

+            this.ctl_denoise.MaximumSize = new System.Drawing.Size(400, 30);

+            this.ctl_denoise.Name = "ctl_denoise";

+            this.ctl_denoise.Size = new System.Drawing.Size(275, 28);

+            this.ctl_denoise.TabIndex = 40;

+            // 

+            // ctl_decomb

+            // 

+            this.ctl_decomb.AutoSize = true;

+            this.ctl_decomb.Location = new System.Drawing.Point(19, 66);

+            this.ctl_decomb.Margin = new System.Windows.Forms.Padding(0);

+            this.ctl_decomb.MaximumSize = new System.Drawing.Size(400, 30);

+            this.ctl_decomb.Name = "ctl_decomb";

+            this.ctl_decomb.Size = new System.Drawing.Size(275, 28);

+            this.ctl_decomb.TabIndex = 39;

+            this.ctl_decomb.onChange += new System.EventHandler(this.ctl_decomb_changed);

+            // 

+            // ctl_detelecine

+            // 

+            this.ctl_detelecine.AutoSize = true;

+            this.ctl_detelecine.Location = new System.Drawing.Point(19, 38);

+            this.ctl_detelecine.Margin = new System.Windows.Forms.Padding(0);

+            this.ctl_detelecine.MaximumSize = new System.Drawing.Size(400, 30);

+            this.ctl_detelecine.Name = "ctl_detelecine";

+            this.ctl_detelecine.Size = new System.Drawing.Size(275, 28);

+            this.ctl_detelecine.TabIndex = 38;

+            // 

+            // x264Panel

+            // 

+            this.x264Panel.Location = new System.Drawing.Point(0, 0);

+            this.x264Panel.Name = "x264Panel";

+            this.x264Panel.Size = new System.Drawing.Size(720, 306);

+            this.x264Panel.TabIndex = 0;

+            this.x264Panel.x264Query = "";

+            // 

             // frmMain

             // 

             this.AllowDrop = true;

@@ -2574,7 +2574,7 @@ namespace Handbrake
         internal TextBox text_source;

         private System.Diagnostics.Process hbproc;

         internal ComboBox drop_angle;

-        internal Label label4;

+        internal Label lbl_angle;

 

  

     }