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

diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs
index 4b23cc4c9788fc034b42a01e8d4d2e85c5436a09..a53663b4dab06517b4dbd49100ea4975107353f1 100644 (file)
--- a/win/CS/frmMain.Designer.cs
+++ b/win/CS/frmMain.Designer.cs
@@ -42,6 +42,7 @@ namespace Handbrake
             System.Windows.Forms.ContextMenuStrip notifyIconMenu;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            HandBrake.ApplicationServices.Model.Encoding.AllowedPassthru allowedPassthru1 = new HandBrake.ApplicationServices.Model.Encoding.AllowedPassthru();\r
             this.btn_restore = new System.Windows.Forms.ToolStripMenuItem();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -98,7 +99,6 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.tab_audio = new System.Windows.Forms.TabPage();\r
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.tab_video = new System.Windows.Forms.TabPage();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
@@ -109,18 +109,13 @@ namespace Handbrake
             this.lbl_SliderValue = new System.Windows.Forms.Label();\r
             this.lbl_framerate = new System.Windows.Forms.Label();\r
             this.tab_picture = new System.Windows.Forms.TabPage();\r
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();\r
             this.tabs_panel = new System.Windows.Forms.TabControl();\r
             this.tab_filters = new System.Windows.Forms.TabPage();\r
-            this.Filters = new Handbrake.Controls.Filters();\r
             this.tab_subtitles = new System.Windows.Forms.TabPage();\r
-            this.Subtitles = new Handbrake.Controls.Subtitles();\r
             this.tab_chapters = new System.Windows.Forms.TabPage();\r
             this.label31 = new System.Windows.Forms.Label();\r
             this.tab_advanced = new System.Windows.Forms.TabPage();\r
-            this.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts();\r
-            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             this.tab_query = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -166,6 +161,7 @@ namespace Handbrake
             this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar();\r
             this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.lbl_updateCheck = new System.Windows.Forms.ToolStripStatusLabel();\r
+            this.lbl_libhb_warning = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.hbproc = new System.Diagnostics.Process();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();\r
@@ -184,7 +180,12 @@ namespace Handbrake
             this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();\r
             this.openPreset = new System.Windows.Forms.OpenFileDialog();\r
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();\r
-            this.lbl_libhb_warning = new System.Windows.Forms.ToolStripStatusLabel();\r
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();\r
+            this.Filters = new Handbrake.Controls.Filters();\r
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();\r
+            this.Subtitles = new Handbrake.Controls.Subtitles();\r
+            this.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts();\r
+            this.x264Panel = new Handbrake.Controls.x264Panel();\r
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             notifyIconMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
@@ -823,15 +824,6 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";\r
             this.tab_audio.UseVisualStyleBackColor = true;\r
             // \r
-            // AudioSettings\r
-            // \r
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.AudioSettings.Name = "AudioSettings";\r
-            this.AudioSettings.Size = new System.Drawing.Size(720, 310);\r
-            this.AudioSettings.TabIndex = 0;\r
-            // \r
             // AudioMenuRowHeightHack\r
             // \r
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;\r
@@ -951,18 +943,6 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";\r
             this.tab_picture.UseVisualStyleBackColor = true;\r
             // \r
-            // PictureSettings\r
-            // \r
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
-            this.PictureSettings.CurrentlySelectedPreset = null;\r
-            this.PictureSettings.Enabled = false;\r
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
-            this.PictureSettings.Name = "PictureSettings";\r
-            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);\r
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
-            this.PictureSettings.TabIndex = 0;\r
-            // \r
             // Check_ChapterMarkers\r
             // \r
             this.Check_ChapterMarkers.AutoSize = true;\r
@@ -1001,15 +981,6 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";\r
             this.tab_filters.UseVisualStyleBackColor = true;\r
             // \r
-            // Filters\r
-            // \r
-            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Filters.Location = new System.Drawing.Point(0, 0);\r
-            this.Filters.Name = "Filters";\r
-            this.Filters.Size = new System.Drawing.Size(713, 310);\r
-            this.Filters.TabIndex = 0;\r
-            // \r
             // tab_subtitles\r
             // \r
             this.tab_subtitles.Controls.Add(this.Subtitles);\r
@@ -1021,15 +992,6 @@ namespace Handbrake
             this.tab_subtitles.Text = "Subtitles";\r
             this.tab_subtitles.UseVisualStyleBackColor = true;\r
             // \r
-            // Subtitles\r
-            // \r
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
-            this.Subtitles.Name = "Subtitles";\r
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
-            this.Subtitles.TabIndex = 0;\r
-            // \r
             // tab_chapters\r
             // \r
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;\r
@@ -1069,26 +1031,6 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";\r
             this.tab_advanced.UseVisualStyleBackColor = true;\r
             // \r
-            // advancedEncoderOpts\r
-            // \r
-            this.advancedEncoderOpts.AdavancedQuery = "";\r
-            this.advancedEncoderOpts.BackColor = System.Drawing.Color.Transparent;\r
-            this.advancedEncoderOpts.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.advancedEncoderOpts.Location = new System.Drawing.Point(0, 0);\r
-            this.advancedEncoderOpts.Name = "advancedEncoderOpts";\r
-            this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209);\r
-            this.advancedEncoderOpts.TabIndex = 1;\r
-            // \r
-            // x264Panel\r
-            // \r
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
-            this.x264Panel.Name = "x264Panel";\r
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
-            this.x264Panel.TabIndex = 0;\r
-            this.x264Panel.X264Query = "";\r
-            // \r
             // tab_query\r
             // \r
             this.tab_query.Controls.Add(this.btn_clear);\r
@@ -1390,8 +1332,8 @@ namespace Handbrake
             // mnu_AddAllTitles\r
             // \r
             this.mnu_AddAllTitles.Name = "mnu_AddAllTitles";\r
-            this.mnu_AddAllTitles.Size = new System.Drawing.Size(152, 22);\r
-            this.mnu_AddAllTitles.Text = "Add All";\r
+            this.mnu_AddAllTitles.Size = new System.Drawing.Size(192, 22);\r
+            this.mnu_AddAllTitles.Text = "Add All (Experimental)";\r
             this.mnu_AddAllTitles.ToolTipText = "Add all titles to the queue.\r\nUse caution with this feature as incorrect usage ma" +\r
     "y result in a queue of failed encodes.";\r
             this.mnu_AddAllTitles.Click += new System.EventHandler(this.mnu_AddAllTitles_Click);\r
@@ -1399,7 +1341,7 @@ namespace Handbrake
             // mnu_AddTittleRange\r
             // \r
             this.mnu_AddTittleRange.Name = "mnu_AddTittleRange";\r
-            this.mnu_AddTittleRange.Size = new System.Drawing.Size(152, 22);\r
+            this.mnu_AddTittleRange.Size = new System.Drawing.Size(192, 22);\r
             this.mnu_AddTittleRange.Text = "Add Range";\r
             this.mnu_AddTittleRange.Visible = false;\r
             this.mnu_AddTittleRange.Click += new System.EventHandler(this.mnu_AddTittleRange_Click);\r
@@ -1553,6 +1495,14 @@ namespace Handbrake
             this.lbl_updateCheck.Text = "Checking for Updates ...";\r
             this.lbl_updateCheck.Visible = false;\r
             // \r
+            // lbl_libhb_warning\r
+            // \r
+            this.lbl_libhb_warning.ForeColor = System.Drawing.Color.Red;\r
+            this.lbl_libhb_warning.Name = "lbl_libhb_warning";\r
+            this.lbl_libhb_warning.Size = new System.Drawing.Size(198, 17);\r
+            this.lbl_libhb_warning.Text = "Warning: Experimental LibHB in use!";\r
+            this.lbl_libhb_warning.Visible = false;\r
+            // \r
             // hbproc\r
             // \r
             this.hbproc.StartInfo.Domain = "";\r
@@ -1768,13 +1718,71 @@ namespace Handbrake
             // \r
             this.File_ChapterImport.Filter = "CSV Files|*.csv";\r
             // \r
-            // lbl_libhb_warning\r
+            // PictureSettings\r
             // \r
-            this.lbl_libhb_warning.ForeColor = System.Drawing.Color.Red;\r
-            this.lbl_libhb_warning.Name = "lbl_libhb_warning";\r
-            this.lbl_libhb_warning.Size = new System.Drawing.Size(198, 17);\r
-            this.lbl_libhb_warning.Text = "Warning: Experimental LibHB in use!";\r
-            this.lbl_libhb_warning.Visible = false;\r
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.PictureSettings.CurrentlySelectedPreset = null;\r
+            this.PictureSettings.Enabled = false;\r
+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.PictureSettings.Name = "PictureSettings";\r
+            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);\r
+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);\r
+            this.PictureSettings.TabIndex = 0;\r
+            // \r
+            // Filters\r
+            // \r
+            this.Filters.BackColor = System.Drawing.Color.Transparent;\r
+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Filters.Location = new System.Drawing.Point(0, 0);\r
+            this.Filters.Name = "Filters";\r
+            this.Filters.Size = new System.Drawing.Size(713, 310);\r
+            this.Filters.TabIndex = 0;\r
+            // \r
+            // AudioSettings\r
+            // \r
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;\r
+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);\r
+            this.AudioSettings.Name = "AudioSettings";\r
+            allowedPassthru1.AudioAllowAACPass = true;\r
+            allowedPassthru1.AudioAllowAC3Pass = true;\r
+            allowedPassthru1.AudioAllowDTSHDPass = true;\r
+            allowedPassthru1.AudioAllowDTSPass = true;\r
+            allowedPassthru1.AudioAllowMP3Pass = true;\r
+            allowedPassthru1.AudioEncoderFallback = HandBrake.Interop.Model.Encoding.AudioEncoder.Ac3;\r
+            this.AudioSettings.PassthruSettings = allowedPassthru1;\r
+            this.AudioSettings.Size = new System.Drawing.Size(720, 310);\r
+            this.AudioSettings.TabIndex = 0;\r
+            // \r
+            // Subtitles\r
+            // \r
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;\r
+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);\r
+            this.Subtitles.Name = "Subtitles";\r
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);\r
+            this.Subtitles.TabIndex = 0;\r
+            // \r
+            // advancedEncoderOpts\r
+            // \r
+            this.advancedEncoderOpts.AdavancedQuery = "";\r
+            this.advancedEncoderOpts.BackColor = System.Drawing.Color.Transparent;\r
+            this.advancedEncoderOpts.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.advancedEncoderOpts.Location = new System.Drawing.Point(0, 0);\r
+            this.advancedEncoderOpts.Name = "advancedEncoderOpts";\r
+            this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209);\r
+            this.advancedEncoderOpts.TabIndex = 1;\r
+            // \r
+            // x264Panel\r
+            // \r
+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;\r
+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);\r
+            this.x264Panel.Name = "x264Panel";\r
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);\r
+            this.x264Panel.TabIndex = 0;\r
+            this.x264Panel.X264Query = "";\r
             // \r
             // frmMain\r
             // \r