Browse Source

minor formatting + put metadata earlier into swf

Simon Krajewski 13 years ago
parent
commit
c40a5fd0dd
1 changed files with 7 additions and 11 deletions
  1. 7 11
      genswf.ml

+ 7 - 11
genswf.ml

@@ -1088,19 +1088,15 @@ let generate com swf_header =
 	let header, bg = (match swf_header with None -> default_header com | Some h -> convert_header com h) in
 	let header, bg = (match swf_header with None -> default_header com | Some h -> convert_header com h) in
 	let bg = tag (TSetBgColor { cr = bg lsr 16; cg = (bg lsr 8) land 0xFF; cb = bg land 0xFF }) in
 	let bg = tag (TSetBgColor { cr = bg lsr 16; cg = (bg lsr 8) land 0xFF; cb = bg land 0xFF }) in
 	let debug = (if isf9 && Common.defined com Define.Fdb then [tag (TEnableDebugger2 (0,""))] else []) in
 	let debug = (if isf9 && Common.defined com Define.Fdb then [tag (TEnableDebugger2 (0,""))] else []) in
-	let meta_data = try
-		let file = Common.defined_value com Define.SwfMetadata in
-		let file = try Common.find_file com file with Not_found -> file in
-			let data = (try
-				let s = Std.input_file ~bin:true file in
-				s;
-			with
-				| Sys_error _ -> failwith ("Resource file not found : " ^ file)
-			) in
+	let meta_data =
+		try
+			let file = Common.defined_value com Define.SwfMetadata in
+			let file = try Common.find_file com file with Not_found -> file in
+			let data = try Std.input_file ~bin:true file with Sys_error _ -> failwith ("Resource file not found : " ^ file) in
 			[tag(TMetaData (data))]
 			[tag(TMetaData (data))]
 		with Not_found -> 
 		with Not_found -> 
 			[]
 			[]
-		in
+	in
 	let fattr = (if com.flash_version < 8. then [] else
 	let fattr = (if com.flash_version < 8. then [] else
 		[tag (TFilesAttributes {
 		[tag (TFilesAttributes {
 			fa_network = Common.defined com Define.NetworkSandbox;
 			fa_network = Common.defined com Define.NetworkSandbox;
@@ -1123,7 +1119,7 @@ let generate com swf_header =
 	with Not_found ->
 	with Not_found ->
 		[]
 		[]
 	in
 	in
-	let swf = header, fattr @ bg :: debug @ swf_script_limits @ meta_data @ preframe @ tags @ [tag TShowFrame] in
+	let swf = header, fattr @ meta_data @ bg :: debug @ swf_script_limits @ preframe @ tags @ [tag TShowFrame] in
   (* merge swf libraries *)
   (* merge swf libraries *)
 	let priority = ref (swf_header = None) in
 	let priority = ref (swf_header = None) in
 	let swf = List.fold_left (fun swf (file,lib,cl) ->
 	let swf = List.fold_left (fun swf (file,lib,cl) ->