(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 12a5b1345726a17870472ecb692ba9e1f059be71..9e153949d8b13c49604c5337f6dd1a4e88c32367 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -755,14 +755,14 @@ class wsDAOBook extends commonDAO {
                wsSVN::updateToLastRevision();\r
 \r
                $swf = 'FluidbookAirProjector' . $book_id;\r
-               $flex = new cubeFlexCompiler($swf, $compilerDir, 'com.fluidbook.player.AIRMain', $libs, '/usr/local/flex/bin/mxmlc', 10, 45, 800, 600, true);\r
+               $flex = new cubeFlexCompiler($swf, $compilerDir, 'com.fluidbook.player.AIRMain', $libs, '/usr/local/flex/bin/mxmlc', 'air', 45, 800, 600, true);\r
 \r
                $this->compileFlex($book_id, true, $compilerDir, $finalDir, $filesToCopy, $book, $pages, $flex, $flex);\r
                $res = $flex->compile();\r
 \r
-               $air = new cubeAIRCompiler($compilerDir . '/' . $swf . '.swf', '/usr/local/flex/bin', $compilerDir, '2.7');\r
-               $air->setApplicationDatas('com.fluidbook' . $book_id, $book->parametres->titre, $book->parametres->titre, cubeText::str2URL($book->parametres->titre), $book->parametres->lang);\r
-               $air->setInitialWindow($book->parametres->titre);\r
+               $air = new cubeAIRCompiler( $swf . '.swf', '/usr/local/flex/bin', $compilerDir, '2.0');\r
+               $air->setApplicationDatas('com.fluidbook' . $book_id, $book->parametres->title, $book->parametres->title, cubeText::str2URL($book->parametres->title), $book->lang);\r
+               $air->setInitialWindow($book->parametres->title);\r
                $res.=$air->compile();\r
 \r
                return $res;\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 97e5e63d99a44a0f3cbef0c074725d6753b81e1b..7a7c1e1dd7480a2c23e6d018be43de0de0c5a844 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -734,7 +734,6 @@ class wsDocument extends cubeMetier {
                                $pdf2swf->setArg('set multiply', $multiply);\r
                        }\r
 \r
-                       $pdf2swf->setArg('stop');\r
                        // $pdf2swf->setManualArg('-v');\r
                        $pdf2swf->setArg('T', 10);\r
                        $pdf2swf->setArg('set reordertags', '0');\r