LinGui: change the top level structure that contains presets from a dictionary

to an array.  Dictionaries are unordered sets, so this new structure
allows greater flexibility in how the presets may be ordered.
Is backwards compatible.  Old structure is read and converted to new.


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

1 files changed, 38 insertions, 20 deletions

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 37fc524da..5ae60679d 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>Animation</key>
+<array>
 	<dict>
+		<key>preset_name</key>
+		<string>Animation</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autocrop</key>
@@ -72,8 +73,9 @@
 		<key>x264_options</key>
 		<string>ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</string>
 	</dict>
-	<key>AppleTV</key>
 	<dict>
+		<key>preset_name</key>
+		<string>AppleTV</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autoscale</key>
@@ -152,8 +154,9 @@
 		<key>x264_options</key>
 		<string>bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0</string>
 	</dict>
-	<key>Bedlam</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Bedlam</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autocrop</key>
@@ -222,8 +225,9 @@
 		<key>x264_options</key>
 		<string>ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1</string>
 	</dict>
-	<key>Blind</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Blind</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -292,8 +296,9 @@
 		<key>x264_options</key>
 		<string></string>
 	</dict>
-	<key>Broke</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Broke</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -362,8 +367,9 @@
 		<key>x264_options</key>
 		<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
 	</dict>
-	<key>Classic</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Classic</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -430,8 +436,9 @@
 		<key>x264_options</key>
 		<string></string>
 	</dict>
-	<key>Constant Quality Rate</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Constant Quality Rate</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autocrop</key>
@@ -500,8 +507,9 @@
 		<key>x264_options</key>
 		<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>
 	</dict>
-	<key>Deux Six Quatre</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Deux Six Quatre</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autocrop</key>
@@ -570,8 +578,9 @@
 		<key>x264_options</key>
 		<string>ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
 	</dict>
-	<key>Film</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Film</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autocrop</key>
@@ -640,8 +649,9 @@
 		<key>x264_options</key>
 		<string>ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip</string>
 	</dict>
-	<key>Normal</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Normal</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autocrop</key>
@@ -710,8 +720,9 @@
 		<key>x264_options</key>
 		<string>ref=2:bframes=2:me=umh</string>
 	</dict>
-	<key>PS3</key>
 	<dict>
+		<key>preset_name</key>
+		<string>PS3</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autoscale</key>
@@ -776,8 +787,9 @@
 		<key>x264_options</key>
 		<string>level=41:me=umh</string>
 	</dict>
-	<key>PSP</key>
 	<dict>
+		<key>preset_name</key>
+		<string>PSP</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -844,8 +856,9 @@
 		<key>x264_options</key>
 		<string></string>
 	</dict>
-	<key>QuickTime</key>
 	<dict>
+		<key>preset_name</key>
+		<string>QuickTime</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autocrop</key>
@@ -914,8 +927,9 @@
 		<key>x264_options</key>
 		<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip</string>
 	</dict>
-	<key>Television</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Television</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -984,8 +998,9 @@
 		<key>x264_options</key>
 		<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>
 	</dict>
-	<key>Xbox 360</key>
 	<dict>
+		<key>preset_name</key>
+		<string>Xbox 360</string>
 		<key>anamorphic</key>
 		<true />
 		<key>autoscale</key>
@@ -1050,8 +1065,9 @@
 		<key>x264_options</key>
 		<string>level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>
 	</dict>
-	<key>iPhone / iPod Touch</key>
 	<dict>
+		<key>preset_name</key>
+		<string>iPhone / iPod Touch</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -1120,8 +1136,9 @@
 		<key>x264_options</key>
 		<string>level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1</string>
 	</dict>
-	<key>iPod High-Rez</key>
 	<dict>
+		<key>preset_name</key>
+		<string>iPod High-Rez</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -1190,8 +1207,9 @@
 		<key>x264_options</key>
 		<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1</string>
 	</dict>
-	<key>iPod Low-Rez</key>
 	<dict>
+		<key>preset_name</key>
+		<string>iPod Low-Rez</string>
 		<key>anamorphic</key>
 		<false />
 		<key>autocrop</key>
@@ -1260,5 +1278,5 @@
 		<key>x264_options</key>
 		<string>level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1</string>
 	</dict>
-</dict>
+</array>
 </plist>