summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2016-01-03 21:12:34 +0000
committersr55 <[email protected]>2016-01-03 21:12:34 +0000
commit5e6b7a64fd8b9637dc511b060cc15bc4137fa1f3 (patch)
treefe4367e98f4a6c1409feced22ba92ed9985ea780 /win
parent018396ad1821b2ae1fbdd6b3373fa93ec0f2b8ac (diff)
WinGui: Don't set mixdown to dpl2 for Passthru. Should now use internal libhb defaults.
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Mixdown.cs4
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Mixdown.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Mixdown.cs
index 05f554e6b..66a2d4e1a 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Mixdown.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Mixdown.cs
@@ -22,11 +22,11 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
DolbyProLogicII = 0,
[Display(Name = "None")]
- [ShortName("dpl2")]
+ [ShortName("none")]
None,
[Display(Name = "Automatic")]
- [ShortName("dpl2")]
+ [ShortName("none")]
Auto,
[Display(Name = "Mono")]
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index dea5f41e6..87e6caaaa 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -143,7 +143,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
{
get
{
- return this.mixDown;
+ return this.IsPassthru ? Mixdown.Auto : this.mixDown;
}
set