summaryrefslogtreecommitdiffstats
path: root/scripts/manicure.rb
diff options
context:
space:
mode:
authorjbrjake <[email protected]>2008-11-08 20:57:27 +0000
committerjbrjake <[email protected]>2008-11-08 20:57:27 +0000
commitdf4163cccd4aa35fcc4271d7f2c155116531b4c7 (patch)
treef2fc79ff87607a07ae46cf86e3f8c6dd0bf82727 /scripts/manicure.rb
parentfa63e466c782f2d803cd800148fdfd266d26bfe7 (diff)
CLI: Adds some conidtionals to manicure.rb so CLI users can override audio settings and x264 options when using built-in presets.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1906 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'scripts/manicure.rb')
-rwxr-xr-xscripts/manicure.rb30
1 files changed, 24 insertions, 6 deletions
diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 4dc86916a..ce5c63f2e 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -992,7 +992,9 @@ class Display
end
#Audio tracks
- commandString << "atracks = strdup(\""
+ commandString << "if( !atracks )\n "
+ commandString << "{\n "
+ commandString << " atracks = strdup(\""
commandString << hash["Audio1Track"].to_s
if hash["Audio2Track"]
commandString << "," << hash["Audio2Track"].to_s
@@ -1004,9 +1006,12 @@ class Display
commandString << "," << hash["Audio4Track"].to_s
end
commandString << "\");\n "
+ commandString << "}\n "
# Audio bitrate
- commandString << "abitrates = strdup(\""
+ commandString << "if( !abitrates )\n "
+ commandString << "{\n "
+ commandString << " abitrates = strdup(\""
if hash["Audio1Encoder"] != "AC3 Passthru"
commandString << hash["Audio1Bitrate"]
else
@@ -1034,9 +1039,12 @@ class Display
end
end
commandString << "\");\n "
+ commandString << "}\n "
#Audio samplerate
- commandString << "arates = strdup(\""
+ commandString << "if( !arates )\n "
+ commandString << "{\n "
+ commandString << " arates = strdup(\""
commandString << hash["Audio1Samplerate"]
if hash["Audio2Samplerate"]
commandString << "," << hash["Audio2Samplerate"]
@@ -1048,9 +1056,12 @@ class Display
commandString << "," << hash["Audio4Samplerate"]
end
commandString << "\");\n "
+ commandString << "}\n "
#Audio encoder
- commandString << "acodecs = strdup(\""
+ commandString << "if( !acodecs )\n "
+ commandString << "{\n "
+ commandString << " acodecs = strdup(\""
case hash["Audio1Encoder"]
when /AC3/
commandString << "ac3"
@@ -1092,9 +1103,12 @@ class Display
commandString << ",lame"
end
commandString << "\");\n "
+ commandString << "}\n "
#Audio mixdowns
- commandString << "mixdowns = strdup(\""
+ commandString << "if( !mixdowns )\n "
+ commandString << "{\n "
+ commandString << " mixdowns = strdup(\""
case hash["Audio1Mixdown"]
when /Mono/
commandString << "mono"
@@ -1158,6 +1172,7 @@ class Display
end
end
commandString << "\");\n "
+ commandString << "}\n "
#Cropping
if hash["PictureAutoCrop"] == 0
@@ -1189,8 +1204,11 @@ class Display
#x264 Options
if hash["x264Option"] != ""
- commandString << "x264opts = strdup(\""
+ commandString << "if( !x264opts )\n "
+ commandString << "{\n "
+ commandString << " x264opts = strdup(\""
commandString << hash["x264Option"] << "\");\n "
+ commandString << "}\n "
end
#Video Filters