]> granicus.if.org Git - handbrake/commitdiff
WinGui: Don't set mixdown to dpl2 for Passthru. Should now use internal libhb defaults.
authorsr55 <sr55.hb@outlook.com>
Sun, 3 Jan 2016 21:12:34 +0000 (21:12 +0000)
committersr55 <sr55.hb@outlook.com>
Sun, 3 Jan 2016 21:12:34 +0000 (21:12 +0000)
win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Mixdown.cs
win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs

index 05f554e6b920f3dbe83da2a34cf26cc05bdfe396..66a2d4e1ad87e15f53c199cc0e7e11d388356e13 100644 (file)
@@ -22,11 +22,11 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
         DolbyProLogicII = 0,\r
 \r
         [Display(Name = "None")]\r
-        [ShortName("dpl2")]\r
+        [ShortName("none")]\r
         None,\r
 \r
         [Display(Name = "Automatic")]\r
-        [ShortName("dpl2")]\r
+        [ShortName("none")]\r
         Auto,\r
 \r
         [Display(Name = "Mono")]\r
index dea5f41e608b8495ac7a2432078dd87c3398bfff..87e6caaaa6c1f24f83f2fdf722aa5b2adc3a2898 100644 (file)
@@ -143,7 +143,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
         {
             get
             {
-                return this.mixDown;
+                return this.IsPassthru ? Mixdown.Auto : this.mixDown;
             }
 
             set