WinGui: Rename Mixdown Passthru to None

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

diff --git a/win/CS/Controls/AudioPanel.Designer.cs b/win/CS/Controls/AudioPanel.Designer.cs
index 4bc063b1859197dc8b754f8a73a01ccbfab36436..09d35c910ad782ba7692a02d85b025e734335c98 100644 (file)
--- a/win/CS/Controls/AudioPanel.Designer.cs
+++ b/win/CS/Controls/AudioPanel.Designer.cs
@@ -50,6 +50,13 @@ namespace Handbrake.Controls
             this.drp_audioSample = new System.Windows.Forms.ComboBox();\r
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);\r
             this.audioList = new System.Windows.Forms.DataGridView();\r
+            this.Source = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.AudioCodec = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Mixdown = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Samplerate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Bitrate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.DRC = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Gain = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.ToolTips = new System.Windows.Forms.ToolTip(this.components);\r
             this.btn_AdvancedAudio = new System.Windows.Forms.Button();\r
             this.btn_addAudioTrack = new wyDay.Controls.SplitButton();\r
@@ -58,13 +65,6 @@ namespace Handbrake.Controls
             this.btn_RemoveTrack = new wyDay.Controls.SplitButton();\r
             this.RemoveTrackMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.mnu_ClearAll = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.Source = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.AudioCodec = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Mixdown = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Samplerate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Bitrate = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.DRC = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
-            this.Gain = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.audioMenu.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.audioList)).BeginInit();\r
             this.AddTrackMenu.SuspendLayout();\r
@@ -160,6 +160,7 @@ namespace Handbrake.Controls
             this.drp_audioMix.FormattingEnabled = true;\r
             this.drp_audioMix.Items.AddRange(new object[] {\r
             "Automatic",\r
+            "None",\r
             "Mono",\r
             "Stereo",\r
             "Dolby Surround",\r
@@ -264,6 +265,74 @@ namespace Handbrake.Controls
             this.ToolTips.SetToolTip(this.audioList, "The audio tracks to be encoded into the output file.");\r
             this.audioList.SelectionChanged += new System.EventHandler(this.audioList_SelectionChanged);\r
             // \r
+            // Source\r
+            // \r
+            this.Source.DataPropertyName = "TrackDisplay";\r
+            this.Source.FillWeight = 49.69727F;\r
+            this.Source.HeaderText = "Source";\r
+            this.Source.Name = "Source";\r
+            this.Source.ReadOnly = true;\r
+            this.Source.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Source.Width = 170;\r
+            // \r
+            // AudioCodec\r
+            // \r
+            this.AudioCodec.DataPropertyName = "AudioEncoderDisplayValue";\r
+            this.AudioCodec.HeaderText = "Audio Codec";\r
+            this.AudioCodec.Name = "AudioCodec";\r
+            this.AudioCodec.ReadOnly = true;\r
+            this.AudioCodec.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.AudioCodec.Width = 120;\r
+            // \r
+            // Mixdown\r
+            // \r
+            this.Mixdown.DataPropertyName = "AudioMixdownDisplayValue";\r
+            this.Mixdown.FillWeight = 49.69727F;\r
+            this.Mixdown.HeaderText = "Mixdown";\r
+            this.Mixdown.Name = "Mixdown";\r
+            this.Mixdown.ReadOnly = true;\r
+            this.Mixdown.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Mixdown.Width = 150;\r
+            // \r
+            // Samplerate\r
+            // \r
+            this.Samplerate.DataPropertyName = "SampleRateDisplayValue";\r
+            this.Samplerate.FillWeight = 49.69727F;\r
+            this.Samplerate.HeaderText = "Samplerate";\r
+            this.Samplerate.Name = "Samplerate";\r
+            this.Samplerate.ReadOnly = true;\r
+            this.Samplerate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Samplerate.Width = 75;\r
+            // \r
+            // Bitrate\r
+            // \r
+            this.Bitrate.DataPropertyName = "BitRateDisplayValue";\r
+            this.Bitrate.FillWeight = 49.69727F;\r
+            this.Bitrate.HeaderText = "Bitrate";\r
+            this.Bitrate.Name = "Bitrate";\r
+            this.Bitrate.ReadOnly = true;\r
+            this.Bitrate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            this.Bitrate.Width = 75;\r
+            // \r
+            // DRC\r
+            // \r
+            this.DRC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
+            this.DRC.DataPropertyName = "DRC";\r
+            this.DRC.FillWeight = 96.36334F;\r
+            this.DRC.HeaderText = "DRC";\r
+            this.DRC.Name = "DRC";\r
+            this.DRC.ReadOnly = true;\r
+            this.DRC.Resizable = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.DRC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
+            // \r
+            // Gain\r
+            // \r
+            this.Gain.DataPropertyName = "Gain";\r
+            this.Gain.HeaderText = "Gain (dB)";\r
+            this.Gain.Name = "Gain";\r
+            this.Gain.ReadOnly = true;\r
+            this.Gain.Width = 60;\r
+            // \r
             // btn_AdvancedAudio\r
             // \r
             this.btn_AdvancedAudio.BackColor = System.Drawing.Color.Transparent;\r
@@ -335,74 +404,6 @@ namespace Handbrake.Controls
             this.mnu_ClearAll.Text = "Clear All";\r
             this.mnu_ClearAll.Click += new System.EventHandler(this.Mnu_clear_all_click);\r
             // \r
-            // Source\r
-            // \r
-            this.Source.DataPropertyName = "TrackDisplay";\r
-            this.Source.FillWeight = 49.69727F;\r
-            this.Source.HeaderText = "Source";\r
-            this.Source.Name = "Source";\r
-            this.Source.ReadOnly = true;\r
-            this.Source.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Source.Width = 170;\r
-            // \r
-            // AudioCodec\r
-            // \r
-            this.AudioCodec.DataPropertyName = "AudioEncoderDisplayValue";\r
-            this.AudioCodec.HeaderText = "Audio Codec";\r
-            this.AudioCodec.Name = "AudioCodec";\r
-            this.AudioCodec.ReadOnly = true;\r
-            this.AudioCodec.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.AudioCodec.Width = 120;\r
-            // \r
-            // Mixdown\r
-            // \r
-            this.Mixdown.DataPropertyName = "AudioMixdownDisplayValue";\r
-            this.Mixdown.FillWeight = 49.69727F;\r
-            this.Mixdown.HeaderText = "Mixdown";\r
-            this.Mixdown.Name = "Mixdown";\r
-            this.Mixdown.ReadOnly = true;\r
-            this.Mixdown.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Mixdown.Width = 150;\r
-            // \r
-            // Samplerate\r
-            // \r
-            this.Samplerate.DataPropertyName = "SampleRateDisplayValue";\r
-            this.Samplerate.FillWeight = 49.69727F;\r
-            this.Samplerate.HeaderText = "Samplerate";\r
-            this.Samplerate.Name = "Samplerate";\r
-            this.Samplerate.ReadOnly = true;\r
-            this.Samplerate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Samplerate.Width = 75;\r
-            // \r
-            // Bitrate\r
-            // \r
-            this.Bitrate.DataPropertyName = "BitRateDisplayValue";\r
-            this.Bitrate.FillWeight = 49.69727F;\r
-            this.Bitrate.HeaderText = "Bitrate";\r
-            this.Bitrate.Name = "Bitrate";\r
-            this.Bitrate.ReadOnly = true;\r
-            this.Bitrate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            this.Bitrate.Width = 75;\r
-            // \r
-            // DRC\r
-            // \r
-            this.DRC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
-            this.DRC.DataPropertyName = "DRC";\r
-            this.DRC.FillWeight = 96.36334F;\r
-            this.DRC.HeaderText = "DRC";\r
-            this.DRC.Name = "DRC";\r
-            this.DRC.ReadOnly = true;\r
-            this.DRC.Resizable = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.DRC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;\r
-            // \r
-            // Gain\r
-            // \r
-            this.Gain.DataPropertyName = "Gain";\r
-            this.Gain.HeaderText = "Gain (dB)";\r
-            this.Gain.Name = "Gain";\r
-            this.Gain.ReadOnly = true;\r
-            this.Gain.Width = 60;\r
-            // \r
             // AudioPanel\r
             // \r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r

diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 1b9b331c6c12d1b83ace360eb08b321c554b0b61..4a89d8264406815625605e29acb8267722c49d6e 100644 (file)
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -175,7 +175,7 @@ namespace Handbrake.Controls
                 if (track.Encoder == AudioEncoder.Ac3Passthrough || track.Encoder == AudioEncoder.DtsPassthrough ||\r
                     track.Encoder == AudioEncoder.DtsHDPassthrough || track.Encoder == AudioEncoder.AacPassthru || track.Encoder == AudioEncoder.Mp3Passthru)\r
                 {\r
-                    track.MixDown = HandBrake.Interop.Model.Encoding.Mixdown.Passthrough;\r
+                    track.MixDown = HandBrake.Interop.Model.Encoding.Mixdown.None;\r
                     track.Bitrate = 0;\r
                 }\r
 \r

diff --git a/win/CS/Controls/AudioPanel.resx b/win/CS/Controls/AudioPanel.resx
index 696d4eed5a3fdfa22c05b01448f810b7170cf51e..a361bc4010e23b603f5eefc9ccaec3032203c760 100644 (file)
--- a/win/CS/Controls/AudioPanel.resx
+++ b/win/CS/Controls/AudioPanel.resx
@@ -123,6 +123,9 @@
   <metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>330, 16</value>\r
   </metadata>\r
+  <metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>330, 16</value>\r
+  </metadata>\r
   <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>35, 17</value>\r
   </metadata>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
index fac4dd17c226a82f163455c343e824076c7075dc..34f9db46e88091039f5f9a671c816956122b5bce 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs
@@ -91,7 +91,7 @@ namespace HandBrake.ApplicationServices.Functions
                 case "6 Channel Discrete":\r
                     return Mixdown.SixChannelDiscrete;\r
                 case "Passthru":\r
-                    return Mixdown.Passthrough;\r
+                    return Mixdown.None;\r
                 default:\r
                     return Mixdown.Auto;\r
             }\r
@@ -107,7 +107,7 @@ namespace HandBrake.ApplicationServices.Functions
             switch (selectedAudio)\r
             {\r
                 case Mixdown.Auto:\r
-                case Mixdown.Passthrough:\r
+                case Mixdown.None:\r
                     return "auto";\r
                 case Mixdown.Mono:\r
                     return "mono";\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
index 5138bbeb9c1ae117e23e33fa6b60b19a89c32eac..f804c4ea2d522a85dc269131f38bf1b4f04d0adc 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs
@@ -19,7 +19,7 @@ namespace HandBrake.Interop.Model.Encoding
                [Display(Name = "Dolby Pro Logic II")]\r
                DolbyProLogicII = 0,\r
 \r
-               [Display(Name = "Auto")]\r
+               [Display(Name = "Automatic")]\r
                Auto,\r
 \r
                [Display(Name = "Mono")]\r
@@ -34,7 +34,7 @@ namespace HandBrake.Interop.Model.Encoding
                [Display(Name = "6 Channel Discrete")]\r
                SixChannelDiscrete,\r
 \r
-        [Display(Name = "Passthru")]\r
-        Passthrough,\r
+        [Display(Name = "None")]\r
+        None,\r
        }\r
 }\r