Update built-in presets and manicure to use mixdown "None" for passthru

Thanks to Rodeo for patch


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

3 files changed, 36 insertions, 12 deletions

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 889173769..42bec2cd8 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -28,7 +28,7 @@
 						<key>AudioEncoder</key>
 						<string>AC3 Passthru</string>
 						<key>AudioMixdown</key>
-						<string>AC3 Passthru</string>
+						<string>None</string>
 						<key>AudioSamplerate</key>
 						<string>Auto</string>
 						<key>AudioTrack</key>
@@ -471,7 +471,7 @@
 						<key>AudioEncoder</key>
 						<string>AC3 Passthru</string>
 						<key>AudioMixdown</key>
-						<string>AC3 Passthru</string>
+						<string>None</string>
 						<key>AudioSamplerate</key>
 						<string>Auto</string>
 						<key>AudioTrack</key>
@@ -572,7 +572,7 @@
 						<key>AudioEncoder</key>
 						<string>AC3 Passthru</string>
 						<key>AudioMixdown</key>
-						<string>AC3 Passthru</string>
+						<string>None</string>
 						<key>AudioSamplerate</key>
 						<string>Auto</string>
 						<key>AudioTrack</key>
@@ -947,7 +947,7 @@
 						<key>AudioEncoder</key>
 						<string>AC3 Passthru</string>
 						<key>AudioMixdown</key>
-						<string>AC3 Passthru</string>
+						<string>None</string>
 						<key>AudioSamplerate</key>
 						<string>Auto</string>
 						<key>AudioTrack</key>
diff --git a/macosx/HBPresets.m b/macosx/HBPresets.m
index 49d154f22..fc37c1acf 100644
--- a/macosx/HBPresets.m
+++ b/macosx/HBPresets.m
@@ -245,7 +245,7 @@
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
     [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
     [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
     [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
     [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
     /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
@@ -357,7 +357,7 @@
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
     [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
     [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
     [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
     [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
     /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
@@ -665,7 +665,7 @@
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
     [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
     [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
     [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
     [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
     /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
@@ -870,7 +870,7 @@
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
     [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
     [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
-    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
     [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
     [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
     /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 4fca512ba..a732b63bd 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -343,6 +343,12 @@ class Display
           audioEncoders << "copy:ac3"
         when /AC3/
           audioEncoders << "ac3"
+        when /DTS Pass/
+          audioEncoders << "copy:dts"
+        when /DTS-HD Pass/
+          audioEncoders << "copy:dtshd"
+        when "AAC (ffmpeg)"
+          audioEncoders << "ffaac"
         when /AAC/
           audioEncoders << "faac"
         when /Vorbis/
@@ -363,7 +369,7 @@ class Display
         audioMixdowns << "dpl2"
       when /discrete/
         audioMixdowns << "6ch"
-      when /Passthru/
+      when /None/
         audioMixdowns << "auto"
       end
       
@@ -597,6 +603,12 @@ class Display
           audioEncoders << "copy:ac3"
         when /AC3/
           audioEncoders << "ac3"
+        when /DTS Pass/
+          audioEncoders << "copy:dts"
+        when /DTS-HD Pass/
+          audioEncoders << "copy:dtshd"
+        when "AAC (ffmpeg)"
+          audioEncoders << "ffaac"
         when /AAC/
           audioEncoders << "faac"
         when /Vorbis/
@@ -617,7 +629,7 @@ class Display
         audioMixdowns << "dpl2"
       when /discrete/
         audioMixdowns << "6ch"
-      when /Passthru/
+      when /None/
         audioMixdowns << "auto"
       end
       
@@ -846,6 +858,12 @@ class Display
           audioEncoders << "copy:ac3"
         when /AC3/
           audioEncoders << "ac3"
+        when /DTS Pass/
+          audioEncoders << "copy:dts"
+        when /DTS-HD Pass/
+          audioEncoders << "copy:dtshd"
+        when "AAC (ffmpeg)"
+          audioEncoders << "ffaac"
         when /AAC/
           audioEncoders << "faac"
         when /Vorbis/
@@ -866,7 +884,7 @@ class Display
         audioMixdowns << "dpl2"
       when /discrete/
         audioMixdowns << "6ch"
-      when /Passthru/
+      when /None/
         audioMixdowns << "auto"
       end
 
@@ -1132,6 +1150,12 @@ class Display
           audioEncoders << "copy:ac3"
         when /AC3/
           audioEncoders << "ac3"
+        when /DTS Pass/
+          audioEncoders << "copy:dts"
+        when /DTS-HD Pass/
+          audioEncoders << "copy:dtshd"
+        when "AAC (ffmpeg)"
+          audioEncoders << "ffaac"
         when /AAC/
           audioEncoders << "faac"
         when /Vorbis/
@@ -1152,7 +1176,7 @@ class Display
         audioMixdowns << "dpl2"
       when /discrete/
         audioMixdowns << "6ch"
-      when /Passthru/
+      when /None/
         audioMixdowns << "auto"
       end