Updates manicure to parse the new way of setting iPod-compatible encodes in MacGui presets, and includes the new presets in the CLI.

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

1 files changed, 24 insertions, 24 deletions

diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 924070298..8a32a0b52 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -285,13 +285,7 @@ class Display
     #Video encoder
     if hash["VideoEncoder"] != "FFmpeg"
       commandString << " -e "
-      if hash["VideoEncoder"] == "x264 (h.264 Main)"
-        commandString << "x264"
-      elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
-        commandString << "x264b30"
-      else
-        commandString << hash["VideoEncoder"].to_s.downcase
-      end
+      commandString << hash["VideoEncoder"].to_s.downcase
     end
 
     #VideoRateControl
@@ -341,6 +335,11 @@ class Display
       commandString << "mkv"
     end
     
+    #iPod MP4 atom
+    if hash["Mp4iPodCompatible"].to_i == 1
+      commandString << " -I"
+    end
+    
     #Cropping
     if !hash["PictureAutoCrop"].to_i
       commandString << " --crop "
@@ -425,13 +424,7 @@ class Display
     #Video encoder
     if hash["VideoEncoder"] != "FFmpeg"
       commandString << " -e "
-      if hash["VideoEncoder"] == "x264 (h.264 Main)"
-        commandString << "x264"
-      elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
-        commandString << "x264b30"
-      else
-        commandString << hash["VideoEncoder"].to_s.downcase
-      end
+      commandString << hash["VideoEncoder"].to_s.downcase
     end
 
     #VideoRateControl
@@ -481,6 +474,11 @@ class Display
       commandString << "mkv"
     end
     
+    #iPod MP4 atom
+    if hash["Mp4iPodCompatible"].to_i == 1
+      commandString << " -I"
+    end
+    
     #Cropping
     if !hash["PictureAutoCrop"].to_i
       commandString << " --crop "
@@ -574,13 +572,16 @@ class Display
       commandString << "mux = " << "HB_MUX_MKV;\n    "
     end
     
+    #iPod MP4 atom
+    if hash["Mp4iPodCompatible"].to_i == 1
+      commandString << "job->ipod_atom = 1;\n   "
+    end
+    
     #Video encoder
     if hash["VideoEncoder"] != "FFmpeg"
       commandString << "vcodec = "
-      if hash["VideoEncoder"] == "x264 (h.264 Main)"
+      if hash["VideoEncoder"] == "x264"
         commandString << "HB_VCODEC_X264;\n    "
-      elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
-        commandString << "HB_VCODEC_X264;\njob->h264_level = 30;\n    "
       elsif hash["VideoEncoder"].to_s.downcase == "xvid"
         commandString << "HB_VCODEC_XVID;\n    "        
       end
@@ -729,13 +730,7 @@ class Display
     #Video encoder
     if hash["VideoEncoder"] != "FFmpeg"
       commandString << " -e "
-      if hash["VideoEncoder"] == "x264 (h.264 Main)"
-        commandString << "x264"
-      elsif hash["VideoEncoder"] == "x264 (h.264 iPod)"
-        commandString << "x264b30"
-      else
-        commandString << hash["VideoEncoder"].to_s.downcase
-      end
+      commandString << hash["VideoEncoder"].to_s.downcase
     end
 
     #VideoRateControl
@@ -793,6 +788,11 @@ class Display
       commandString << "mkv"
     end
     
+    #iPod MP4 atom
+    if hash["Mp4iPodCompatible"].to_i == 1
+      commandString << " -I"
+    end
+    
     #Cropping
     if !hash["PictureAutoCrop"].to_i
       commandString << " --crop "