(no commit message)

diff --git a/fluidbook/tools/webvideo b/fluidbook/tools/webvideo
index e42645b8dae82182e469708145929d1ab43a270e..ef04f92e1bb6c4f6f3e662f4c736999207724581 100644 (file)
--- 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 ed949aead97c7bfc39c17282a1f9eafab7007f72..d8ab1e35f241f6a911119195d7efde7d46fdd474 100644 (file)
--- 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 865956c220ea58789fc2d247b88e22ec882040a2..d6ab6ec88d0ce9aee77274e56500d7068f42e9e7 100644 (file)
--- 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 {
 \r
        protected $origHTML;\r
 \r
-       public function __construct($book_id, $vdir, $whole) {\r
+       public function __construct($book_id, $vdir=null, $whole=true) {\r
                parent::__construct($book_id, $vdir, $whole);\r
                $this->version = 'html';\r
        }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index b3818e4450f5a660a430717315e772ec02dc4d14..39a3e3d2fa7a01bf4ecc756eb3933fe7a3ed1384 100644 (file)
--- 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 1d933204d7754353379728defa3141d5dfd36e75..c3f71b981854c96d99fc5336ea88be1cc88fb62e 100644 (file)
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -54,6 +54,7 @@
   <libraryPaths>\r
     <element path="flash.swc" />\r
     <element path="..\..\..\as3\scroll.swc" />\r
+    <element path="..\..\..\as\as3\scroll.swc" />\r
   </libraryPaths>\r
   <!-- External Libraries -->\r
   <externalLibraryPaths>\r