From fa077e391b3e7a6b0ad189ccce5a4b789bcda241 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 31 Jan 2012 16:53:59 +0000
Subject: [PATCH]

---
 fluidbook/tools/webvideo                        | 9 ++++-----
 inc/ws/Util/html5/class.ws.html5.compiler.php   | 2 --
 inc/ws/Util/packager/class.ws.packager.html.php | 2 +-
 inc/ws/Util/packager/class.ws.packager.v1.php   | 8 ++++----
 swf/_src/WSComposer.as3proj                     | 1 +
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/fluidbook/tools/webvideo b/fluidbook/tools/webvideo
index e42645b8d..ef04f92e1 100644
--- a/fluidbook/tools/webvideo
+++ b/fluidbook/tools/webvideo
@@ -5,11 +5,10 @@ extension=${filename##*.}
 filename=${filename%.*}
 
 
-ulimit -t 3600;/usr/local/bin/ffmpeg -i $1 -y -r 1 -ss 00:00:04 -t 00:00:01 -f image2 $2/$filename.jpg
-ulimit -t 3600;/usr/local/bin/ffmpeg -i $1 -keyint_min 0 -g 250 -skip_threshold 0 -qmin 1 -qmax 51 -vcodec libvpx -b 614400 -acodec libvorbis -y $2/$filename.webm
+/usr/local/bin/ffmpeg -i $1 -y -r 1 -ss 00:00:04 -t 00:00:01 -f image2 $2/$filename.jpg
 if [ extension != "mp4" ]
 then
-	ulimit -t 3600;/usr/bin/ffmpeg -i $1 \
+/usr/bin/ffmpeg -i $1 \
 -y \
 -acodec aac \
 -ab 64k \
@@ -35,8 +34,8 @@ then
 -qmin 10 -qmax 51 \
 -qdiff 4 \
 -ac 1 \
--ar 16000 \
 -r 13 \
 $2/$filename.mp4
 fi
-ulimit -t 3600;/usr/local/bin/ffmpeg2theora $1 -o $2/$filename.ogv
+/usr/local/bin/ffmpeg2theora $1 -o $2/$filename.ogv
+/usr/local/bin/ffmpeg -i $1 -keyint_min 0 -g 250 -skip_threshold 0 -qmin 1 -qmax 51 -vcodec libvpx -b 614400 -acodec libvorbis -y $2/$filename.webm
\ No newline at end of file
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index ed949aead..d8ab1e35f 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -1023,8 +1023,6 @@ class wsHTML5Compiler {
 	}
 
 	public function copyLinkFile($source, $dest, $video=false) {
-		// TODO delete that return;
-		//return;
 		$origDir = WS_BOOKS . '/working/' . $this->book_id . '/';
 		$types = array('mp4', 'ogv', 'webm', 'jpg');
 		if ($video) {
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index 865956c22..d6ab6ec88 100644
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -4,7 +4,7 @@ class wsPackagerHTML extends wsPackager {
 
 	protected $origHTML;
 
-	public function __construct($book_id, $vdir, $whole) {
+	public function __construct($book_id, $vdir=null, $whole=true) {
 		parent::__construct($book_id, $vdir, $whole);
 		$this->version = 'html';
 	}
diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index b3818e445..39a3e3d2f 100644
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -4,7 +4,7 @@ class wsPackagerV1 extends wsPackagerHTML {
 
 	protected $size;
 
-	public function __construct($book_id, $vdir, $whole) {
+	public function __construct($book_id, $vdir=null, $whole=true) {
 		global $core;
 
 		parent::__construct($book_id, $vdir, $whole);
@@ -195,8 +195,8 @@ class wsPackagerV1 extends wsPackagerHTML {
 
 			$this->_copyWorkingFile($v);
 
-			$xml->addChild($k, $v);
-			$extras->addChild($k, $v);
+			$xml->addChild($k, html::escapeHTML($v));
+			$extras->addChild($k, html::escapeHTML($v));
 		}
 
 		$colors = $xml->addChild('colors');
@@ -250,7 +250,7 @@ class wsPackagerV1 extends wsPackagerHTML {
 	protected function _copyWorkingFile($file, $dir = null) {
 
 		if (is_null($dir)) {
-			$dir = $this->workingDir . '/data/';
+			$dir = $this->vdir . '/data/';
 		}
 
 		$src = $this->workingDir . '/' . $file;
diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index 1d933204d..c3f71b981 100644
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -54,6 +54,7 @@
   <libraryPaths>
     <element path="flash.swc" />
     <element path="..\..\..\as3\scroll.swc" />
+    <element path="..\..\..\as\as3\scroll.swc" />
   </libraryPaths>
   <!-- External Libraries -->
   <externalLibraryPaths>
-- 
2.39.5