Don't expose rate, mixdown, dither and encoder arrays to the UIs.

- instead, make these lists available through enumerators:
--> hb_*_get_next(<type> *last);

- this should give us more flexibility to populate the lists at runtime, using the implementation(s) of our choice, whether they use arrays or not, without requiring UI modifications

- use consistent naming for getters
--> hb_get_best_foo() becomes hb_foo_get_best(), and so on

- hb_*_get_from_name() and hb_*_ sanitize_name() sanitize the requested value to a supported one if it's unavailable

- adds an additional, passthru-specific fallback mechanism

- adds a list of video containers



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

1 files changed, 19 insertions, 3 deletions

diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 4dc9b8db7..c6d2cdc3f 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -273,9 +273,9 @@ class Display
     
     #Filename suffix
     case hash["FileFormat"]
-    when /MP4/
+    when /MPEG-4/, /MP4/
       commandString << "mp4 "
-    when /MKV/
+    when /Matroska/, /MKV/
       commandString << "mkv "
     end
     
@@ -477,8 +477,12 @@ class Display
     #Container
     commandString << " -f "
     case hash["FileFormat"]
+    when "MPEG-4 (mp4v2)"
+      commandString << "mp4v2"
     when /MP4/
       commandString << "mp4"
+    when "Matroska (libmkv)"
+      commandString << "libmkv"
     when /MKV/
       commandString << "mkv"
     end
@@ -861,8 +865,12 @@ class Display
     #Container
     commandString << " -f "
     case hash["FileFormat"]
+    when "MPEG-4 (mp4v2)"
+      commandString << "mp4v2"
     when /MP4/
       commandString << "mp4"
+    when "Matroska (libmkv)"
+      commandString << "libmkv"
     when /MKV/
       commandString << "mkv"
     end
@@ -1020,13 +1028,17 @@ class Display
     
     commandString = "if (!strcasecmp(preset_name, \"" << hash["PresetName"] << "\"))\n{\n    "
     
-    #Filename suffix
+    #Container
     commandString << "if( !mux )\n    "
     commandString << "{\n    "
 
     case hash["FileFormat"]
+    when "MPEG-4 (mp4v2)"
+      commandString << "    mux = " << "HB_MUX_MP4V2;\n    "
     when /MP4/
       commandString << "    mux = " << "HB_MUX_MP4;\n    "
+    when "Matroska (libmkv)"
+      commandString << "    mux = " << "HB_MUX_LIBMKV;\n    "
     when /MKV/
       commandString << "    mux = " << "HB_MUX_MKV;\n    "
     end
@@ -1693,8 +1705,12 @@ class Display
     #Container
     commandString << " -f "
     case hash["FileFormat"]
+    when "MPEG-4 (mp4v2)"
+      commandString << "mp4v2"
     when /MP4/
       commandString << "mp4"
+    when "Matroska (libmkv)"
+      commandString << "libmkv"
     when /MKV/
       commandString << "mkv"
     end