WinGui:

- Added VFR and Loose Anamorphic Check boxes.
- Added placeholder widgets for Optimise MP4 and iPod Atom Check boxes

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

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 6c4f4f265036b31d2bcda7d8dfbcc398ec640a31..40731273fc16160251eb05988c2e2b88f7a2ce11 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -219,6 +219,18 @@ namespace Handbrake.Functions
             }\r
         }\r
 \r
+        private Boolean q_vfr;\r
+        /// <summary>\r
+        /// Returns a boolean to indicate wither DeTelecine is on or off\r
+        /// </summary>\r
+        public Boolean VFR\r
+        {\r
+            get\r
+            {\r
+                return this.q_vfr;\r
+            }\r
+        }\r
+\r
         private Boolean q_deBlock;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither DeBlock is on or off.\r
@@ -267,6 +279,18 @@ namespace Handbrake.Functions
             }\r
         }\r
 \r
+        private Boolean q_looseAnamorphic;\r
+        /// <summary>\r
+        /// Returns a boolean to indicate wither Anamorphic is on or off.\r
+        /// </summary>\r
+        public Boolean LooseAnamorphic\r
+        {\r
+            get\r
+            {\r
+                return this.q_looseAnamorphic;\r
+            }\r
+        }\r
+\r
         private Boolean q_chapterMarkers;\r
         /// <summary>\r
         /// Returns a boolean to indicate wither Chapter Markers is on or off.\r
@@ -500,6 +524,8 @@ namespace Handbrake.Functions
             Match anamorphic = Regex.Match(input, @"-p ");\r
             Match chapterMarkers = Regex.Match(input, @"-m");\r
             Match crop = Regex.Match(input, @"--crop ([0-9]):([0-9]):([0-9]):([0-9])");\r
+            Match vfr = Regex.Match(input, @"-V");\r
+            Match lanamorphic = Regex.Match(input, @"-P");\r
 \r
             //Video Settings Tab\r
             Match videoFramerate = Regex.Match(input, @"-r ([0-9]*)");\r
@@ -682,6 +708,9 @@ namespace Handbrake.Functions
                  }\r
                  thisQuery.q_anamorphic = anamorphic.Success;\r
                  thisQuery.q_chapterMarkers = chapterMarkers.Success;\r
+                 thisQuery.q_vfr = vfr.Success;\r
+                 thisQuery.q_looseAnamorphic = lanamorphic.Success;\r
+                \r
                  #endregion\r
 \r
                 //\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index bdba38bc6ecfd0d70039c9731cb17b2794a262b8..c148ef03092afd39a278cc2d6cf10e5ea33acedc 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -140,6 +140,8 @@ namespace Handbrake
             this.Label32 = new System.Windows.Forms.Label();\r
             this.Label18 = new System.Windows.Forms.Label();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
+            this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
+            this.check_optimiseMP4 = new System.Windows.Forms.CheckBox();\r
             this.check_grayscale = new System.Windows.Forms.CheckBox();\r
             this.lbl_largeMp4Warning = new System.Windows.Forms.Label();\r
             this.Label22 = new System.Windows.Forms.Label();\r
@@ -150,6 +152,8 @@ namespace Handbrake
             this.Label46 = new System.Windows.Forms.Label();\r
             this.Label40 = new System.Windows.Forms.Label();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
+            this.check_lAnamorphic = new System.Windows.Forms.CheckBox();\r
+            this.check_vfr = new System.Windows.Forms.CheckBox();\r
             this.label24 = new System.Windows.Forms.Label();\r
             this.drp_deNoise = new System.Windows.Forms.ComboBox();\r
             this.label11 = new System.Windows.Forms.Label();\r
@@ -177,6 +181,7 @@ namespace Handbrake
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
             this.groupBox2 = new System.Windows.Forms.GroupBox();\r
             this.treeView_presets = new System.Windows.Forms.TreeView();\r
+            this.lbl_vfr = new System.Windows.Forms.Label();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
@@ -197,7 +202,7 @@ namespace Handbrake
             Label38.AutoSize = true;\r
             Label38.BackColor = System.Drawing.Color.Transparent;\r
             Label38.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            Label38.Location = new System.Drawing.Point(304, 67);\r
+            Label38.Location = new System.Drawing.Point(304, 65);\r
             Label38.Name = "Label38";\r
             Label38.Size = new System.Drawing.Size(108, 13);\r
             Label38.TabIndex = 11;\r
@@ -500,9 +505,9 @@ namespace Handbrake
             "24",\r
             "25",\r
             "29.97"});\r
-            this.drp_videoFramerate.Location = new System.Drawing.Point(126, 149);\r
+            this.drp_videoFramerate.Location = new System.Drawing.Point(133, 189);\r
             this.drp_videoFramerate.Name = "drp_videoFramerate";\r
-            this.drp_videoFramerate.Size = new System.Drawing.Size(112, 21);\r
+            this.drp_videoFramerate.Size = new System.Drawing.Size(81, 21);\r
             this.drp_videoFramerate.TabIndex = 7;\r
             this.drp_videoFramerate.Text = "Automatic";\r
             this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to automcatic in most cases.");\r
@@ -524,7 +529,7 @@ namespace Handbrake
             this.text_filesize.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_filesize.Location = new System.Drawing.Point(446, 63);\r
             this.text_filesize.Name = "text_filesize";\r
-            this.text_filesize.Size = new System.Drawing.Size(156, 21);\r
+            this.text_filesize.Size = new System.Drawing.Size(81, 21);\r
             this.text_filesize.TabIndex = 12;\r
             this.ToolTip.SetToolTip(this.text_filesize, "Set the file size you wish the encoded file to be.");\r
             this.text_filesize.TextChanged += new System.EventHandler(this.text_filesize_TextChanged);\r
@@ -535,7 +540,7 @@ namespace Handbrake
             this.text_bitrate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_bitrate.Location = new System.Drawing.Point(446, 36);\r
             this.text_bitrate.Name = "text_bitrate";\r
-            this.text_bitrate.Size = new System.Drawing.Size(156, 21);\r
+            this.text_bitrate.Size = new System.Drawing.Size(81, 21);\r
             this.text_bitrate.TabIndex = 10;\r
             this.ToolTip.SetToolTip(this.text_bitrate, "Set the bitrate of the video");\r
             this.text_bitrate.TextChanged += new System.EventHandler(this.text_bitrate_TextChanged);\r
@@ -1016,7 +1021,7 @@ namespace Handbrake
             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(90, 543);\r
+            this.lbl_update.Location = new System.Drawing.Point(90, 551);\r
             this.lbl_update.Name = "lbl_update";\r
             this.lbl_update.Size = new System.Drawing.Size(193, 13);\r
             this.lbl_update.TabIndex = 7;\r
@@ -1030,7 +1035,7 @@ namespace Handbrake
             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(414, 538);\r
+            this.btn_queue.Location = new System.Drawing.Point(414, 546);\r
             this.btn_queue.Name = "btn_queue";\r
             this.btn_queue.Size = new System.Drawing.Size(115, 22);\r
             this.btn_queue.TabIndex = 9;\r
@@ -1046,7 +1051,7 @@ namespace Handbrake
             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(535, 538);\r
+            this.btn_encode.Location = new System.Drawing.Point(535, 546);\r
             this.btn_encode.Name = "btn_encode";\r
             this.btn_encode.Size = new System.Drawing.Size(124, 22);\r
             this.btn_encode.TabIndex = 10;\r
@@ -1059,7 +1064,7 @@ namespace Handbrake
             // \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(11, 543);\r
+            this.Version.Location = new System.Drawing.Point(11, 551);\r
             this.Version.Name = "Version";\r
             this.Version.Size = new System.Drawing.Size(105, 20);\r
             this.Version.TabIndex = 6;\r
@@ -1069,7 +1074,7 @@ namespace Handbrake
             // \r
             this.lbl_encode.AutoSize = true;\r
             this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_encode.Location = new System.Drawing.Point(11, 523);\r
+            this.lbl_encode.Location = new System.Drawing.Point(11, 531);\r
             this.lbl_encode.Name = "lbl_encode";\r
             this.lbl_encode.Size = new System.Drawing.Size(129, 13);\r
             this.lbl_encode.TabIndex = 5;\r
@@ -1084,7 +1089,7 @@ namespace Handbrake
             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(343, 538);\r
+            this.btn_eCancel.Location = new System.Drawing.Point(343, 546);\r
             this.btn_eCancel.Name = "btn_eCancel";\r
             this.btn_eCancel.Size = new System.Drawing.Size(65, 22);\r
             this.btn_eCancel.TabIndex = 8;\r
@@ -1107,7 +1112,7 @@ namespace Handbrake
             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, 215);\r
+            this.TabPage6.Size = new System.Drawing.Size(639, 226);\r
             this.TabPage6.TabIndex = 6;\r
             this.TabPage6.Text = "Query Editor";\r
             // \r
@@ -1200,7 +1205,7 @@ namespace Handbrake
             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, 215);\r
+            this.h264Tab.Size = new System.Drawing.Size(639, 226);\r
             this.h264Tab.TabIndex = 5;\r
             this.h264Tab.Text = "H.264";\r
             // \r
@@ -1292,7 +1297,7 @@ namespace Handbrake
             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, 215);\r
+            this.TabPage2.Size = new System.Drawing.Size(639, 226);\r
             this.TabPage2.TabIndex = 3;\r
             this.TabPage2.Text = "Audio && Subtitles";\r
             // \r
@@ -1428,6 +1433,9 @@ namespace Handbrake
             // TabPage3\r
             // \r
             this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage3.Controls.Add(this.lbl_vfr);\r
+            this.TabPage3.Controls.Add(this.check_iPodAtom);\r
+            this.TabPage3.Controls.Add(this.check_optimiseMP4);\r
             this.TabPage3.Controls.Add(this.check_grayscale);\r
             this.TabPage3.Controls.Add(this.lbl_largeMp4Warning);\r
             this.TabPage3.Controls.Add(this.check_largeFile);\r
@@ -1448,10 +1456,34 @@ 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(639, 215);\r
+            this.TabPage3.Size = new System.Drawing.Size(639, 226);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video Settings";\r
             // \r
+            // check_iPodAtom\r
+            // \r
+            this.check_iPodAtom.AutoSize = true;\r
+            this.check_iPodAtom.BackColor = System.Drawing.Color.DarkRed;\r
+            this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_iPodAtom.Location = new System.Drawing.Point(16, 167);\r
+            this.check_iPodAtom.Name = "check_iPodAtom";\r
+            this.check_iPodAtom.Size = new System.Drawing.Size(110, 17);\r
+            this.check_iPodAtom.TabIndex = 26;\r
+            this.check_iPodAtom.Text = "Add iPod Atom";\r
+            this.check_iPodAtom.UseVisualStyleBackColor = false;\r
+            // \r
+            // check_optimiseMP4\r
+            // \r
+            this.check_optimiseMP4.AutoSize = true;\r
+            this.check_optimiseMP4.BackColor = System.Drawing.Color.DarkRed;\r
+            this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_optimiseMP4.Location = new System.Drawing.Point(16, 144);\r
+            this.check_optimiseMP4.Name = "check_optimiseMP4";\r
+            this.check_optimiseMP4.Size = new System.Drawing.Size(184, 17);\r
+            this.check_optimiseMP4.TabIndex = 25;\r
+            this.check_optimiseMP4.Text = "Optimize MP4 for streaming";\r
+            this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
+            // \r
             // check_grayscale\r
             // \r
             this.check_grayscale.AutoSize = true;\r
@@ -1536,7 +1568,7 @@ namespace Handbrake
             this.Label46.AutoSize = true;\r
             this.Label46.BackColor = System.Drawing.Color.Transparent;\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, 152);\r
+            this.Label46.Location = new System.Drawing.Point(13, 192);\r
             this.Label46.Name = "Label46";\r
             this.Label46.Size = new System.Drawing.Size(107, 13);\r
             this.Label46.TabIndex = 6;\r
@@ -1547,7 +1579,7 @@ namespace Handbrake
             this.Label40.AutoSize = true;\r
             this.Label40.BackColor = System.Drawing.Color.Transparent;\r
             this.Label40.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label40.Location = new System.Drawing.Point(304, 96);\r
+            this.Label40.Location = new System.Drawing.Point(304, 95);\r
             this.Label40.Name = "Label40";\r
             this.Label40.Size = new System.Drawing.Size(107, 13);\r
             this.Label40.TabIndex = 13;\r
@@ -1556,6 +1588,8 @@ namespace Handbrake
             // TabPage1\r
             // \r
             this.TabPage1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage1.Controls.Add(this.check_lAnamorphic);\r
+            this.TabPage1.Controls.Add(this.check_vfr);\r
             this.TabPage1.Controls.Add(this.label24);\r
             this.TabPage1.Controls.Add(this.drp_deNoise);\r
             this.TabPage1.Controls.Add(this.label11);\r
@@ -1582,10 +1616,36 @@ namespace Handbrake
             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, 215);\r
+            this.TabPage1.Size = new System.Drawing.Size(639, 226);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
             // \r
+            // check_lAnamorphic\r
+            // \r
+            this.check_lAnamorphic.AutoSize = true;\r
+            this.check_lAnamorphic.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_lAnamorphic.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_lAnamorphic.Location = new System.Drawing.Point(440, 166);\r
+            this.check_lAnamorphic.Name = "check_lAnamorphic";\r
+            this.check_lAnamorphic.Size = new System.Drawing.Size(131, 17);\r
+            this.check_lAnamorphic.TabIndex = 24;\r
+            this.check_lAnamorphic.Text = "Loose Anamorphic";\r
+            this.check_lAnamorphic.UseVisualStyleBackColor = false;\r
+            this.check_lAnamorphic.CheckedChanged += new System.EventHandler(this.check_lAnamorphic_CheckedChanged);\r
+            // \r
+            // check_vfr\r
+            // \r
+            this.check_vfr.AutoSize = true;\r
+            this.check_vfr.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_vfr.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_vfr.Location = new System.Drawing.Point(416, 36);\r
+            this.check_vfr.Name = "check_vfr";\r
+            this.check_vfr.Size = new System.Drawing.Size(48, 17);\r
+            this.check_vfr.TabIndex = 23;\r
+            this.check_vfr.Text = "VFR";\r
+            this.check_vfr.UseVisualStyleBackColor = false;\r
+            this.check_vfr.CheckedChanged += new System.EventHandler(this.check_vfr_CheckedChanged);\r
+            // \r
             // label24\r
             // \r
             this.label24.AutoSize = true;\r
@@ -1607,7 +1667,7 @@ namespace Handbrake
             "Weak",\r
             "Medium",\r
             "Strong"});\r
-            this.drp_deNoise.Location = new System.Drawing.Point(416, 91);\r
+            this.drp_deNoise.Location = new System.Drawing.Point(416, 111);\r
             this.drp_deNoise.Name = "drp_deNoise";\r
             this.drp_deNoise.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deNoise.TabIndex = 19;\r
@@ -1618,7 +1678,7 @@ namespace Handbrake
             this.label11.AutoSize = true;\r
             this.label11.BackColor = System.Drawing.Color.Transparent;\r
             this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label11.Location = new System.Drawing.Point(314, 94);\r
+            this.label11.Location = new System.Drawing.Point(314, 114);\r
             this.label11.Name = "label11";\r
             this.label11.Size = new System.Drawing.Size(58, 13);\r
             this.label11.TabIndex = 18;\r
@@ -1629,7 +1689,7 @@ namespace Handbrake
             this.check_deblock.AutoSize = true;\r
             this.check_deblock.BackColor = System.Drawing.Color.Transparent;\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(416, 37);\r
+            this.check_deblock.Location = new System.Drawing.Point(317, 59);\r
             this.check_deblock.Name = "check_deblock";\r
             this.check_deblock.Size = new System.Drawing.Size(72, 17);\r
             this.check_deblock.TabIndex = 15;\r
@@ -1653,7 +1713,7 @@ namespace Handbrake
             this.label4.AutoSize = true;\r
             this.label4.BackColor = System.Drawing.Color.Transparent;\r
             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label4.Location = new System.Drawing.Point(314, 66);\r
+            this.label4.Location = new System.Drawing.Point(314, 86);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(77, 13);\r
             this.label4.TabIndex = 16;\r
@@ -1670,7 +1730,7 @@ namespace Handbrake
             "yadif (Slow)",\r
             "yadif + mcdeint (Slower)",\r
             "yadif + mcdeint (Slowest)"});\r
-            this.drp_deInterlace_option.Location = new System.Drawing.Point(416, 63);\r
+            this.drp_deInterlace_option.Location = new System.Drawing.Point(416, 83);\r
             this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deInterlace_option.TabIndex = 17;\r
@@ -1681,7 +1741,7 @@ namespace Handbrake
             this.Check_ChapterMarkers.AutoSize = true;\r
             this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;\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.Location = new System.Drawing.Point(313, 189);\r
             this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";\r
             this.Check_ChapterMarkers.Size = new System.Drawing.Size(122, 17);\r
             this.Check_ChapterMarkers.TabIndex = 22;\r
@@ -1694,7 +1754,7 @@ namespace Handbrake
             this.CheckPixelRatio.AutoSize = true;\r
             this.CheckPixelRatio.BackColor = System.Drawing.Color.Transparent;\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.Location = new System.Drawing.Point(313, 166);\r
             this.CheckPixelRatio.Name = "CheckPixelRatio";\r
             this.CheckPixelRatio.Size = new System.Drawing.Size(121, 17);\r
             this.CheckPixelRatio.TabIndex = 21;\r
@@ -1707,7 +1767,7 @@ namespace Handbrake
             this.label6.AutoSize = true;\r
             this.label6.BackColor = System.Drawing.Color.Transparent;\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, 128);\r
+            this.label6.Location = new System.Drawing.Point(310, 144);\r
             this.label6.Name = "label6";\r
             this.label6.Size = new System.Drawing.Size(173, 13);\r
             this.label6.TabIndex = 20;\r
@@ -1867,7 +1927,7 @@ namespace Handbrake
             this.advancedOptions.Location = new System.Drawing.Point(14, 276);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(647, 241);\r
+            this.advancedOptions.Size = new System.Drawing.Size(647, 252);\r
             this.advancedOptions.TabIndex = 4;\r
             this.advancedOptions.TabStop = false;\r
             // \r
@@ -1912,13 +1972,25 @@ namespace Handbrake
             this.treeView_presets.TabIndex = 2;\r
             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);\r
             // \r
+            // lbl_vfr\r
+            // \r
+            this.lbl_vfr.AutoSize = true;\r
+            this.lbl_vfr.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_vfr.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_vfr.Location = new System.Drawing.Point(220, 193);\r
+            this.lbl_vfr.Name = "lbl_vfr";\r
+            this.lbl_vfr.Size = new System.Drawing.Size(52, 12);\r
+            this.lbl_vfr.TabIndex = 27;\r
+            this.lbl_vfr.Text = "(VFR On)";\r
+            this.lbl_vfr.Visible = false;\r
+            // \r
             // frmMain\r
             // \r
             this.AllowDrop = true;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(874, 566);\r
+            this.ClientSize = new System.Drawing.Size(874, 574);\r
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.btn_eCancel);\r
@@ -2111,6 +2183,11 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_showPresets;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;\r
         private System.Windows.Forms.TreeView treeView_presets;\r
+        internal System.Windows.Forms.CheckBox check_lAnamorphic;\r
+        internal System.Windows.Forms.CheckBox check_vfr;\r
+        internal System.Windows.Forms.CheckBox check_iPodAtom;\r
+        private System.Windows.Forms.CheckBox check_optimiseMP4;\r
+        internal System.Windows.Forms.Label lbl_vfr;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 9831a1039b6a5a94563138d21c9a5a7ad75e9818..dd6b4325ee8616aa6589494d939ef8445098adcb 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -709,6 +709,25 @@ namespace Handbrake
             }\r
         }\r
 \r
+        private void check_vfr_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            if (check_vfr.CheckState == CheckState.Checked)\r
+            {\r
+                check_detelecine.Enabled = false;\r
+                check_detelecine.CheckState = CheckState.Checked;\r
+                drp_videoFramerate.Enabled = false;\r
+                drp_videoFramerate.SelectedItem = "29.97";\r
+                lbl_vfr.Visible = true;\r
+            }\r
+            else\r
+            {\r
+                check_detelecine.Enabled = true;\r
+                drp_videoFramerate.Enabled = true;\r
+                drp_videoFramerate.SelectedItem = "Automatic";\r
+                lbl_vfr.Visible = false;\r
+            }\r
+        }\r
+\r
         private void CheckPixelRatio_CheckedChanged(object sender, EventArgs e)\r
         {\r
             text_width.Text = "";\r
@@ -716,6 +735,25 @@ namespace Handbrake
             text_width.BackColor = Color.White;\r
             text_height.BackColor = Color.White;\r
             CheckPixelRatio.BackColor = TabPage1.BackColor;\r
+\r
+            if (CheckPixelRatio.Checked)\r
+            {\r
+                check_lAnamorphic.Enabled = false;\r
+                check_lAnamorphic.Checked = false;\r
+            }\r
+            else\r
+                check_lAnamorphic.Enabled = true;\r
+        }\r
+\r
+        private void check_lAnamorphic_CheckedChanged(object sender, EventArgs e)\r
+        {\r
+            if (check_lAnamorphic.Checked)\r
+            {\r
+                CheckPixelRatio.Enabled = false;\r
+                CheckPixelRatio.Checked = false;\r
+            }\r
+            else\r
+                CheckPixelRatio.Enabled = true;\r
         }\r
 \r
         private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)\r
@@ -1287,7 +1325,12 @@ namespace Handbrake
             string grayscale = "";\r
             string pixelRatio = "";\r
             string ChapterMarkers = "";\r
-            // Returns Crop Query\r
+            string vfr = "";\r
+            string deblock = "";\r
+            string detelecine = "";\r
+            string lanamorphic = "";\r
+\r
+\r
 \r
             if (cropSetting == "Auto Crop")\r
                 cropOut = "";\r
@@ -1349,7 +1392,19 @@ namespace Handbrake
             if (Check_ChapterMarkers.Checked)\r
                 ChapterMarkers = " -m ";\r
 \r
-            string queryPictureSettings = cropOut + subtitles + deinterlace + grayscale + pixelRatio + ChapterMarkers;\r
+            if (check_deblock.Checked)\r
+                deblock = " --deblock";\r
+\r
+            if (check_detelecine.Checked)\r
+                detelecine = " --detelecine";\r
+\r
+            if (check_vfr.Checked)\r
+                vfr = " -V ";\r
+\r
+            if (check_lAnamorphic.Checked)\r
+                lanamorphic = " -P ";\r
+\r
+            string queryPictureSettings = cropOut + subtitles + deinterlace + deblock + detelecine + vfr + grayscale + pixelRatio + lanamorphic + ChapterMarkers;\r
             #endregion\r
 \r
             // Video Settings Tab\r
@@ -1363,8 +1418,6 @@ namespace Handbrake
             string videoFramerate = drp_videoFramerate.Text;\r
             string turboH264 = "";\r
             string largeFile = "";\r
-            string deblock = "";\r
-            string detelecine = "";\r
             string denoise = "";\r
             string CRF = CheckCRF.CheckState.ToString();\r
 \r
@@ -1407,11 +1460,6 @@ namespace Handbrake
             if (check_largeFile.Checked)\r
                 largeFile = " -4 ";\r
 \r
-            if (check_deblock.Checked)\r
-                deblock = " --deblock";\r
-\r
-            if (check_detelecine.Checked)\r
-                detelecine = " --detelecine";\r
 \r
             switch (drp_deNoise.Text)\r
             {\r
@@ -1432,7 +1480,7 @@ namespace Handbrake
                     break;\r
             }\r
 \r
-            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + CRF + twoPassEncoding + videoFramerate + turboH264 + largeFile + deblock + detelecine + denoise;\r
+            string queryVideoSettings = videoBitrate + videoFilesize + vidQSetting + CRF + twoPassEncoding + videoFramerate + turboH264 + largeFile + denoise;\r
             #endregion\r
 \r
             // Audio Settings Tab\r
@@ -1640,6 +1688,24 @@ namespace Handbrake
             {\r
                 CheckPixelRatio.CheckState = CheckState.Unchecked;\r
             }\r
+\r
+            if (presetQuery.LooseAnamorphic == true)\r
+            {\r
+                check_lAnamorphic.CheckState = CheckState.Checked;\r
+            }\r
+            else\r
+            {\r
+                check_lAnamorphic.CheckState = CheckState.Unchecked;\r
+            }\r
+\r
+            if (presetQuery.VFR == true)\r
+            {\r
+                check_vfr.CheckState = CheckState.Checked;\r
+            }\r
+            else\r
+            {\r
+                check_vfr.CheckState = CheckState.Unchecked;\r
+            }\r
             #endregion\r
 \r
             // Video Settings Tab\r