summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRodeo <[email protected]>2013-06-04 21:21:13 +0000
committerRodeo <[email protected]>2013-06-04 21:21:13 +0000
commit45caa095e42398b84ceca430af23a33568253ec8 (patch)
tree6863cf169d99fbb5993629186823cc3bed5f9f1a /scripts
parentd8b189aecdd4a033514ce031f069c8f139500023 (diff)
manicure: support new mixdowns added before 0.9.9.
Also, use "none" as the "None" mixdown; this is the name expected by libhb. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5552 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/manicure.rb64
1 files changed, 52 insertions, 12 deletions
diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index c6d2cdc3f..b8be37432 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -377,6 +377,10 @@ class Display
#Mixdowns
case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
when /Mono/
audioMixdowns << "mono"
when /Stereo/
@@ -385,10 +389,16 @@ class Display
audioMixdowns << "dpl1"
when /Dolby Pro Logic II/
audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
end
#Samplerates
@@ -765,6 +775,10 @@ class Display
#Mixdowns
case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
when /Mono/
audioMixdowns << "mono"
when /Stereo/
@@ -773,10 +787,16 @@ class Display
audioMixdowns << "dpl1"
when /Dolby Pro Logic II/
audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
end
#Samplerates
@@ -1159,6 +1179,10 @@ class Display
#Mixdowns
case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
when /Mono/
audioMixdowns << "mono"
when /Stereo/
@@ -1167,10 +1191,16 @@ class Display
audioMixdowns << "dpl1"
when /Dolby Pro Logic II/
audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
end
#Samplerates
@@ -1605,6 +1635,10 @@ class Display
#Mixdowns
case audioTrack["AudioMixdown"]
+ when "Mono (Left Only)"
+ audioMixdowns << "left_only"
+ when "Mono (Right Only)"
+ audioMixdowns << "right_only"
when /Mono/
audioMixdowns << "mono"
when /Stereo/
@@ -1613,10 +1647,16 @@ class Display
audioMixdowns << "dpl1"
when /Dolby Pro Logic II/
audioMixdowns << "dpl2"
- when /discrete/
- audioMixdowns << "6ch"
+ when /5.1/, /discrete/
+ audioMixdowns << "5point1"
+ when /6.1/
+ audioMixdowns << "6point1"
+ when "7.1 (5F/2R/LFE)"
+ audioMixdowns << "5_2_lfe"
+ when /7.1/
+ audioMixdowns << "7point1"
when /None/
- audioMixdowns << "auto"
+ audioMixdowns << "none"
end
#Samplerates