OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 31 Jul 2007 19:57:17 +0000 (19:57 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 31 Jul 2007 19:57:17 +0000 (19:57 +0000)
- New deinterlace options done.
- Place holders for deblock denoise and detelecine ready.
- Picture Settings and Video Settings tabs re-arranged slightly.

git-svn-id: svn://localhost/HandBrake/trunk@771 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/frmMain.Designer.cs
win/C#/frmMain.cs

index fc0c3f5..14139d6 100644 (file)
@@ -40,7 +40,6 @@ namespace Handbrake
             this.RadioISO = new System.Windows.Forms.RadioButton();\r
             this.text_source = new System.Windows.Forms.TextBox();\r
             this.text_destination = new System.Windows.Forms.TextBox();\r
-            this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
             this.btn_Browse = new System.Windows.Forms.Button();\r
             this.text_height = new System.Windows.Forms.TextBox();\r
             this.text_width = new System.Windows.Forms.TextBox();\r
@@ -48,6 +47,11 @@ namespace Handbrake
             this.drp_videoEncoder = new System.Windows.Forms.ComboBox();\r
             this.drp_audioCodec = new System.Windows.Forms.ComboBox();\r
             this.CheckCRF = new System.Windows.Forms.CheckBox();\r
+            this.drp_deBlock = new System.Windows.Forms.ComboBox();\r
+            this.drp_DeNoise = new System.Windows.Forms.ComboBox();\r
+            this.drp_deTelecine = new System.Windows.Forms.ComboBox();\r
+            this.drp_subtitle = new System.Windows.Forms.ComboBox();\r
+            this.drp_deInterlace_option = new System.Windows.Forms.ComboBox();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -97,8 +101,63 @@ namespace Handbrake
             this.Label3 = new System.Windows.Forms.Label();\r
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label12 = new System.Windows.Forms.Label();\r
-            this.advancedOptions = new System.Windows.Forms.TabControl();\r
+            this.lbl_update = new System.Windows.Forms.Label();\r
+            this.btn_queue = new System.Windows.Forms.Button();\r
+            this.btn_encode = new System.Windows.Forms.Button();\r
+            this.Version = new System.Windows.Forms.Label();\r
+            this.lbl_encode = new System.Windows.Forms.Label();\r
+            this.btn_eCancel = new System.Windows.Forms.Button();\r
+            this.TabPage6 = new System.Windows.Forms.TabPage();\r
+            this.Label7 = new System.Windows.Forms.Label();\r
+            this.Label39 = new System.Windows.Forms.Label();\r
+            this.btn_ClearQuery = new System.Windows.Forms.Button();\r
+            this.GenerateQuery = new System.Windows.Forms.Button();\r
+            this.QueryEditorText = new System.Windows.Forms.RichTextBox();\r
+            this.h264Tab = new System.Windows.Forms.TabPage();\r
+            this.Label43 = new System.Windows.Forms.Label();\r
+            this.label_h264 = new System.Windows.Forms.LinkLabel();\r
+            this.Label95 = new System.Windows.Forms.Label();\r
+            this.btn_h264Clear = new System.Windows.Forms.Button();\r
+            this.Label90 = new System.Windows.Forms.Label();\r
+            this.rtf_h264advanced = new System.Windows.Forms.RichTextBox();\r
+            this.Label92 = new System.Windows.Forms.Label();\r
+            this.TabPage2 = new System.Windows.Forms.TabPage();\r
+            this.Label29 = new System.Windows.Forms.Label();\r
+            this.drp_audioMixDown = new System.Windows.Forms.ComboBox();\r
+            this.drp_audioChannels = new System.Windows.Forms.ComboBox();\r
+            this.drp_audioBitrate = new System.Windows.Forms.ComboBox();\r
+            this.Label14 = new System.Windows.Forms.Label();\r
+            this.Label5 = new System.Windows.Forms.Label();\r
+            this.Label35 = new System.Windows.Forms.Label();\r
+            this.Label16 = new System.Windows.Forms.Label();\r
+            this.Label32 = new System.Windows.Forms.Label();\r
+            this.Label18 = new System.Windows.Forms.Label();\r
+            this.drp_audioSampleRate = new System.Windows.Forms.ComboBox();\r
+            this.TabPage3 = new System.Windows.Forms.TabPage();\r
+            this.check_deTelecine = new System.Windows.Forms.CheckBox();\r
+            this.check_deNoise = new System.Windows.Forms.CheckBox();\r
+            this.check_deBlock = new System.Windows.Forms.CheckBox();\r
+            this.Label37 = new System.Windows.Forms.Label();\r
+            this.check_largeFile = new System.Windows.Forms.CheckBox();\r
+            this.check_turbo = new System.Windows.Forms.CheckBox();\r
+            this.Label23 = new System.Windows.Forms.Label();\r
+            this.Label22 = new System.Windows.Forms.Label();\r
+            this.Label2 = new System.Windows.Forms.Label();\r
+            this.SliderValue = new System.Windows.Forms.Label();\r
+            this.drp_videoFramerate = new System.Windows.Forms.ComboBox();\r
+            this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
+            this.slider_videoQuality = new System.Windows.Forms.TrackBar();\r
+            this.text_filesize = new System.Windows.Forms.TextBox();\r
+            this.Label46 = new System.Windows.Forms.Label();\r
+            this.Label40 = new System.Windows.Forms.Label();\r
+            this.text_bitrate = new System.Windows.Forms.TextBox();\r
+            this.Label42 = new System.Windows.Forms.Label();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
+            this.check_DeInterlace = new System.Windows.Forms.CheckBox();\r
+            this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
+            this.CheckPixelRatio = new System.Windows.Forms.CheckBox();\r
+            this.check_grayscale = new System.Windows.Forms.CheckBox();\r
+            this.label6 = new System.Windows.Forms.Label();\r
             this.Label19 = new System.Windows.Forms.Label();\r
             this.lbl_RecomendedCrop = new System.Windows.Forms.Label();\r
             this.Label8 = new System.Windows.Forms.Label();\r
@@ -115,70 +174,18 @@ namespace Handbrake
             this.drp_crop = new System.Windows.Forms.ComboBox();\r
             this.text_right = new System.Windows.Forms.TextBox();\r
             this.text_left = new System.Windows.Forms.TextBox();\r
-            this.TabPage3 = new System.Windows.Forms.TabPage();\r
-            this.Label37 = new System.Windows.Forms.Label();\r
-            this.check_largeFile = new System.Windows.Forms.CheckBox();\r
-            this.check_turbo = new System.Windows.Forms.CheckBox();\r
-            this.Label36 = new System.Windows.Forms.Label();\r
-            this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
-            this.CheckPixelRatio = new System.Windows.Forms.CheckBox();\r
-            this.Label23 = new System.Windows.Forms.Label();\r
-            this.Label22 = new System.Windows.Forms.Label();\r
-            this.Label2 = new System.Windows.Forms.Label();\r
-            this.check_grayscale = new System.Windows.Forms.CheckBox();\r
-            this.SliderValue = new System.Windows.Forms.Label();\r
-            this.check_DeInterlace = new System.Windows.Forms.CheckBox();\r
-            this.drp_videoFramerate = new System.Windows.Forms.ComboBox();\r
-            this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
-            this.slider_videoQuality = new System.Windows.Forms.TrackBar();\r
-            this.text_filesize = new System.Windows.Forms.TextBox();\r
-            this.Label46 = new System.Windows.Forms.Label();\r
-            this.Label40 = new System.Windows.Forms.Label();\r
-            this.text_bitrate = new System.Windows.Forms.TextBox();\r
-            this.Label42 = new System.Windows.Forms.Label();\r
-            this.TabPage2 = new System.Windows.Forms.TabPage();\r
-            this.Label29 = new System.Windows.Forms.Label();\r
-            this.drp_audioMixDown = new System.Windows.Forms.ComboBox();\r
-            this.drp_audioChannels = new System.Windows.Forms.ComboBox();\r
-            this.drp_audioBitrate = new System.Windows.Forms.ComboBox();\r
-            this.Label14 = new System.Windows.Forms.Label();\r
-            this.Label5 = new System.Windows.Forms.Label();\r
-            this.Label35 = new System.Windows.Forms.Label();\r
-            this.Label16 = new System.Windows.Forms.Label();\r
-            this.Label32 = new System.Windows.Forms.Label();\r
-            this.Label18 = new System.Windows.Forms.Label();\r
-            this.drp_audioSampleRate = new System.Windows.Forms.ComboBox();\r
-            this.h264Tab = new System.Windows.Forms.TabPage();\r
-            this.Label43 = new System.Windows.Forms.Label();\r
-            this.label_h264 = new System.Windows.Forms.LinkLabel();\r
-            this.Label95 = new System.Windows.Forms.Label();\r
-            this.btn_h264Clear = new System.Windows.Forms.Button();\r
-            this.Label90 = new System.Windows.Forms.Label();\r
-            this.rtf_h264advanced = new System.Windows.Forms.RichTextBox();\r
-            this.Label92 = new System.Windows.Forms.Label();\r
-            this.TabPage6 = new System.Windows.Forms.TabPage();\r
-            this.Label7 = new System.Windows.Forms.Label();\r
-            this.Label39 = new System.Windows.Forms.Label();\r
-            this.btn_ClearQuery = new System.Windows.Forms.Button();\r
-            this.GenerateQuery = new System.Windows.Forms.Button();\r
-            this.QueryEditorText = new System.Windows.Forms.RichTextBox();\r
-            this.lbl_update = new System.Windows.Forms.Label();\r
-            this.btn_queue = new System.Windows.Forms.Button();\r
-            this.btn_encode = new System.Windows.Forms.Button();\r
-            this.Version = new System.Windows.Forms.Label();\r
-            this.lbl_encode = new System.Windows.Forms.Label();\r
-            this.btn_eCancel = new System.Windows.Forms.Button();\r
+            this.advancedOptions = new System.Windows.Forms.TabControl();\r
             Label38 = new System.Windows.Forms.Label();\r
             this.frmMainMenu.SuspendLayout();\r
             this.GroupBox1.SuspendLayout();\r
             this.GroupBox4.SuspendLayout();\r
-            this.advancedOptions.SuspendLayout();\r
-            this.TabPage1.SuspendLayout();\r
+            this.TabPage6.SuspendLayout();\r
+            this.h264Tab.SuspendLayout();\r
+            this.TabPage2.SuspendLayout();\r
             this.TabPage3.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
-            this.TabPage2.SuspendLayout();\r
-            this.h264Tab.SuspendLayout();\r
-            this.TabPage6.SuspendLayout();\r
+            this.TabPage1.SuspendLayout();\r
+            this.advancedOptions.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // Label38\r
@@ -278,18 +285,6 @@ namespace Handbrake
             this.text_destination.TabIndex = 4;\r
             this.ToolTip.SetToolTip(this.text_destination, "Location where the enoceded file will be saved.");\r
             // \r
-            // drp_subtitle\r
-            // \r
-            this.drp_subtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_subtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_subtitle.FormattingEnabled = true;\r
-            this.drp_subtitle.Location = new System.Drawing.Point(381, 36);\r
-            this.drp_subtitle.Name = "drp_subtitle";\r
-            this.drp_subtitle.Size = new System.Drawing.Size(213, 21);\r
-            this.drp_subtitle.TabIndex = 42;\r
-            this.drp_subtitle.Text = "None";\r
-            this.ToolTip.SetToolTip(this.drp_subtitle, "Select the subtitle language you require from this dropdown.");\r
-            // \r
             // btn_Browse\r
             // \r
             this.btn_Browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
@@ -393,6 +388,83 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.CheckCRF, "Constant Rate Factor");\r
             this.CheckCRF.UseVisualStyleBackColor = true;\r
             // \r
+            // drp_deBlock\r
+            // \r
+            this.drp_deBlock.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_deBlock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_deBlock.FormattingEnabled = true;\r
+            this.drp_deBlock.Items.AddRange(new object[] {\r
+            "Normal (-d)",\r
+            "yadif(-d=\"1\")",\r
+            "yadif+mcdeint(-d=\"1:-1:1\")"});\r
+            this.drp_deBlock.Location = new System.Drawing.Point(472, 126);\r
+            this.drp_deBlock.Name = "drp_deBlock";\r
+            this.drp_deBlock.Size = new System.Drawing.Size(147, 21);\r
+            this.drp_deBlock.TabIndex = 61;\r
+            this.drp_deBlock.Text = "None";\r
+            this.ToolTip.SetToolTip(this.drp_deBlock, "Select the subtitle language you require from this dropdown.");\r
+            // \r
+            // drp_DeNoise\r
+            // \r
+            this.drp_DeNoise.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_DeNoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_DeNoise.FormattingEnabled = true;\r
+            this.drp_DeNoise.Items.AddRange(new object[] {\r
+            "Normal (-d)",\r
+            "yadif(-d=\"1\")",\r
+            "yadif+mcdeint(-d=\"1:-1:1\")"});\r
+            this.drp_DeNoise.Location = new System.Drawing.Point(472, 153);\r
+            this.drp_DeNoise.Name = "drp_DeNoise";\r
+            this.drp_DeNoise.Size = new System.Drawing.Size(147, 21);\r
+            this.drp_DeNoise.TabIndex = 64;\r
+            this.drp_DeNoise.Text = "None";\r
+            this.ToolTip.SetToolTip(this.drp_DeNoise, "Select the subtitle language you require from this dropdown.");\r
+            // \r
+            // drp_deTelecine\r
+            // \r
+            this.drp_deTelecine.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_deTelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_deTelecine.FormattingEnabled = true;\r
+            this.drp_deTelecine.Items.AddRange(new object[] {\r
+            "Normal (-d)",\r
+            "yadif(-d=\"1\")",\r
+            "yadif+mcdeint(-d=\"1:-1:1\")"});\r
+            this.drp_deTelecine.Location = new System.Drawing.Point(472, 180);\r
+            this.drp_deTelecine.Name = "drp_deTelecine";\r
+            this.drp_deTelecine.Size = new System.Drawing.Size(147, 21);\r
+            this.drp_deTelecine.TabIndex = 65;\r
+            this.drp_deTelecine.Text = "None";\r
+            this.ToolTip.SetToolTip(this.drp_deTelecine, "Select the subtitle language you require from this dropdown.");\r
+            // \r
+            // drp_subtitle\r
+            // \r
+            this.drp_subtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_subtitle.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_subtitle.FormattingEnabled = true;\r
+            this.drp_subtitle.Location = new System.Drawing.Point(381, 36);\r
+            this.drp_subtitle.Name = "drp_subtitle";\r
+            this.drp_subtitle.Size = new System.Drawing.Size(213, 21);\r
+            this.drp_subtitle.TabIndex = 42;\r
+            this.drp_subtitle.Text = "None";\r
+            this.ToolTip.SetToolTip(this.drp_subtitle, "Select the subtitle language you require from this dropdown.");\r
+            // \r
+            // drp_deInterlace_option\r
+            // \r
+            this.drp_deInterlace_option.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_deInterlace_option.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_deInterlace_option.FormattingEnabled = true;\r
+            this.drp_deInterlace_option.Items.AddRange(new object[] {\r
+            "Default",\r
+            "yadif",\r
+            "yadif + mcdeint",\r
+            "yadif + mcdeint (Slow)"});\r
+            this.drp_deInterlace_option.Location = new System.Drawing.Point(447, 194);\r
+            this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
+            this.drp_deInterlace_option.Size = new System.Drawing.Size(147, 21);\r
+            this.drp_deInterlace_option.TabIndex = 55;\r
+            this.drp_deInterlace_option.Text = "Default";\r
+            this.ToolTip.SetToolTip(this.drp_deInterlace_option, "Select the subtitle language you require from this dropdown.");\r
+            // \r
             // File_Open\r
             // \r
             this.File_Open.DefaultExt = "hb";\r
@@ -840,229 +912,428 @@ namespace Handbrake
             this.Label12.TabIndex = 20;\r
             this.Label12.Text = "Audio Encoder:";\r
             // \r
-            // advancedOptions\r
-            // \r
-            this.advancedOptions.Controls.Add(this.TabPage1);\r
-            this.advancedOptions.Controls.Add(this.TabPage3);\r
-            this.advancedOptions.Controls.Add(this.TabPage2);\r
-            this.advancedOptions.Controls.Add(this.h264Tab);\r
-            this.advancedOptions.Controls.Add(this.TabPage6);\r
-            this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.advancedOptions.Location = new System.Drawing.Point(15, 295);\r
-            this.advancedOptions.Name = "advancedOptions";\r
-            this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(647, 268);\r
-            this.advancedOptions.TabIndex = 411;\r
-            this.advancedOptions.TabStop = false;\r
-            // \r
-            // TabPage1\r
+            // lbl_update\r
             // \r
-            this.TabPage1.BackColor = System.Drawing.SystemColors.Control;\r
-            this.TabPage1.Controls.Add(this.drp_subtitle);\r
-            this.TabPage1.Controls.Add(this.Label19);\r
-            this.TabPage1.Controls.Add(this.lbl_RecomendedCrop);\r
-            this.TabPage1.Controls.Add(this.Label8);\r
-            this.TabPage1.Controls.Add(this.Label1);\r
-            this.TabPage1.Controls.Add(this.Label53);\r
-            this.TabPage1.Controls.Add(this.Label21);\r
-            this.TabPage1.Controls.Add(this.Label20);\r
-            this.TabPage1.Controls.Add(this.Label52);\r
-            this.TabPage1.Controls.Add(this.Label51);\r
-            this.TabPage1.Controls.Add(this.Label50);\r
-            this.TabPage1.Controls.Add(this.Label15);\r
-            this.TabPage1.Controls.Add(this.text_top);\r
-            this.TabPage1.Controls.Add(this.text_bottom);\r
-            this.TabPage1.Controls.Add(this.drp_crop);\r
-            this.TabPage1.Controls.Add(this.text_right);\r
-            this.TabPage1.Controls.Add(this.text_left);\r
-            this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
-            this.TabPage1.Name = "TabPage1";\r
-            this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage1.Size = new System.Drawing.Size(639, 242);\r
-            this.TabPage1.TabIndex = 0;\r
-            this.TabPage1.Text = "Picture Settings";\r
+            this.lbl_update.AutoSize = true;\r
+            this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_update.ForeColor = System.Drawing.Color.Black;\r
+            this.lbl_update.Location = new System.Drawing.Point(83, 594);\r
+            this.lbl_update.Name = "lbl_update";\r
+            this.lbl_update.Size = new System.Drawing.Size(193, 13);\r
+            this.lbl_update.TabIndex = 417;\r
+            this.lbl_update.Text = "- A New Version is available!";\r
+            this.lbl_update.Visible = false;\r
             // \r
-            // Label19\r
+            // btn_queue\r
             // \r
-            this.Label19.AutoSize = true;\r
-            this.Label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label19.Location = new System.Drawing.Point(311, 13);\r
-            this.Label19.Name = "Label19";\r
-            this.Label19.Size = new System.Drawing.Size(64, 13);\r
-            this.Label19.TabIndex = 39;\r
-            this.Label19.Text = "Subtitles";\r
+            this.btn_queue.BackColor = System.Drawing.SystemColors.Control;\r
+            this.btn_queue.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_queue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_queue.Location = new System.Drawing.Point(415, 589);\r
+            this.btn_queue.Name = "btn_queue";\r
+            this.btn_queue.Size = new System.Drawing.Size(115, 22);\r
+            this.btn_queue.TabIndex = 416;\r
+            this.btn_queue.TabStop = false;\r
+            this.btn_queue.Text = "Add to Queue";\r
+            this.btn_queue.UseVisualStyleBackColor = false;\r
+            this.btn_queue.Click += new System.EventHandler(this.btn_queue_Click);\r
             // \r
-            // lbl_RecomendedCrop\r
+            // btn_encode\r
             // \r
-            this.lbl_RecomendedCrop.AutoSize = true;\r
-            this.lbl_RecomendedCrop.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_RecomendedCrop.Location = new System.Drawing.Point(119, 72);\r
-            this.lbl_RecomendedCrop.Name = "lbl_RecomendedCrop";\r
-            this.lbl_RecomendedCrop.Size = new System.Drawing.Size(72, 12);\r
-            this.lbl_RecomendedCrop.TabIndex = 38;\r
-            this.lbl_RecomendedCrop.Text = "Select a Title";\r
+            this.btn_encode.BackColor = System.Drawing.SystemColors.Control;\r
+            this.btn_encode.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_encode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_encode.Location = new System.Drawing.Point(536, 589);\r
+            this.btn_encode.Name = "btn_encode";\r
+            this.btn_encode.Size = new System.Drawing.Size(124, 22);\r
+            this.btn_encode.TabIndex = 414;\r
+            this.btn_encode.TabStop = false;\r
+            this.btn_encode.Text = "Encode Video";\r
+            this.btn_encode.UseVisualStyleBackColor = false;\r
+            this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);\r
             // \r
-            // Label8\r
+            // Version\r
             // \r
-            this.Label8.AutoSize = true;\r
-            this.Label8.Location = new System.Drawing.Point(13, 71);\r
-            this.Label8.Name = "Label8";\r
-            this.Label8.Size = new System.Drawing.Size(70, 13);\r
-            this.Label8.TabIndex = 37;\r
-            this.Label8.Text = "Auto Crop:";\r
+            this.Version.BackColor = System.Drawing.Color.Transparent;\r
+            this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Version.Location = new System.Drawing.Point(12, 594);\r
+            this.Version.Name = "Version";\r
+            this.Version.Size = new System.Drawing.Size(79, 20);\r
+            this.Version.TabIndex = 415;\r
+            this.Version.Text = "Version 2.3";\r
             // \r
-            // Label1\r
+            // lbl_encode\r
             // \r
-            this.Label1.AutoSize = true;\r
-            this.Label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label1.Location = new System.Drawing.Point(13, 13);\r
-            this.Label1.Name = "Label1";\r
-            this.Label1.Size = new System.Drawing.Size(65, 13);\r
-            this.Label1.TabIndex = 36;\r
-            this.Label1.Text = "Cropping";\r
+            this.lbl_encode.AutoSize = true;\r
+            this.lbl_encode.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_encode.Location = new System.Drawing.Point(12, 571);\r
+            this.lbl_encode.Name = "lbl_encode";\r
+            this.lbl_encode.Size = new System.Drawing.Size(96, 13);\r
+            this.lbl_encode.TabIndex = 418;\r
+            this.lbl_encode.Text = "Encoding started...";\r
+            this.lbl_encode.Visible = false;\r
             // \r
-            // Label53\r
+            // btn_eCancel\r
             // \r
-            this.Label53.AutoSize = true;\r
-            this.Label53.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label53.Location = new System.Drawing.Point(134, 196);\r
-            this.Label53.Name = "Label53";\r
-            this.Label53.Size = new System.Drawing.Size(48, 13);\r
-            this.Label53.TabIndex = 32;\r
-            this.Label53.Text = "Bottom";\r
+            this.btn_eCancel.BackColor = System.Drawing.SystemColors.Control;\r
+            this.btn_eCancel.Enabled = false;\r
+            this.btn_eCancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_eCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_eCancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_eCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_eCancel.Location = new System.Drawing.Point(344, 589);\r
+            this.btn_eCancel.Name = "btn_eCancel";\r
+            this.btn_eCancel.Size = new System.Drawing.Size(65, 22);\r
+            this.btn_eCancel.TabIndex = 419;\r
+            this.btn_eCancel.TabStop = false;\r
+            this.btn_eCancel.Text = "Cancel";\r
+            this.btn_eCancel.UseVisualStyleBackColor = false;\r
+            this.btn_eCancel.Visible = false;\r
+            this.btn_eCancel.Click += new System.EventHandler(this.btn_eCancel_Click);\r
             // \r
-            // Label21\r
+            // TabPage6\r
             // \r
-            this.Label21.AutoSize = true;\r
-            this.Label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label21.Location = new System.Drawing.Point(378, 63);\r
-            this.Label21.Name = "Label21";\r
-            this.Label21.Size = new System.Drawing.Size(224, 26);\r
-            this.Label21.TabIndex = 34;\r
-            this.Label21.Text = "Please note that subtitles will be hard \r\ncoded into the video.\r\n";\r
+            this.TabPage6.BackColor = System.Drawing.SystemColors.Control;\r
+            this.TabPage6.Controls.Add(this.Label7);\r
+            this.TabPage6.Controls.Add(this.Label39);\r
+            this.TabPage6.Controls.Add(this.btn_ClearQuery);\r
+            this.TabPage6.Controls.Add(this.GenerateQuery);\r
+            this.TabPage6.Controls.Add(this.QueryEditorText);\r
+            this.TabPage6.Location = new System.Drawing.Point(4, 22);\r
+            this.TabPage6.Name = "TabPage6";\r
+            this.TabPage6.Padding = new System.Windows.Forms.Padding(3);\r
+            this.TabPage6.Size = new System.Drawing.Size(639, 242);\r
+            this.TabPage6.TabIndex = 6;\r
+            this.TabPage6.Text = "Query Editor";\r
+            this.TabPage6.UseVisualStyleBackColor = true;\r
             // \r
-            // Label20\r
+            // Label7\r
             // \r
-            this.Label20.AutoSize = true;\r
-            this.Label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label20.Location = new System.Drawing.Point(314, 39);\r
-            this.Label20.Name = "Label20";\r
-            this.Label20.Size = new System.Drawing.Size(61, 13);\r
-            this.Label20.TabIndex = 33;\r
-            this.Label20.Text = "Subtitles:";\r
+            this.Label7.AutoSize = true;\r
+            this.Label7.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label7.Location = new System.Drawing.Point(13, 13);\r
+            this.Label7.Name = "Label7";\r
+            this.Label7.Size = new System.Drawing.Size(89, 13);\r
+            this.Label7.TabIndex = 42;\r
+            this.Label7.Text = "Query Editor";\r
             // \r
-            // Label52\r
+            // Label39\r
             // \r
-            this.Label52.AutoSize = true;\r
-            this.Label52.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label52.Location = new System.Drawing.Point(138, 105);\r
-            this.Label52.Name = "Label52";\r
-            this.Label52.Size = new System.Drawing.Size(28, 13);\r
-            this.Label52.TabIndex = 31;\r
-            this.Label52.Text = "Top";\r
+            this.Label39.AutoSize = true;\r
+            this.Label39.Location = new System.Drawing.Point(13, 34);\r
+            this.Label39.Name = "Label39";\r
+            this.Label39.Size = new System.Drawing.Size(403, 39);\r
+            this.Label39.TabIndex = 40;\r
+            this.Label39.Text = "Here you can alter the query generated by the program.\r\nClick the \"Generate Query" +\r
+                " Now\" button to continue.\r\nRemember to re-generate the query each time you chang" +\r
+                "e a setting!";\r
             // \r
-            // Label51\r
+            // btn_ClearQuery\r
             // \r
-            this.Label51.AutoSize = true;\r
-            this.Label51.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label51.Location = new System.Drawing.Point(243, 148);\r
-            this.Label51.Name = "Label51";\r
-            this.Label51.Size = new System.Drawing.Size(36, 13);\r
-            this.Label51.TabIndex = 30;\r
-            this.Label51.Text = "Right";\r
+            this.btn_ClearQuery.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_ClearQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_ClearQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_ClearQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_ClearQuery.Location = new System.Drawing.Point(542, 84);\r
+            this.btn_ClearQuery.Name = "btn_ClearQuery";\r
+            this.btn_ClearQuery.Size = new System.Drawing.Size(79, 23);\r
+            this.btn_ClearQuery.TabIndex = 39;\r
+            this.btn_ClearQuery.Text = "Clear";\r
+            this.btn_ClearQuery.UseVisualStyleBackColor = true;\r
+            this.btn_ClearQuery.Click += new System.EventHandler(this.btn_ClearQuery_Click);\r
             // \r
-            // Label50\r
+            // GenerateQuery\r
             // \r
-            this.Label50.AutoSize = true;\r
-            this.Label50.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label50.Location = new System.Drawing.Point(13, 41);\r
-            this.Label50.Name = "Label50";\r
-            this.Label50.Size = new System.Drawing.Size(88, 13);\r
-            this.Label50.TabIndex = 17;\r
-            this.Label50.Text = "Select Option:";\r
+            this.GenerateQuery.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.GenerateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.GenerateQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.GenerateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.GenerateQuery.Location = new System.Drawing.Point(16, 84);\r
+            this.GenerateQuery.Name = "GenerateQuery";\r
+            this.GenerateQuery.Size = new System.Drawing.Size(176, 23);\r
+            this.GenerateQuery.TabIndex = 38;\r
+            this.GenerateQuery.Text = "Generate Query Now";\r
+            this.GenerateQuery.UseVisualStyleBackColor = true;\r
+            this.GenerateQuery.Click += new System.EventHandler(this.GenerateQuery_Click);\r
             // \r
-            // Label15\r
+            // QueryEditorText\r
             // \r
-            this.Label15.AutoSize = true;\r
-            this.Label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label15.Location = new System.Drawing.Point(39, 148);\r
-            this.Label15.Name = "Label15";\r
-            this.Label15.Size = new System.Drawing.Size(28, 13);\r
-            this.Label15.TabIndex = 29;\r
-            this.Label15.Text = "Left";\r
+            this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.QueryEditorText.Location = new System.Drawing.Point(16, 114);\r
+            this.QueryEditorText.Name = "QueryEditorText";\r
+            this.QueryEditorText.Size = new System.Drawing.Size(605, 104);\r
+            this.QueryEditorText.TabIndex = 41;\r
+            this.QueryEditorText.Text = "";\r
             // \r
-            // text_top\r
+            // h264Tab\r
             // \r
-            this.text_top.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.text_top.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_top.Location = new System.Drawing.Point(131, 120);\r
-            this.text_top.Name = "text_top";\r
-            this.text_top.Size = new System.Drawing.Size(51, 21);\r
-            this.text_top.TabIndex = 10;\r
-            this.text_top.Text = "0";\r
+            this.h264Tab.BackColor = System.Drawing.SystemColors.Control;\r
+            this.h264Tab.Controls.Add(this.Label43);\r
+            this.h264Tab.Controls.Add(this.label_h264);\r
+            this.h264Tab.Controls.Add(this.Label95);\r
+            this.h264Tab.Controls.Add(this.btn_h264Clear);\r
+            this.h264Tab.Controls.Add(this.Label90);\r
+            this.h264Tab.Controls.Add(this.rtf_h264advanced);\r
+            this.h264Tab.Controls.Add(this.Label92);\r
+            this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
+            this.h264Tab.Name = "h264Tab";\r
+            this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
+            this.h264Tab.Size = new System.Drawing.Size(639, 242);\r
+            this.h264Tab.TabIndex = 5;\r
+            this.h264Tab.Text = "H.264";\r
+            this.h264Tab.UseVisualStyleBackColor = true;\r
             // \r
-            // text_bottom\r
+            // Label43\r
             // \r
-            this.text_bottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.text_bottom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_bottom.Location = new System.Drawing.Point(131, 172);\r
-            this.text_bottom.Name = "text_bottom";\r
-            this.text_bottom.Size = new System.Drawing.Size(51, 21);\r
-            this.text_bottom.TabIndex = 12;\r
-            this.text_bottom.Text = "0";\r
+            this.Label43.AutoSize = true;\r
+            this.Label43.Location = new System.Drawing.Point(78, 206);\r
+            this.Label43.Name = "Label43";\r
+            this.Label43.Size = new System.Drawing.Size(158, 13);\r
+            this.Label43.TabIndex = 48;\r
+            this.Label43.Text = "for help using this feature.";\r
             // \r
-            // drp_crop\r
+            // label_h264\r
             // \r
-            this.drp_crop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_crop.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_crop.FormattingEnabled = true;\r
-            this.drp_crop.Items.AddRange(new object[] {\r
-            "Auto Crop",\r
-            "No Crop",\r
-            "Manual"});\r
-            this.drp_crop.Location = new System.Drawing.Point(121, 36);\r
-            this.drp_crop.Name = "drp_crop";\r
-            this.drp_crop.Size = new System.Drawing.Size(123, 21);\r
-            this.drp_crop.TabIndex = 9;\r
-            this.drp_crop.Text = "No Crop";\r
-            this.drp_crop.SelectedIndexChanged += new System.EventHandler(this.drp_crop_SelectedIndexChanged);\r
+            this.label_h264.AutoSize = true;\r
+            this.label_h264.Location = new System.Drawing.Point(13, 206);\r
+            this.label_h264.Name = "label_h264";\r
+            this.label_h264.Size = new System.Drawing.Size(66, 13);\r
+            this.label_h264.TabIndex = 47;\r
+            this.label_h264.TabStop = true;\r
+            this.label_h264.Text = "Click Here";\r
+            this.label_h264.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.label_h264_LinkClicked);\r
+            // \r
+            // Label95\r
+            // \r
+            this.Label95.AutoSize = true;\r
+            this.Label95.Location = new System.Drawing.Point(13, 187);\r
+            this.Label95.Name = "Label95";\r
+            this.Label95.Size = new System.Drawing.Size(387, 13);\r
+            this.Label95.TabIndex = 46;\r
+            this.Label95.Text = "Note: Incorrect usage of this feature will cause the encoder to fail!";\r
+            // \r
+            // btn_h264Clear\r
+            // \r
+            this.btn_h264Clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.btn_h264Clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btn_h264Clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.btn_h264Clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.btn_h264Clear.Location = new System.Drawing.Point(542, 50);\r
+            this.btn_h264Clear.Name = "btn_h264Clear";\r
+            this.btn_h264Clear.Size = new System.Drawing.Size(79, 23);\r
+            this.btn_h264Clear.TabIndex = 45;\r
+            this.btn_h264Clear.Text = "Clear";\r
+            this.btn_h264Clear.UseVisualStyleBackColor = true;\r
+            this.btn_h264Clear.Click += new System.EventHandler(this.btn_h264Clear_Click);\r
+            // \r
+            // Label90\r
+            // \r
+            this.Label90.AutoSize = true;\r
+            this.Label90.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label90.Location = new System.Drawing.Point(13, 13);\r
+            this.Label90.Name = "Label90";\r
+            this.Label90.Size = new System.Drawing.Size(165, 13);\r
+            this.Label90.TabIndex = 42;\r
+            this.Label90.Text = "Advanced H.264 Options";\r
+            // \r
+            // rtf_h264advanced\r
+            // \r
+            this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79);\r
+            this.rtf_h264advanced.Name = "rtf_h264advanced";\r
+            this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96);\r
+            this.rtf_h264advanced.TabIndex = 41;\r
+            this.rtf_h264advanced.Text = "";\r
+            // \r
+            // Label92\r
+            // \r
+            this.Label92.AutoSize = true;\r
+            this.Label92.Location = new System.Drawing.Point(13, 41);\r
+            this.Label92.Name = "Label92";\r
+            this.Label92.Size = new System.Drawing.Size(370, 26);\r
+            this.Label92.TabIndex = 40;\r
+            this.Label92.Text = "Specify advanced x264 options in the same style as mencoder:\r\noption1=value1:opti" +\r
+                "on2=value2";\r
+            // \r
+            // TabPage2\r
+            // \r
+            this.TabPage2.BackColor = System.Drawing.SystemColors.Control;\r
+            this.TabPage2.Controls.Add(this.Label29);\r
+            this.TabPage2.Controls.Add(this.drp_audioMixDown);\r
+            this.TabPage2.Controls.Add(this.drp_audioChannels);\r
+            this.TabPage2.Controls.Add(this.drp_audioBitrate);\r
+            this.TabPage2.Controls.Add(this.Label14);\r
+            this.TabPage2.Controls.Add(this.Label5);\r
+            this.TabPage2.Controls.Add(this.Label35);\r
+            this.TabPage2.Controls.Add(this.Label16);\r
+            this.TabPage2.Controls.Add(this.Label32);\r
+            this.TabPage2.Controls.Add(this.Label18);\r
+            this.TabPage2.Controls.Add(this.drp_audioSampleRate);\r
+            this.TabPage2.Location = new System.Drawing.Point(4, 22);\r
+            this.TabPage2.Name = "TabPage2";\r
+            this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
+            this.TabPage2.Size = new System.Drawing.Size(639, 242);\r
+            this.TabPage2.TabIndex = 3;\r
+            this.TabPage2.Text = "Audio Settings";\r
+            this.TabPage2.UseVisualStyleBackColor = true;\r
+            // \r
+            // Label29\r
+            // \r
+            this.Label29.AutoSize = true;\r
+            this.Label29.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label29.Location = new System.Drawing.Point(155, 151);\r
+            this.Label29.Name = "Label29";\r
+            this.Label29.Size = new System.Drawing.Size(189, 24);\r
+            this.Label29.TabIndex = 42;\r
+            this.Label29.Text = "Please note: Some options require a \r\n5.1 Audio Channel to be selected.";\r
+            // \r
+            // drp_audioMixDown\r
+            // \r
+            this.drp_audioMixDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audioMixDown.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audioMixDown.FormattingEnabled = true;\r
+            this.drp_audioMixDown.Items.AddRange(new object[] {\r
+            "Mono",\r
+            "Stereo",\r
+            "Dolby Surround",\r
+            "Dolby Pro Logic II",\r
+            "6 Channel Discrete"});\r
+            this.drp_audioMixDown.Location = new System.Drawing.Point(157, 127);\r
+            this.drp_audioMixDown.Name = "drp_audioMixDown";\r
+            this.drp_audioMixDown.Size = new System.Drawing.Size(173, 21);\r
+            this.drp_audioMixDown.TabIndex = 50;\r
+            this.drp_audioMixDown.Text = "Automatic";\r
+            this.drp_audioMixDown.SelectedIndexChanged += new System.EventHandler(this.drp_audioMixDown_SelectedIndexChanged);\r
+            // \r
+            // drp_audioChannels\r
+            // \r
+            this.drp_audioChannels.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audioChannels.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audioChannels.FormattingEnabled = true;\r
+            this.drp_audioChannels.Location = new System.Drawing.Point(157, 97);\r
+            this.drp_audioChannels.Name = "drp_audioChannels";\r
+            this.drp_audioChannels.Size = new System.Drawing.Size(173, 21);\r
+            this.drp_audioChannels.TabIndex = 49;\r
+            this.drp_audioChannels.Text = "Automatic";\r
+            // \r
+            // drp_audioBitrate\r
+            // \r
+            this.drp_audioBitrate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audioBitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audioBitrate.FormattingEnabled = true;\r
+            this.drp_audioBitrate.Items.AddRange(new object[] {\r
+            "32",\r
+            "40",\r
+            "48",\r
+            "56",\r
+            "64",\r
+            "80",\r
+            "86",\r
+            "112",\r
+            "128",\r
+            "160"});\r
+            this.drp_audioBitrate.Location = new System.Drawing.Point(157, 37);\r
+            this.drp_audioBitrate.Name = "drp_audioBitrate";\r
+            this.drp_audioBitrate.Size = new System.Drawing.Size(101, 21);\r
+            this.drp_audioBitrate.TabIndex = 40;\r
+            this.drp_audioBitrate.Text = "128";\r
+            // \r
+            // Label14\r
+            // \r
+            this.Label14.AutoSize = true;\r
+            this.Label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label14.Location = new System.Drawing.Point(13, 130);\r
+            this.Label14.Name = "Label14";\r
+            this.Label14.Size = new System.Drawing.Size(99, 13);\r
+            this.Label14.TabIndex = 39;\r
+            this.Label14.Text = "Audio MixDown:";\r
+            // \r
+            // Label5\r
+            // \r
+            this.Label5.AutoSize = true;\r
+            this.Label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label5.Location = new System.Drawing.Point(13, 13);\r
+            this.Label5.Name = "Label5";\r
+            this.Label5.Size = new System.Drawing.Size(101, 13);\r
+            this.Label5.TabIndex = 37;\r
+            this.Label5.Text = "Audio Settings";\r
+            // \r
+            // Label35\r
+            // \r
+            this.Label35.AutoSize = true;\r
+            this.Label35.Location = new System.Drawing.Point(239, 103);\r
+            this.Label35.Name = "Label35";\r
+            this.Label35.Size = new System.Drawing.Size(0, 13);\r
+            this.Label35.TabIndex = 30;\r
+            // \r
+            // Label16\r
+            // \r
+            this.Label16.AutoSize = true;\r
+            this.Label16.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label16.Location = new System.Drawing.Point(13, 40);\r
+            this.Label16.Name = "Label16";\r
+            this.Label16.Size = new System.Drawing.Size(91, 13);\r
+            this.Label16.TabIndex = 20;\r
+            this.Label16.Text = "Bitrate (kbps):";\r
+            // \r
+            // Label32\r
+            // \r
+            this.Label32.AutoSize = true;\r
+            this.Label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label32.Location = new System.Drawing.Point(13, 100);\r
+            this.Label32.Name = "Label32";\r
+            this.Label32.Size = new System.Drawing.Size(80, 13);\r
+            this.Label32.TabIndex = 29;\r
+            this.Label32.Text = "Audio Track:";\r
             // \r
-            // text_right\r
+            // Label18\r
             // \r
-            this.text_right.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.text_right.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_right.Location = new System.Drawing.Point(190, 145);\r
-            this.text_right.Name = "text_right";\r
-            this.text_right.Size = new System.Drawing.Size(51, 21);\r
-            this.text_right.TabIndex = 13;\r
-            this.text_right.Text = "0";\r
+            this.Label18.AutoSize = true;\r
+            this.Label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label18.Location = new System.Drawing.Point(13, 70);\r
+            this.Label18.Name = "Label18";\r
+            this.Label18.Size = new System.Drawing.Size(120, 13);\r
+            this.Label18.TabIndex = 23;\r
+            this.Label18.Text = "Sample Rate (kHz):";\r
             // \r
-            // text_left\r
+            // drp_audioSampleRate\r
             // \r
-            this.text_left.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.text_left.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_left.Location = new System.Drawing.Point(72, 145);\r
-            this.text_left.Name = "text_left";\r
-            this.text_left.Size = new System.Drawing.Size(51, 21);\r
-            this.text_left.TabIndex = 11;\r
-            this.text_left.Text = "0";\r
+            this.drp_audioSampleRate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_audioSampleRate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_audioSampleRate.FormattingEnabled = true;\r
+            this.drp_audioSampleRate.Items.AddRange(new object[] {\r
+            "48",\r
+            "44.1",\r
+            "32",\r
+            "24",\r
+            "22.05"});\r
+            this.drp_audioSampleRate.Location = new System.Drawing.Point(157, 67);\r
+            this.drp_audioSampleRate.Name = "drp_audioSampleRate";\r
+            this.drp_audioSampleRate.Size = new System.Drawing.Size(101, 21);\r
+            this.drp_audioSampleRate.TabIndex = 23;\r
+            this.drp_audioSampleRate.Text = "44.1";\r
             // \r
             // TabPage3\r
             // \r
             this.TabPage3.BackColor = System.Drawing.SystemColors.Control;\r
+            this.TabPage3.Controls.Add(this.drp_deTelecine);\r
+            this.TabPage3.Controls.Add(this.drp_DeNoise);\r
+            this.TabPage3.Controls.Add(this.check_deTelecine);\r
+            this.TabPage3.Controls.Add(this.check_deNoise);\r
+            this.TabPage3.Controls.Add(this.drp_deBlock);\r
+            this.TabPage3.Controls.Add(this.check_deBlock);\r
             this.TabPage3.Controls.Add(this.Label37);\r
             this.TabPage3.Controls.Add(this.check_largeFile);\r
             this.TabPage3.Controls.Add(this.check_turbo);\r
-            this.TabPage3.Controls.Add(this.Label36);\r
-            this.TabPage3.Controls.Add(this.Check_ChapterMarkers);\r
             this.TabPage3.Controls.Add(this.CheckCRF);\r
-            this.TabPage3.Controls.Add(this.CheckPixelRatio);\r
             this.TabPage3.Controls.Add(this.Label23);\r
             this.TabPage3.Controls.Add(this.Label22);\r
             this.TabPage3.Controls.Add(this.Label2);\r
-            this.TabPage3.Controls.Add(this.check_grayscale);\r
             this.TabPage3.Controls.Add(this.SliderValue);\r
-            this.TabPage3.Controls.Add(this.check_DeInterlace);\r
             this.TabPage3.Controls.Add(this.drp_videoFramerate);\r
             this.TabPage3.Controls.Add(this.check_2PassEncode);\r
             this.TabPage3.Controls.Add(this.slider_videoQuality);\r
@@ -1075,15 +1346,49 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage3.Size = new System.Drawing.Size(622, 242);\r
+            this.TabPage3.Size = new System.Drawing.Size(639, 242);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video Settings";\r
+            this.TabPage3.UseVisualStyleBackColor = true;\r
+            // \r
+            // check_deTelecine\r
+            // \r
+            this.check_deTelecine.AutoSize = true;\r
+            this.check_deTelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_deTelecine.Location = new System.Drawing.Point(368, 182);\r
+            this.check_deTelecine.Name = "check_deTelecine";\r
+            this.check_deTelecine.Size = new System.Drawing.Size(94, 17);\r
+            this.check_deTelecine.TabIndex = 63;\r
+            this.check_deTelecine.Text = "De-Telecine";\r
+            this.check_deTelecine.UseVisualStyleBackColor = true;\r
+            // \r
+            // check_deNoise\r
+            // \r
+            this.check_deNoise.AutoSize = true;\r
+            this.check_deNoise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_deNoise.Location = new System.Drawing.Point(368, 155);\r
+            this.check_deNoise.Name = "check_deNoise";\r
+            this.check_deNoise.Size = new System.Drawing.Size(78, 17);\r
+            this.check_deNoise.TabIndex = 62;\r
+            this.check_deNoise.Text = "De-Noise";\r
+            this.check_deNoise.UseVisualStyleBackColor = true;\r
+            // \r
+            // check_deBlock\r
+            // \r
+            this.check_deBlock.AutoSize = true;\r
+            this.check_deBlock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_deBlock.Location = new System.Drawing.Point(368, 128);\r
+            this.check_deBlock.Name = "check_deBlock";\r
+            this.check_deBlock.Size = new System.Drawing.Size(78, 17);\r
+            this.check_deBlock.TabIndex = 60;\r
+            this.check_deBlock.Text = "De-Block";\r
+            this.check_deBlock.UseVisualStyleBackColor = true;\r
             // \r
             // Label37\r
             // \r
             this.Label37.AutoSize = true;\r
             this.Label37.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label37.Location = new System.Drawing.Point(382, 194);\r
+            this.Label37.Location = new System.Drawing.Point(387, 104);\r
             this.Label37.Name = "Label37";\r
             this.Label37.Size = new System.Drawing.Size(241, 12);\r
             this.Label37.TabIndex = 52;\r
@@ -1093,7 +1398,7 @@ namespace Handbrake
             // \r
             this.check_largeFile.AutoSize = true;\r
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(367, 176);\r
+            this.check_largeFile.Location = new System.Drawing.Point(368, 84);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(172, 17);\r
             this.check_largeFile.TabIndex = 51;\r
@@ -1105,52 +1410,18 @@ namespace Handbrake
             // \r
             this.check_turbo.AutoSize = true;\r
             this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_turbo.Location = new System.Drawing.Point(387, 61);\r
+            this.check_turbo.Location = new System.Drawing.Point(368, 61);\r
             this.check_turbo.Name = "check_turbo";\r
             this.check_turbo.Size = new System.Drawing.Size(110, 17);\r
             this.check_turbo.TabIndex = 50;\r
             this.check_turbo.Text = "Turbo 1st Pass";\r
             this.check_turbo.UseVisualStyleBackColor = true;\r
             // \r
-            // Label36\r
-            // \r
-            this.Label36.AutoSize = true;\r
-            this.Label36.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label36.Location = new System.Drawing.Point(486, 155);\r
-            this.Label36.Name = "Label36";\r
-            this.Label36.Size = new System.Drawing.Size(109, 12);\r
-            this.Label36.TabIndex = 49;\r
-            this.Label36.Text = "(m4v container only)";\r
-            // \r
-            // Check_ChapterMarkers\r
-            // \r
-            this.Check_ChapterMarkers.AutoSize = true;\r
-            this.Check_ChapterMarkers.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Check_ChapterMarkers.Location = new System.Drawing.Point(368, 153);\r
-            this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";\r
-            this.Check_ChapterMarkers.Size = new System.Drawing.Size(122, 17);\r
-            this.Check_ChapterMarkers.TabIndex = 48;\r
-            this.Check_ChapterMarkers.Text = "Chapter Markers";\r
-            this.Check_ChapterMarkers.UseVisualStyleBackColor = true;\r
-            this.Check_ChapterMarkers.CheckedChanged += new System.EventHandler(this.Check_ChapterMarkers_CheckedChanged);\r
-            // \r
-            // CheckPixelRatio\r
-            // \r
-            this.CheckPixelRatio.AutoSize = true;\r
-            this.CheckPixelRatio.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.CheckPixelRatio.Location = new System.Drawing.Point(368, 130);\r
-            this.CheckPixelRatio.Name = "CheckPixelRatio";\r
-            this.CheckPixelRatio.Size = new System.Drawing.Size(121, 17);\r
-            this.CheckPixelRatio.TabIndex = 40;\r
-            this.CheckPixelRatio.Text = "Anamorphic PAR";\r
-            this.CheckPixelRatio.UseVisualStyleBackColor = true;\r
-            this.CheckPixelRatio.CheckedChanged += new System.EventHandler(this.CheckPixelRatio_CheckedChanged);\r
-            // \r
             // Label23\r
             // \r
             this.Label23.AutoSize = true;\r
             this.Label23.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label23.Location = new System.Drawing.Point(13, 157);\r
+            this.Label23.Location = new System.Drawing.Point(13, 162);\r
             this.Label23.Name = "Label23";\r
             this.Label23.Size = new System.Drawing.Size(100, 13);\r
             this.Label23.TabIndex = 39;\r
@@ -1176,17 +1447,6 @@ namespace Handbrake
             this.Label2.TabIndex = 37;\r
             this.Label2.Text = "Quality Settings";\r
             // \r
-            // check_grayscale\r
-            // \r
-            this.check_grayscale.AutoSize = true;\r
-            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_grayscale.Location = new System.Drawing.Point(368, 107);\r
-            this.check_grayscale.Name = "check_grayscale";\r
-            this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
-            this.check_grayscale.TabIndex = 20;\r
-            this.check_grayscale.Text = "Grayscale Encoding";\r
-            this.check_grayscale.UseVisualStyleBackColor = true;\r
-            // \r
             // SliderValue\r
             // \r
             this.SliderValue.AutoSize = true;\r
@@ -1197,17 +1457,6 @@ namespace Handbrake
             this.SliderValue.TabIndex = 32;\r
             this.SliderValue.Text = "0%";\r
             // \r
-            // check_DeInterlace\r
-            // \r
-            this.check_DeInterlace.AutoSize = true;\r
-            this.check_DeInterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_DeInterlace.Location = new System.Drawing.Point(368, 84);\r
-            this.check_DeInterlace.Name = "check_DeInterlace";\r
-            this.check_DeInterlace.Size = new System.Drawing.Size(98, 17);\r
-            this.check_DeInterlace.TabIndex = 19;\r
-            this.check_DeInterlace.Text = "De-Interlace";\r
-            this.check_DeInterlace.UseVisualStyleBackColor = true;\r
-            // \r
             // drp_videoFramerate\r
             // \r
             this.drp_videoFramerate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
@@ -1223,7 +1472,7 @@ namespace Handbrake
             "24",\r
             "25",\r
             "29.97"});\r
-            this.drp_videoFramerate.Location = new System.Drawing.Point(155, 174);\r
+            this.drp_videoFramerate.Location = new System.Drawing.Point(155, 179);\r
             this.drp_videoFramerate.Name = "drp_videoFramerate";\r
             this.drp_videoFramerate.Size = new System.Drawing.Size(112, 21);\r
             this.drp_videoFramerate.TabIndex = 21;\r
@@ -1264,7 +1513,7 @@ namespace Handbrake
             // \r
             this.Label46.AutoSize = true;\r
             this.Label46.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label46.Location = new System.Drawing.Point(13, 181);\r
+            this.Label46.Location = new System.Drawing.Point(13, 186);\r
             this.Label46.Name = "Label46";\r
             this.Label46.Size = new System.Drawing.Size(107, 13);\r
             this.Label46.TabIndex = 21;\r
@@ -1300,407 +1549,273 @@ namespace Handbrake
             this.Label42.TabIndex = 18;\r
             this.Label42.Text = "Avg Bitrate (kbps):";\r
             // \r
-            // TabPage2\r
-            // \r
-            this.TabPage2.BackColor = System.Drawing.SystemColors.Control;\r
-            this.TabPage2.Controls.Add(this.Label29);\r
-            this.TabPage2.Controls.Add(this.drp_audioMixDown);\r
-            this.TabPage2.Controls.Add(this.drp_audioChannels);\r
-            this.TabPage2.Controls.Add(this.drp_audioBitrate);\r
-            this.TabPage2.Controls.Add(this.Label14);\r
-            this.TabPage2.Controls.Add(this.Label5);\r
-            this.TabPage2.Controls.Add(this.Label35);\r
-            this.TabPage2.Controls.Add(this.Label16);\r
-            this.TabPage2.Controls.Add(this.Label32);\r
-            this.TabPage2.Controls.Add(this.Label18);\r
-            this.TabPage2.Controls.Add(this.drp_audioSampleRate);\r
-            this.TabPage2.Location = new System.Drawing.Point(4, 22);\r
-            this.TabPage2.Name = "TabPage2";\r
-            this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage2.Size = new System.Drawing.Size(622, 242);\r
-            this.TabPage2.TabIndex = 3;\r
-            this.TabPage2.Text = "Audio Settings";\r
-            // \r
-            // Label29\r
-            // \r
-            this.Label29.AutoSize = true;\r
-            this.Label29.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label29.Location = new System.Drawing.Point(155, 151);\r
-            this.Label29.Name = "Label29";\r
-            this.Label29.Size = new System.Drawing.Size(189, 24);\r
-            this.Label29.TabIndex = 42;\r
-            this.Label29.Text = "Please note: Some options require a \r\n5.1 Audio Channel to be selected.";\r
-            // \r
-            // drp_audioMixDown\r
-            // \r
-            this.drp_audioMixDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioMixDown.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioMixDown.FormattingEnabled = true;\r
-            this.drp_audioMixDown.Items.AddRange(new object[] {\r
-            "Mono",\r
-            "Stereo",\r
-            "Dolby Surround",\r
-            "Dolby Pro Logic II",\r
-            "6 Channel Discrete"});\r
-            this.drp_audioMixDown.Location = new System.Drawing.Point(157, 127);\r
-            this.drp_audioMixDown.Name = "drp_audioMixDown";\r
-            this.drp_audioMixDown.Size = new System.Drawing.Size(173, 21);\r
-            this.drp_audioMixDown.TabIndex = 50;\r
-            this.drp_audioMixDown.Text = "Automatic";\r
-            this.drp_audioMixDown.SelectedIndexChanged += new System.EventHandler(this.drp_audioMixDown_SelectedIndexChanged);\r
-            // \r
-            // drp_audioChannels\r
-            // \r
-            this.drp_audioChannels.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioChannels.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioChannels.FormattingEnabled = true;\r
-            this.drp_audioChannels.Location = new System.Drawing.Point(157, 97);\r
-            this.drp_audioChannels.Name = "drp_audioChannels";\r
-            this.drp_audioChannels.Size = new System.Drawing.Size(173, 21);\r
-            this.drp_audioChannels.TabIndex = 49;\r
-            this.drp_audioChannels.Text = "Automatic";\r
-            // \r
-            // drp_audioBitrate\r
-            // \r
-            this.drp_audioBitrate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioBitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioBitrate.FormattingEnabled = true;\r
-            this.drp_audioBitrate.Items.AddRange(new object[] {\r
-            "32",\r
-            "40",\r
-            "48",\r
-            "56",\r
-            "64",\r
-            "80",\r
-            "86",\r
-            "112",\r
-            "128",\r
-            "160"});\r
-            this.drp_audioBitrate.Location = new System.Drawing.Point(157, 37);\r
-            this.drp_audioBitrate.Name = "drp_audioBitrate";\r
-            this.drp_audioBitrate.Size = new System.Drawing.Size(101, 21);\r
-            this.drp_audioBitrate.TabIndex = 40;\r
-            this.drp_audioBitrate.Text = "128";\r
-            // \r
-            // Label14\r
-            // \r
-            this.Label14.AutoSize = true;\r
-            this.Label14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label14.Location = new System.Drawing.Point(13, 130);\r
-            this.Label14.Name = "Label14";\r
-            this.Label14.Size = new System.Drawing.Size(99, 13);\r
-            this.Label14.TabIndex = 39;\r
-            this.Label14.Text = "Audio MixDown:";\r
-            // \r
-            // Label5\r
-            // \r
-            this.Label5.AutoSize = true;\r
-            this.Label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label5.Location = new System.Drawing.Point(13, 13);\r
-            this.Label5.Name = "Label5";\r
-            this.Label5.Size = new System.Drawing.Size(101, 13);\r
-            this.Label5.TabIndex = 37;\r
-            this.Label5.Text = "Audio Settings";\r
-            // \r
-            // Label35\r
-            // \r
-            this.Label35.AutoSize = true;\r
-            this.Label35.Location = new System.Drawing.Point(239, 103);\r
-            this.Label35.Name = "Label35";\r
-            this.Label35.Size = new System.Drawing.Size(0, 13);\r
-            this.Label35.TabIndex = 30;\r
-            // \r
-            // Label16\r
-            // \r
-            this.Label16.AutoSize = true;\r
-            this.Label16.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label16.Location = new System.Drawing.Point(13, 40);\r
-            this.Label16.Name = "Label16";\r
-            this.Label16.Size = new System.Drawing.Size(91, 13);\r
-            this.Label16.TabIndex = 20;\r
-            this.Label16.Text = "Bitrate (kbps):";\r
-            // \r
-            // Label32\r
-            // \r
-            this.Label32.AutoSize = true;\r
-            this.Label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label32.Location = new System.Drawing.Point(13, 100);\r
-            this.Label32.Name = "Label32";\r
-            this.Label32.Size = new System.Drawing.Size(80, 13);\r
-            this.Label32.TabIndex = 29;\r
-            this.Label32.Text = "Audio Track:";\r
-            // \r
-            // Label18\r
-            // \r
-            this.Label18.AutoSize = true;\r
-            this.Label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label18.Location = new System.Drawing.Point(13, 70);\r
-            this.Label18.Name = "Label18";\r
-            this.Label18.Size = new System.Drawing.Size(120, 13);\r
-            this.Label18.TabIndex = 23;\r
-            this.Label18.Text = "Sample Rate (kHz):";\r
-            // \r
-            // drp_audioSampleRate\r
+            // TabPage1\r
             // \r
-            this.drp_audioSampleRate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_audioSampleRate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_audioSampleRate.FormattingEnabled = true;\r
-            this.drp_audioSampleRate.Items.AddRange(new object[] {\r
-            "48",\r
-            "44.1",\r
-            "32",\r
-            "24",\r
-            "22.05"});\r
-            this.drp_audioSampleRate.Location = new System.Drawing.Point(157, 67);\r
-            this.drp_audioSampleRate.Name = "drp_audioSampleRate";\r
-            this.drp_audioSampleRate.Size = new System.Drawing.Size(101, 21);\r
-            this.drp_audioSampleRate.TabIndex = 23;\r
-            this.drp_audioSampleRate.Text = "44.1";\r
+            this.TabPage1.BackColor = System.Drawing.SystemColors.Control;\r
+            this.TabPage1.Controls.Add(this.drp_deInterlace_option);\r
+            this.TabPage1.Controls.Add(this.check_DeInterlace);\r
+            this.TabPage1.Controls.Add(this.Check_ChapterMarkers);\r
+            this.TabPage1.Controls.Add(this.CheckPixelRatio);\r
+            this.TabPage1.Controls.Add(this.check_grayscale);\r
+            this.TabPage1.Controls.Add(this.label6);\r
+            this.TabPage1.Controls.Add(this.drp_subtitle);\r
+            this.TabPage1.Controls.Add(this.Label19);\r
+            this.TabPage1.Controls.Add(this.lbl_RecomendedCrop);\r
+            this.TabPage1.Controls.Add(this.Label8);\r
+            this.TabPage1.Controls.Add(this.Label1);\r
+            this.TabPage1.Controls.Add(this.Label53);\r
+            this.TabPage1.Controls.Add(this.Label21);\r
+            this.TabPage1.Controls.Add(this.Label20);\r
+            this.TabPage1.Controls.Add(this.Label52);\r
+            this.TabPage1.Controls.Add(this.Label51);\r
+            this.TabPage1.Controls.Add(this.Label50);\r
+            this.TabPage1.Controls.Add(this.Label15);\r
+            this.TabPage1.Controls.Add(this.text_top);\r
+            this.TabPage1.Controls.Add(this.text_bottom);\r
+            this.TabPage1.Controls.Add(this.drp_crop);\r
+            this.TabPage1.Controls.Add(this.text_right);\r
+            this.TabPage1.Controls.Add(this.text_left);\r
+            this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
+            this.TabPage1.Name = "TabPage1";\r
+            this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
+            this.TabPage1.Size = new System.Drawing.Size(639, 242);\r
+            this.TabPage1.TabIndex = 0;\r
+            this.TabPage1.Text = "Picture Settings";\r
+            this.TabPage1.UseVisualStyleBackColor = true;\r
             // \r
-            // h264Tab\r
+            // check_DeInterlace\r
             // \r
-            this.h264Tab.BackColor = System.Drawing.SystemColors.Control;\r
-            this.h264Tab.Controls.Add(this.Label43);\r
-            this.h264Tab.Controls.Add(this.label_h264);\r
-            this.h264Tab.Controls.Add(this.Label95);\r
-            this.h264Tab.Controls.Add(this.btn_h264Clear);\r
-            this.h264Tab.Controls.Add(this.Label90);\r
-            this.h264Tab.Controls.Add(this.rtf_h264advanced);\r
-            this.h264Tab.Controls.Add(this.Label92);\r
-            this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
-            this.h264Tab.Name = "h264Tab";\r
-            this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
-            this.h264Tab.Size = new System.Drawing.Size(622, 242);\r
-            this.h264Tab.TabIndex = 5;\r
-            this.h264Tab.Text = "H.264";\r
+            this.check_DeInterlace.AutoSize = true;\r
+            this.check_DeInterlace.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_DeInterlace.Location = new System.Drawing.Point(317, 196);\r
+            this.check_DeInterlace.Name = "check_DeInterlace";\r
+            this.check_DeInterlace.Size = new System.Drawing.Size(93, 17);\r
+            this.check_DeInterlace.TabIndex = 54;\r
+            this.check_DeInterlace.Text = "DeInterlace";\r
+            this.check_DeInterlace.UseVisualStyleBackColor = true;\r
             // \r
-            // Label43\r
+            // Check_ChapterMarkers\r
             // \r
-            this.Label43.AutoSize = true;\r
-            this.Label43.Location = new System.Drawing.Point(78, 206);\r
-            this.Label43.Name = "Label43";\r
-            this.Label43.Size = new System.Drawing.Size(158, 13);\r
-            this.Label43.TabIndex = 48;\r
-            this.Label43.Text = "for help using this feature.";\r
+            this.Check_ChapterMarkers.AutoSize = true;\r
+            this.Check_ChapterMarkers.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Check_ChapterMarkers.Location = new System.Drawing.Point(317, 173);\r
+            this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";\r
+            this.Check_ChapterMarkers.Size = new System.Drawing.Size(122, 17);\r
+            this.Check_ChapterMarkers.TabIndex = 50;\r
+            this.Check_ChapterMarkers.Text = "Chapter Markers";\r
+            this.Check_ChapterMarkers.UseVisualStyleBackColor = true;\r
             // \r
-            // label_h264\r
+            // CheckPixelRatio\r
             // \r
-            this.label_h264.AutoSize = true;\r
-            this.label_h264.Location = new System.Drawing.Point(13, 206);\r
-            this.label_h264.Name = "label_h264";\r
-            this.label_h264.Size = new System.Drawing.Size(66, 13);\r
-            this.label_h264.TabIndex = 47;\r
-            this.label_h264.TabStop = true;\r
-            this.label_h264.Text = "Click Here";\r
-            this.label_h264.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.label_h264_LinkClicked);\r
+            this.CheckPixelRatio.AutoSize = true;\r
+            this.CheckPixelRatio.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.CheckPixelRatio.Location = new System.Drawing.Point(317, 150);\r
+            this.CheckPixelRatio.Name = "CheckPixelRatio";\r
+            this.CheckPixelRatio.Size = new System.Drawing.Size(121, 17);\r
+            this.CheckPixelRatio.TabIndex = 49;\r
+            this.CheckPixelRatio.Text = "Anamorphic PAR";\r
+            this.CheckPixelRatio.UseVisualStyleBackColor = true;\r
             // \r
-            // Label95\r
+            // check_grayscale\r
             // \r
-            this.Label95.AutoSize = true;\r
-            this.Label95.Location = new System.Drawing.Point(13, 187);\r
-            this.Label95.Name = "Label95";\r
-            this.Label95.Size = new System.Drawing.Size(387, 13);\r
-            this.Label95.TabIndex = 46;\r
-            this.Label95.Text = "Note: Incorrect usage of this feature will cause the encoder to fail!";\r
+            this.check_grayscale.AutoSize = true;\r
+            this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_grayscale.Location = new System.Drawing.Point(317, 127);\r
+            this.check_grayscale.Name = "check_grayscale";\r
+            this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
+            this.check_grayscale.TabIndex = 46;\r
+            this.check_grayscale.Text = "Grayscale Encoding";\r
+            this.check_grayscale.UseVisualStyleBackColor = true;\r
             // \r
-            // btn_h264Clear\r
+            // label6\r
             // \r
-            this.btn_h264Clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_h264Clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_h264Clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_h264Clear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_h264Clear.Location = new System.Drawing.Point(542, 50);\r
-            this.btn_h264Clear.Name = "btn_h264Clear";\r
-            this.btn_h264Clear.Size = new System.Drawing.Size(79, 23);\r
-            this.btn_h264Clear.TabIndex = 45;\r
-            this.btn_h264Clear.Text = "Clear";\r
-            this.btn_h264Clear.UseVisualStyleBackColor = true;\r
-            this.btn_h264Clear.Click += new System.EventHandler(this.btn_h264Clear_Click);\r
+            this.label6.AutoSize = true;\r
+            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label6.Location = new System.Drawing.Point(314, 105);\r
+            this.label6.Name = "label6";\r
+            this.label6.Size = new System.Drawing.Size(110, 13);\r
+            this.label6.TabIndex = 45;\r
+            this.label6.Text = "Picture Settings";\r
             // \r
-            // Label90\r
+            // Label19\r
             // \r
-            this.Label90.AutoSize = true;\r
-            this.Label90.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label90.Location = new System.Drawing.Point(13, 13);\r
-            this.Label90.Name = "Label90";\r
-            this.Label90.Size = new System.Drawing.Size(165, 13);\r
-            this.Label90.TabIndex = 42;\r
-            this.Label90.Text = "Advanced H.264 Options";\r
+            this.Label19.AutoSize = true;\r
+            this.Label19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label19.Location = new System.Drawing.Point(311, 13);\r
+            this.Label19.Name = "Label19";\r
+            this.Label19.Size = new System.Drawing.Size(64, 13);\r
+            this.Label19.TabIndex = 39;\r
+            this.Label19.Text = "Subtitles";\r
             // \r
-            // rtf_h264advanced\r
+            // lbl_RecomendedCrop\r
             // \r
-            this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79);\r
-            this.rtf_h264advanced.Name = "rtf_h264advanced";\r
-            this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96);\r
-            this.rtf_h264advanced.TabIndex = 41;\r
-            this.rtf_h264advanced.Text = "";\r
+            this.lbl_RecomendedCrop.AutoSize = true;\r
+            this.lbl_RecomendedCrop.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_RecomendedCrop.Location = new System.Drawing.Point(119, 72);\r
+            this.lbl_RecomendedCrop.Name = "lbl_RecomendedCrop";\r
+            this.lbl_RecomendedCrop.Size = new System.Drawing.Size(72, 12);\r
+            this.lbl_RecomendedCrop.TabIndex = 38;\r
+            this.lbl_RecomendedCrop.Text = "Select a Title";\r
             // \r
-            // Label92\r
+            // Label8\r
             // \r
-            this.Label92.AutoSize = true;\r
-            this.Label92.Location = new System.Drawing.Point(13, 41);\r
-            this.Label92.Name = "Label92";\r
-            this.Label92.Size = new System.Drawing.Size(370, 26);\r
-            this.Label92.TabIndex = 40;\r
-            this.Label92.Text = "Specify advanced x264 options in the same style as mencoder:\r\noption1=value1:opti" +\r
-                "on2=value2";\r
+            this.Label8.AutoSize = true;\r
+            this.Label8.Location = new System.Drawing.Point(13, 71);\r
+            this.Label8.Name = "Label8";\r
+            this.Label8.Size = new System.Drawing.Size(70, 13);\r
+            this.Label8.TabIndex = 37;\r
+            this.Label8.Text = "Auto Crop:";\r
             // \r
-            // TabPage6\r
+            // Label1\r
             // \r
-            this.TabPage6.BackColor = System.Drawing.SystemColors.Control;\r
-            this.TabPage6.Controls.Add(this.Label7);\r
-            this.TabPage6.Controls.Add(this.Label39);\r
-            this.TabPage6.Controls.Add(this.btn_ClearQuery);\r
-            this.TabPage6.Controls.Add(this.GenerateQuery);\r
-            this.TabPage6.Controls.Add(this.QueryEditorText);\r
-            this.TabPage6.Location = new System.Drawing.Point(4, 22);\r
-            this.TabPage6.Name = "TabPage6";\r
-            this.TabPage6.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage6.Size = new System.Drawing.Size(622, 242);\r
-            this.TabPage6.TabIndex = 6;\r
-            this.TabPage6.Text = "Query Editor";\r
+            this.Label1.AutoSize = true;\r
+            this.Label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label1.Location = new System.Drawing.Point(13, 13);\r
+            this.Label1.Name = "Label1";\r
+            this.Label1.Size = new System.Drawing.Size(65, 13);\r
+            this.Label1.TabIndex = 36;\r
+            this.Label1.Text = "Cropping";\r
             // \r
-            // Label7\r
+            // Label53\r
             // \r
-            this.Label7.AutoSize = true;\r
-            this.Label7.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label7.Location = new System.Drawing.Point(13, 13);\r
-            this.Label7.Name = "Label7";\r
-            this.Label7.Size = new System.Drawing.Size(89, 13);\r
-            this.Label7.TabIndex = 42;\r
-            this.Label7.Text = "Query Editor";\r
+            this.Label53.AutoSize = true;\r
+            this.Label53.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label53.Location = new System.Drawing.Point(134, 196);\r
+            this.Label53.Name = "Label53";\r
+            this.Label53.Size = new System.Drawing.Size(48, 13);\r
+            this.Label53.TabIndex = 32;\r
+            this.Label53.Text = "Bottom";\r
             // \r
-            // Label39\r
+            // Label21\r
             // \r
-            this.Label39.AutoSize = true;\r
-            this.Label39.Location = new System.Drawing.Point(13, 34);\r
-            this.Label39.Name = "Label39";\r
-            this.Label39.Size = new System.Drawing.Size(403, 39);\r
-            this.Label39.TabIndex = 40;\r
-            this.Label39.Text = "Here you can alter the query generated by the program.\r\nClick the \"Generate Query" +\r
-                " Now\" button to continue.\r\nRemember to re-generate the query each time you chang" +\r
-                "e a setting!";\r
+            this.Label21.AutoSize = true;\r
+            this.Label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label21.Location = new System.Drawing.Point(378, 63);\r
+            this.Label21.Name = "Label21";\r
+            this.Label21.Size = new System.Drawing.Size(224, 26);\r
+            this.Label21.TabIndex = 34;\r
+            this.Label21.Text = "Please note that subtitles will be hard \r\ncoded into the video.\r\n";\r
             // \r
-            // btn_ClearQuery\r
+            // Label20\r
             // \r
-            this.btn_ClearQuery.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_ClearQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_ClearQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_ClearQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_ClearQuery.Location = new System.Drawing.Point(542, 84);\r
-            this.btn_ClearQuery.Name = "btn_ClearQuery";\r
-            this.btn_ClearQuery.Size = new System.Drawing.Size(79, 23);\r
-            this.btn_ClearQuery.TabIndex = 39;\r
-            this.btn_ClearQuery.Text = "Clear";\r
-            this.btn_ClearQuery.UseVisualStyleBackColor = true;\r
-            this.btn_ClearQuery.Click += new System.EventHandler(this.btn_ClearQuery_Click);\r
+            this.Label20.AutoSize = true;\r
+            this.Label20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label20.Location = new System.Drawing.Point(314, 39);\r
+            this.Label20.Name = "Label20";\r
+            this.Label20.Size = new System.Drawing.Size(61, 13);\r
+            this.Label20.TabIndex = 33;\r
+            this.Label20.Text = "Subtitles:";\r
             // \r
-            // GenerateQuery\r
+            // Label52\r
             // \r
-            this.GenerateQuery.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.GenerateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.GenerateQuery.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.GenerateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.GenerateQuery.Location = new System.Drawing.Point(16, 84);\r
-            this.GenerateQuery.Name = "GenerateQuery";\r
-            this.GenerateQuery.Size = new System.Drawing.Size(176, 23);\r
-            this.GenerateQuery.TabIndex = 38;\r
-            this.GenerateQuery.Text = "Generate Query Now";\r
-            this.GenerateQuery.UseVisualStyleBackColor = true;\r
-            this.GenerateQuery.Click += new System.EventHandler(this.GenerateQuery_Click);\r
+            this.Label52.AutoSize = true;\r
+            this.Label52.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label52.Location = new System.Drawing.Point(138, 105);\r
+            this.Label52.Name = "Label52";\r
+            this.Label52.Size = new System.Drawing.Size(28, 13);\r
+            this.Label52.TabIndex = 31;\r
+            this.Label52.Text = "Top";\r
             // \r
-            // QueryEditorText\r
+            // Label51\r
             // \r
-            this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.QueryEditorText.Location = new System.Drawing.Point(16, 114);\r
-            this.QueryEditorText.Name = "QueryEditorText";\r
-            this.QueryEditorText.Size = new System.Drawing.Size(605, 104);\r
-            this.QueryEditorText.TabIndex = 41;\r
-            this.QueryEditorText.Text = "";\r
+            this.Label51.AutoSize = true;\r
+            this.Label51.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label51.Location = new System.Drawing.Point(243, 148);\r
+            this.Label51.Name = "Label51";\r
+            this.Label51.Size = new System.Drawing.Size(36, 13);\r
+            this.Label51.TabIndex = 30;\r
+            this.Label51.Text = "Right";\r
             // \r
-            // lbl_update\r
+            // Label50\r
             // \r
-            this.lbl_update.AutoSize = true;\r
-            this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_update.ForeColor = System.Drawing.Color.Black;\r
-            this.lbl_update.Location = new System.Drawing.Point(83, 594);\r
-            this.lbl_update.Name = "lbl_update";\r
-            this.lbl_update.Size = new System.Drawing.Size(193, 13);\r
-            this.lbl_update.TabIndex = 417;\r
-            this.lbl_update.Text = "- A New Version is available!";\r
-            this.lbl_update.Visible = false;\r
+            this.Label50.AutoSize = true;\r
+            this.Label50.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label50.Location = new System.Drawing.Point(13, 41);\r
+            this.Label50.Name = "Label50";\r
+            this.Label50.Size = new System.Drawing.Size(88, 13);\r
+            this.Label50.TabIndex = 17;\r
+            this.Label50.Text = "Select Option:";\r
+            // \r
+            // Label15\r
+            // \r
+            this.Label15.AutoSize = true;\r
+            this.Label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label15.Location = new System.Drawing.Point(39, 148);\r
+            this.Label15.Name = "Label15";\r
+            this.Label15.Size = new System.Drawing.Size(28, 13);\r
+            this.Label15.TabIndex = 29;\r
+            this.Label15.Text = "Left";\r
             // \r
-            // btn_queue\r
+            // text_top\r
             // \r
-            this.btn_queue.BackColor = System.Drawing.SystemColors.Control;\r
-            this.btn_queue.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_queue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_queue.Location = new System.Drawing.Point(415, 589);\r
-            this.btn_queue.Name = "btn_queue";\r
-            this.btn_queue.Size = new System.Drawing.Size(115, 22);\r
-            this.btn_queue.TabIndex = 416;\r
-            this.btn_queue.TabStop = false;\r
-            this.btn_queue.Text = "Add to Queue";\r
-            this.btn_queue.UseVisualStyleBackColor = false;\r
-            this.btn_queue.Click += new System.EventHandler(this.btn_queue_Click);\r
+            this.text_top.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.text_top.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.text_top.Location = new System.Drawing.Point(131, 120);\r
+            this.text_top.Name = "text_top";\r
+            this.text_top.Size = new System.Drawing.Size(51, 21);\r
+            this.text_top.TabIndex = 10;\r
+            this.text_top.Text = "0";\r
             // \r
-            // btn_encode\r
+            // text_bottom\r
             // \r
-            this.btn_encode.BackColor = System.Drawing.SystemColors.Control;\r
-            this.btn_encode.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_encode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_encode.Location = new System.Drawing.Point(536, 589);\r
-            this.btn_encode.Name = "btn_encode";\r
-            this.btn_encode.Size = new System.Drawing.Size(124, 22);\r
-            this.btn_encode.TabIndex = 414;\r
-            this.btn_encode.TabStop = false;\r
-            this.btn_encode.Text = "Encode Video";\r
-            this.btn_encode.UseVisualStyleBackColor = false;\r
-            this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);\r
+            this.text_bottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.text_bottom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.text_bottom.Location = new System.Drawing.Point(131, 172);\r
+            this.text_bottom.Name = "text_bottom";\r
+            this.text_bottom.Size = new System.Drawing.Size(51, 21);\r
+            this.text_bottom.TabIndex = 12;\r
+            this.text_bottom.Text = "0";\r
             // \r
-            // Version\r
+            // drp_crop\r
             // \r
-            this.Version.BackColor = System.Drawing.Color.Transparent;\r
-            this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Version.Location = new System.Drawing.Point(12, 594);\r
-            this.Version.Name = "Version";\r
-            this.Version.Size = new System.Drawing.Size(79, 20);\r
-            this.Version.TabIndex = 415;\r
-            this.Version.Text = "Version 2.3";\r
+            this.drp_crop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_crop.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_crop.FormattingEnabled = true;\r
+            this.drp_crop.Items.AddRange(new object[] {\r
+            "Auto Crop",\r
+            "No Crop",\r
+            "Manual"});\r
+            this.drp_crop.Location = new System.Drawing.Point(118, 36);\r
+            this.drp_crop.Name = "drp_crop";\r
+            this.drp_crop.Size = new System.Drawing.Size(123, 21);\r
+            this.drp_crop.TabIndex = 9;\r
+            this.drp_crop.Text = "No Crop";\r
+            this.drp_crop.SelectedIndexChanged += new System.EventHandler(this.drp_crop_SelectedIndexChanged);\r
             // \r
-            // lbl_encode\r
+            // text_right\r
             // \r
-            this.lbl_encode.AutoSize = true;\r
-            this.lbl_encode.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_encode.Location = new System.Drawing.Point(12, 571);\r
-            this.lbl_encode.Name = "lbl_encode";\r
-            this.lbl_encode.Size = new System.Drawing.Size(96, 13);\r
-            this.lbl_encode.TabIndex = 418;\r
-            this.lbl_encode.Text = "Encoding started...";\r
-            this.lbl_encode.Visible = false;\r
+            this.text_right.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.text_right.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.text_right.Location = new System.Drawing.Point(190, 145);\r
+            this.text_right.Name = "text_right";\r
+            this.text_right.Size = new System.Drawing.Size(51, 21);\r
+            this.text_right.TabIndex = 13;\r
+            this.text_right.Text = "0";\r
             // \r
-            // btn_eCancel\r
+            // text_left\r
             // \r
-            this.btn_eCancel.BackColor = System.Drawing.SystemColors.Control;\r
-            this.btn_eCancel.Enabled = false;\r
-            this.btn_eCancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_eCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_eCancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_eCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_eCancel.Location = new System.Drawing.Point(344, 589);\r
-            this.btn_eCancel.Name = "btn_eCancel";\r
-            this.btn_eCancel.Size = new System.Drawing.Size(65, 22);\r
-            this.btn_eCancel.TabIndex = 419;\r
-            this.btn_eCancel.TabStop = false;\r
-            this.btn_eCancel.Text = "Cancel";\r
-            this.btn_eCancel.UseVisualStyleBackColor = false;\r
-            this.btn_eCancel.Visible = false;\r
-            this.btn_eCancel.Click += new System.EventHandler(this.btn_eCancel_Click);\r
+            this.text_left.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.text_left.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.text_left.Location = new System.Drawing.Point(72, 145);\r
+            this.text_left.Name = "text_left";\r
+            this.text_left.Size = new System.Drawing.Size(51, 21);\r
+            this.text_left.TabIndex = 11;\r
+            this.text_left.Text = "0";\r
+            // \r
+            // advancedOptions\r
+            // \r
+            this.advancedOptions.Controls.Add(this.TabPage1);\r
+            this.advancedOptions.Controls.Add(this.TabPage3);\r
+            this.advancedOptions.Controls.Add(this.TabPage2);\r
+            this.advancedOptions.Controls.Add(this.h264Tab);\r
+            this.advancedOptions.Controls.Add(this.TabPage6);\r
+            this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.advancedOptions.Location = new System.Drawing.Point(15, 295);\r
+            this.advancedOptions.Name = "advancedOptions";\r
+            this.advancedOptions.SelectedIndex = 0;\r
+            this.advancedOptions.Size = new System.Drawing.Size(647, 268);\r
+            this.advancedOptions.TabIndex = 411;\r
+            this.advancedOptions.TabStop = false;\r
             // \r
             // frmMain\r
             // \r
@@ -1728,18 +1843,18 @@ namespace Handbrake
             this.GroupBox1.PerformLayout();\r
             this.GroupBox4.ResumeLayout(false);\r
             this.GroupBox4.PerformLayout();\r
-            this.advancedOptions.ResumeLayout(false);\r
-            this.TabPage1.ResumeLayout(false);\r
-            this.TabPage1.PerformLayout();\r
+            this.TabPage6.ResumeLayout(false);\r
+            this.TabPage6.PerformLayout();\r
+            this.h264Tab.ResumeLayout(false);\r
+            this.h264Tab.PerformLayout();\r
+            this.TabPage2.ResumeLayout(false);\r
+            this.TabPage2.PerformLayout();\r
             this.TabPage3.ResumeLayout(false);\r
             this.TabPage3.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).EndInit();\r
-            this.TabPage2.ResumeLayout(false);\r
-            this.TabPage2.PerformLayout();\r
-            this.h264Tab.ResumeLayout(false);\r
-            this.h264Tab.PerformLayout();\r
-            this.TabPage6.ResumeLayout(false);\r
-            this.TabPage6.PerformLayout();\r
+            this.TabPage1.ResumeLayout(false);\r
+            this.TabPage1.PerformLayout();\r
+            this.advancedOptions.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -1809,8 +1924,70 @@ namespace Handbrake
         internal System.Windows.Forms.TextBox text_destination;\r
         internal System.Windows.Forms.ComboBox drp_audioCodec;\r
         internal System.Windows.Forms.Label Label12;\r
-        internal System.Windows.Forms.TabControl advancedOptions;\r
+        internal System.Windows.Forms.Label lbl_update;\r
+        internal System.Windows.Forms.Button btn_queue;\r
+        internal System.Windows.Forms.Button btn_encode;\r
+        internal System.Windows.Forms.Label Version;\r
+        private System.Windows.Forms.Label lbl_chptWarn;\r
+        internal System.Windows.Forms.SaveFileDialog DVD_Save;\r
+        private System.Windows.Forms.Label lbl_encode;\r
+        internal System.Windows.Forms.Button btn_eCancel;\r
+        internal System.Windows.Forms.TabPage TabPage6;\r
+        internal System.Windows.Forms.Label Label7;\r
+        internal System.Windows.Forms.Label Label39;\r
+        internal System.Windows.Forms.Button btn_ClearQuery;\r
+        internal System.Windows.Forms.Button GenerateQuery;\r
+        internal System.Windows.Forms.RichTextBox QueryEditorText;\r
+        internal System.Windows.Forms.TabPage h264Tab;\r
+        internal System.Windows.Forms.Label Label43;\r
+        internal System.Windows.Forms.LinkLabel label_h264;\r
+        internal System.Windows.Forms.Label Label95;\r
+        internal System.Windows.Forms.Button btn_h264Clear;\r
+        internal System.Windows.Forms.Label Label90;\r
+        internal System.Windows.Forms.RichTextBox rtf_h264advanced;\r
+        internal System.Windows.Forms.Label Label92;\r
+        internal System.Windows.Forms.TabPage TabPage2;\r
+        internal System.Windows.Forms.Label Label29;\r
+        internal System.Windows.Forms.ComboBox drp_audioMixDown;\r
+        internal System.Windows.Forms.ComboBox drp_audioChannels;\r
+        internal System.Windows.Forms.ComboBox drp_audioBitrate;\r
+        internal System.Windows.Forms.Label Label14;\r
+        internal System.Windows.Forms.Label Label5;\r
+        internal System.Windows.Forms.Label Label35;\r
+        internal System.Windows.Forms.Label Label16;\r
+        internal System.Windows.Forms.Label Label32;\r
+        internal System.Windows.Forms.Label Label18;\r
+        internal System.Windows.Forms.ComboBox drp_audioSampleRate;\r
+        internal System.Windows.Forms.TabPage TabPage3;\r
+        internal System.Windows.Forms.ComboBox drp_deTelecine;\r
+        internal System.Windows.Forms.ComboBox drp_DeNoise;\r
+        internal System.Windows.Forms.CheckBox check_deTelecine;\r
+        internal System.Windows.Forms.CheckBox check_deNoise;\r
+        internal System.Windows.Forms.ComboBox drp_deBlock;\r
+        internal System.Windows.Forms.CheckBox check_deBlock;\r
+        internal System.Windows.Forms.Label Label37;\r
+        internal System.Windows.Forms.CheckBox check_largeFile;\r
+        internal System.Windows.Forms.CheckBox check_turbo;\r
+        internal System.Windows.Forms.CheckBox CheckCRF;\r
+        internal System.Windows.Forms.Label Label23;\r
+        internal System.Windows.Forms.Label Label22;\r
+        internal System.Windows.Forms.Label Label2;\r
+        internal System.Windows.Forms.Label SliderValue;\r
+        internal System.Windows.Forms.ComboBox drp_videoFramerate;\r
+        internal System.Windows.Forms.CheckBox check_2PassEncode;\r
+        internal System.Windows.Forms.TrackBar slider_videoQuality;\r
+        internal System.Windows.Forms.TextBox text_filesize;\r
+        internal System.Windows.Forms.Label Label46;\r
+        internal System.Windows.Forms.Label Label40;\r
+        internal System.Windows.Forms.TextBox text_bitrate;\r
+        internal System.Windows.Forms.Label Label42;\r
         internal System.Windows.Forms.TabPage TabPage1;\r
+        internal System.Windows.Forms.ComboBox drp_deInterlace_option;\r
+        internal System.Windows.Forms.CheckBox check_DeInterlace;\r
+        internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
+        internal System.Windows.Forms.CheckBox CheckPixelRatio;\r
+        internal System.Windows.Forms.CheckBox check_grayscale;\r
+        internal System.Windows.Forms.Label label6;\r
         internal System.Windows.Forms.ComboBox drp_subtitle;\r
         internal System.Windows.Forms.Label Label19;\r
         internal System.Windows.Forms.Label lbl_RecomendedCrop;\r
@@ -1828,62 +2005,7 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drp_crop;\r
         internal System.Windows.Forms.TextBox text_right;\r
         internal System.Windows.Forms.TextBox text_left;\r
-        internal System.Windows.Forms.TabPage TabPage3;\r
-        internal System.Windows.Forms.Label Label37;\r
-        internal System.Windows.Forms.CheckBox check_largeFile;\r
-        internal System.Windows.Forms.CheckBox check_turbo;\r
-        internal System.Windows.Forms.Label Label36;\r
-        internal System.Windows.Forms.CheckBox Check_ChapterMarkers;\r
-        internal System.Windows.Forms.CheckBox CheckCRF;\r
-        internal System.Windows.Forms.CheckBox CheckPixelRatio;\r
-        internal System.Windows.Forms.Label Label23;\r
-        internal System.Windows.Forms.Label Label22;\r
-        internal System.Windows.Forms.Label Label2;\r
-        internal System.Windows.Forms.CheckBox check_grayscale;\r
-        internal System.Windows.Forms.Label SliderValue;\r
-        internal System.Windows.Forms.CheckBox check_DeInterlace;\r
-        internal System.Windows.Forms.ComboBox drp_videoFramerate;\r
-        internal System.Windows.Forms.CheckBox check_2PassEncode;\r
-        internal System.Windows.Forms.TrackBar slider_videoQuality;\r
-        internal System.Windows.Forms.TextBox text_filesize;\r
-        internal System.Windows.Forms.Label Label46;\r
-        internal System.Windows.Forms.Label Label40;\r
-        internal System.Windows.Forms.TextBox text_bitrate;\r
-        internal System.Windows.Forms.Label Label42;\r
-        internal System.Windows.Forms.TabPage TabPage2;\r
-        internal System.Windows.Forms.Label Label29;\r
-        internal System.Windows.Forms.ComboBox drp_audioMixDown;\r
-        internal System.Windows.Forms.ComboBox drp_audioChannels;\r
-        internal System.Windows.Forms.ComboBox drp_audioBitrate;\r
-        internal System.Windows.Forms.Label Label14;\r
-        internal System.Windows.Forms.Label Label5;\r
-        internal System.Windows.Forms.Label Label35;\r
-        internal System.Windows.Forms.Label Label16;\r
-        internal System.Windows.Forms.Label Label32;\r
-        internal System.Windows.Forms.Label Label18;\r
-        internal System.Windows.Forms.ComboBox drp_audioSampleRate;\r
-        internal System.Windows.Forms.TabPage h264Tab;\r
-        internal System.Windows.Forms.Label Label43;\r
-        internal System.Windows.Forms.LinkLabel label_h264;\r
-        internal System.Windows.Forms.Label Label95;\r
-        internal System.Windows.Forms.Button btn_h264Clear;\r
-        internal System.Windows.Forms.Label Label90;\r
-        internal System.Windows.Forms.RichTextBox rtf_h264advanced;\r
-        internal System.Windows.Forms.Label Label92;\r
-        internal System.Windows.Forms.TabPage TabPage6;\r
-        internal System.Windows.Forms.Label Label7;\r
-        internal System.Windows.Forms.Label Label39;\r
-        internal System.Windows.Forms.Button btn_ClearQuery;\r
-        internal System.Windows.Forms.Button GenerateQuery;\r
-        internal System.Windows.Forms.RichTextBox QueryEditorText;\r
-        internal System.Windows.Forms.Label lbl_update;\r
-        internal System.Windows.Forms.Button btn_queue;\r
-        internal System.Windows.Forms.Button btn_encode;\r
-        internal System.Windows.Forms.Label Version;\r
-        private System.Windows.Forms.Label lbl_chptWarn;\r
-        internal System.Windows.Forms.SaveFileDialog DVD_Save;\r
-        private System.Windows.Forms.Label lbl_encode;\r
-        internal System.Windows.Forms.Button btn_eCancel;\r
+        internal System.Windows.Forms.TabControl advancedOptions;\r
 \r
     }\r
 }
\ No newline at end of file
index 59e31c5..b01dc01 100644 (file)
@@ -1158,9 +1158,18 @@ namespace Handbrake
             }\r
         }\r
 \r
-        //---------------------------------------------------\r
-        //  The query Generation function.\r
-        //---------------------------------------------------\r
+\r
+\r
+\r
+\r
+        /* \r
+         * ---------------------------------------------------\r
+         * \r
+         * The query Generation function.\r
+         * \r
+         * ---------------------------------------------------\r
+         */\r
+\r
         public string GenerateTheQuery()\r
         {\r
             string source = text_source.Text;\r
@@ -1270,6 +1279,11 @@ namespace Handbrake
             string cropRight = text_right.Text;\r
             string subtitles = drp_subtitle.Text;\r
             string cropOut = "";\r
+            string deInterlace_Option = drp_deInterlace_option.Text;\r
+            string deinterlace = "";\r
+            string grayscale = "";\r
+            string pixelRatio = "";\r
+            string ChapterMarkers = "";\r
             // Returns Crop Query\r
 \r
             if (cropSetting == "Auto Crop")\r
@@ -1290,7 +1304,38 @@ namespace Handbrake
                 subtitles = " -s "+ tempSub[0];\r
             }\r
 \r
-            string queryPictureSettings = cropOut+ subtitles;\r
+            if (check_DeInterlace.Checked)\r
+            {\r
+                switch (deInterlace_Option)\r
+                {\r
+                    case "Default":\r
+                        deinterlace = " --deinterlace";\r
+                        break;\r
+                    case "yadif":\r
+                        deinterlace = " --deinterlace=" + '"' + "1" + '"';\r
+                        break;\r
+                    case "yadif + mcdeint":\r
+                        deinterlace = " -d " + '"' + "1:-1:1" + '"';\r
+                        break;\r
+                    case "yadif + mcdeint (Slow)":\r
+                        deinterlace = " --deinterlace=" + '"' + "3:-1:2" + '"';\r
+                        break;\r
+                    default:\r
+                        deinterlace = " --deinterlace=";\r
+                        break;\r
+                }\r
+            }\r
+\r
+            if (check_grayscale.Checked)\r
+                grayscale = " -g ";\r
+\r
+            if (CheckPixelRatio.Checked)\r
+                pixelRatio = " -p ";\r
+\r
+            if (Check_ChapterMarkers.Checked)\r
+                ChapterMarkers = " -m ";\r
+\r
+            string queryPictureSettings = cropOut + subtitles + deinterlace + grayscale + pixelRatio + ChapterMarkers;\r
             // ----------------------------------------------------------------------\r
 \r
             // Video Settings Tab\r
@@ -1300,11 +1345,7 @@ namespace Handbrake
             int videoQuality = slider_videoQuality.Value;\r
             string vidQSetting = "";\r
             string twoPassEncoding = "";\r
-            string deinterlace = "";\r
-            string grayscale = "";\r
             string videoFramerate = drp_videoFramerate.Text;\r
-            string pixelRatio = "";\r
-            string ChapterMarkers = "";\r
             string turboH264 = "";\r
             string largeFile = "";\r
 \r
@@ -1332,30 +1373,27 @@ namespace Handbrake
             if (check_2PassEncode.Checked)\r
                 twoPassEncoding = " -2 ";\r
 \r
-            if (check_DeInterlace.Checked)\r
-                deinterlace = " -d ";\r
-\r
-            if (check_grayscale.Checked)\r
-                grayscale = " -g ";\r
-\r
             if (videoFramerate ==  "Automatic")\r
                 videoFramerate = "";\r
             else\r
                 videoFramerate = " -r "+ videoFramerate;\r
 \r
-            if (CheckPixelRatio.Checked)\r
-                pixelRatio = " -p ";\r
-\r
-            if (Check_ChapterMarkers.Checked)\r
-                ChapterMarkers = " -m ";\r
-\r
             if (check_turbo.Checked)\r
                 turboH264 = " -T ";\r
 \r
             if (check_largeFile.Checked)\r
                 largeFile = " -4 ";\r
 \r
-            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding + deinterlace + grayscale + videoFramerate + pixelRatio + ChapterMarkers + turboH264 + largeFile;\r
+            /*\r
+             * -7, --deblock           Deblock video with pp7 filter\r
+             * <QP:M>            (default 0:2)\r
+             * -8, --denoise           Denoise video with hqdn3d filter\r
+             * <SL:SC:TL:TC>     (default 4:3:6:4.5)\r
+             * -9, --detelecine        Detelecine video with pullup filter\r
+             * <L:R:T:B:SB:MP>   (default 1:1:4:4:0:0)\r
+             */\r
+\r
+            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + twoPassEncoding  + videoFramerate + turboH264 + largeFile;\r
             // ----------------------------------------------------------------------\r
 \r
             // Audio Settings Tab\r
@@ -1459,8 +1497,6 @@ namespace Handbrake
             return querySource+ queryDestination+ queryPictureSettings+ queryVideoSettings+ h264Settings+ queryAudioSettings+ queryAdvancedSettings+ verbose;\r
         }\r
 \r
-        \r
-\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file