diff options
Diffstat (limited to 'win/CS')
8 files changed, 24 insertions, 10 deletions
diff --git a/win/CS/Controls/AudioPanel.Designer.cs b/win/CS/Controls/AudioPanel.Designer.cs index a9c8e56e1..3a4653853 100644 --- a/win/CS/Controls/AudioPanel.Designer.cs +++ b/win/CS/Controls/AudioPanel.Designer.cs @@ -176,7 +176,7 @@ namespace Handbrake.Controls "Stereo",
"Dolby Surround",
"Dolby Pro Logic II",
- "6 Channel Discrete"});
+ "6-channel discrete"});
this.drp_audioMix.Location = new System.Drawing.Point(309, 66);
this.drp_audioMix.Name = "drp_audioMix";
this.drp_audioMix.Size = new System.Drawing.Size(147, 21);
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs index 7ce9c318b..1d2ed8c41 100644 --- a/win/CS/Controls/AudioPanel.cs +++ b/win/CS/Controls/AudioPanel.cs @@ -977,7 +977,7 @@ namespace Handbrake.Controls drp_audioMix.Items.Add("Stereo");
drp_audioMix.Items.Add("Dolby Surround");
drp_audioMix.Items.Add("Dolby Pro Logic II");
- drp_audioMix.Items.Add("6 Channel Discrete");
+ drp_audioMix.Items.Add("6-channel discrete");
drp_audioMix.Items.Add(None);
switch (drp_audioEncoder.Text)
@@ -988,7 +988,7 @@ namespace Handbrake.Controls drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II";
break;
case "MP3 (lame)":
- drp_audioMix.Items.Remove("6 Channel Discrete");
+ drp_audioMix.Items.Remove("6-channel discrete");
drp_audioMix.Items.Remove(None);
drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II";
break;
diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs index b7a9d3071..2974d4fbc 100644 --- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs @@ -66,7 +66,7 @@ namespace HandBrake.ApplicationServices.Functions case "dpl2":
return "Dolby Pro Logic II";
case "6ch":
- return "6 Channel Discrete";
+ return "6-channel discrete";
default:
return "Automatic";
}
@@ -89,7 +89,7 @@ namespace HandBrake.ApplicationServices.Functions return Mixdown.DolbySurround;
case "Dolby Pro Logic II":
return Mixdown.DolbyProLogicII;
- case "6 Channel Discrete":
+ case "6-channel discrete":
return Mixdown.SixChannelDiscrete;
case "None":
case "Passthru":
diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs index 55b8e9e25..33b872796 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs @@ -146,6 +146,9 @@ namespace HandBrake.ApplicationServices.Services {
preset.Query = update.Query;
preset.Task = update.Task;
+ preset.AudioPassthruSettings = update.AudioPassthruSettings;
+ preset.CropSettings = update.CropSettings;
+ preset.UsePictureFilters = update.UsePictureFilters;
// Update the presets file
this.UpdatePresetFiles();
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs index 1d2e4d3af..f8e5d489e 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs @@ -472,6 +472,13 @@ namespace HandBrake.ApplicationServices.Utilities /// </param>
private static void AddEncodeSettings(XmlTextWriter xmlWriter, EncodeTask parsed, Preset preset)
{
+ AddEncodeElement(xmlWriter, "AudioAllowAACPass", "integer", parsed.AllowedPassthruOptions.AudioAllowAACPass ? "1" : "0");
+ AddEncodeElement(xmlWriter, "AudioAllowAC3Pass", "integer", parsed.AllowedPassthruOptions.AudioAllowAC3Pass ? "1" : "0");
+ AddEncodeElement(xmlWriter, "AudioAllowDTSHDPass", "integer", parsed.AllowedPassthruOptions.AudioAllowDTSHDPass ? "1" : "0");
+ AddEncodeElement(xmlWriter, "AudioAllowDTSPass", "integer", parsed.AllowedPassthruOptions.AudioAllowDTSPass ? "1" : "0");
+ AddEncodeElement(xmlWriter, "AudioAllowMP3Pass", "integer", parsed.AllowedPassthruOptions.AudioAllowMP3Pass ? "1" : "0");
+ AddEncodeElement(xmlWriter, "AudioEncoderFallback", "string", EnumHelper<AudioEncoder>.GetDisplay(parsed.AllowedPassthruOptions.AudioEncoderFallback));
+
AddEncodeElement(xmlWriter, "ChapterMarkers", "integer", parsed.IncludeChapterMarkers ? "1" : "0");
AddEncodeElement(xmlWriter, "Default", "integer", "0");
AddEncodeElement(xmlWriter, "FileFormat", "string", Converters.GetFileFormat(parsed.OutputFormat) + " file");
@@ -698,13 +705,13 @@ namespace HandBrake.ApplicationServices.Utilities xmlWriter.WriteElementString("string", audioTrack.Bitrate.ToString());
xmlWriter.WriteElementString("key", "AudioEncoder");
- xmlWriter.WriteElementString("string", EnumHelper<Enum>.GetDescription(audioTrack.Encoder));
+ xmlWriter.WriteElementString("string", EnumHelper<AudioEncoder>.GetDisplay(audioTrack.Encoder));
xmlWriter.WriteElementString("key", "AudioMixdown");
- xmlWriter.WriteElementString("string", EnumHelper<Enum>.GetDescription(audioTrack.MixDown));
+ xmlWriter.WriteElementString("string", EnumHelper<Mixdown>.GetDisplay(audioTrack.MixDown));
xmlWriter.WriteElementString("key", "AudioSamplerate");
- xmlWriter.WriteElementString("string", audioTrack.SampleRate.ToString());
+ xmlWriter.WriteElementString("string", audioTrack.SampleRate.ToString().Replace("0", "Auto"));
xmlWriter.WriteElementString("key", "AudioTrack");
xmlWriter.WriteElementString("integer", audioTrack.Track.ToString());
@@ -715,6 +722,9 @@ namespace HandBrake.ApplicationServices.Utilities xmlWriter.WriteElementString("key", "AudioTrackDescription");
xmlWriter.WriteElementString("string", "Unknown");
+ xmlWriter.WriteElementString("key", "AudioTrackGainSlider");
+ xmlWriter.WriteElementString("real", audioTrack.Gain.ToString());
+
xmlWriter.WriteEndElement();
}
#endregion
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs index 9857bb6ad..e13337ea7 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs @@ -144,7 +144,7 @@ namespace HandBrake.Interop.Model /// <returns>The highest possible mixdown for that audio encoder.</returns> public static int GetMaxMixdownIndex(HBAudioEncoder audioEncoder) { - // To find best case scenario, pass in highest number of channels and 6 channel discrete mixdown. + // To find best case scenario, pass in highest number of channels and 6-channel discrete mixdown. int maxMixdownId = HBFunctions.hb_get_best_mixdown((uint)audioEncoder.Id, NativeConstants.HB_INPUT_CH_LAYOUT_3F4R, NativeConstants.HB_AMIXDOWN_6CH); for (int i = 0; i < Mixdowns.Count; i++) diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs index 3fc6b78e4..280a5cd2d 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Mixdown.cs @@ -31,7 +31,7 @@ namespace HandBrake.Interop.Model.Encoding [Display(Name = "Dolby Surround")]
DolbySurround,
- [Display(Name = "6 Channel Discrete")]
+ [Display(Name = "6-channel discrete")]
SixChannelDiscrete,
[Display(Name = "None")]
diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs index 4e7862d99..85d854eb6 100644 --- a/win/CS/frmMain.cs +++ b/win/CS/frmMain.cs @@ -553,6 +553,7 @@ namespace Handbrake Name = this.treeView_presets.SelectedNode.Text,
Query = query,
CropSettings = (result == DialogResult.Yes),
+ AudioPassthruSettings = this.AudioSettings.PassthruSettings,
Task = QueryParserUtility.Parse(query),
};
|