(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index ae4447de9ef62be0ebfb9ef684f03fc9495aac4d..e749b1d7be11f1b502e975c21688e1e1b679c0a3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -773,6 +773,29 @@ class wsMaintenance {
                cubeFiles::deleteFilesOlderThan('/home/ws/www/getpdf', 60);\r
        }\r
 \r
+       public static function reencodeVideos($args) {\r
+\r
+               cubePHP::neverStop();\r
+\r
+               $book_id = $args[0];\r
+               $dir = WS_BOOKS . '/working/' . $book_id;\r
+\r
+               wsLinks::getLinksAndRulers($book_id, $links, $rulers);\r
+\r
+               foreach ($links as $link) {\r
+                       if ($link['type'] != 4) {\r
+                               continue;\r
+                       }\r
+\r
+                       $file = $dir . '/' . $link['to'];\r
+                       if (!file_exists($file)) {\r
+                               continue;\r
+                       }\r
+\r
+                       wsTools::encodeWebVideos($file, null, false, true);\r
+               }\r
+       }\r
+\r
 }\r
 \r
 ?>
\ 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 bbc833ad10de0f20112ba1e02b8868dc8f6e5c6c..15e02fd1616203219fb916a17b7076a73c1e8bb0 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -304,7 +304,7 @@ class wsHTML5Compiler {
 
        protected function getVideosFormats($poster = true) {
                if (!$this->phonegap) {
-                       $res = array('mp4', 'ogv', 'webm', 'flv');
+                       $res = array('ogv', 'webm', 'mp4', 'flv');
                } elseif ($this->phonegap == 'ios') {
                        $res = array('mp4');
                } else if ($this->phonegap == 'android') {