Changeset 2768:9309864ed407 for inc/core/class.dc.media.php

Timestamp:

11/06/14 10:58:39 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with given dimensions for video, bugfix (HTML5 audio and video)

File:

• inc/core/class.dc.media.php (modified) (4 diffs)

inc/core/class.dc.media.php

@@ -1062 +1062 @@
      {
           $audio =
-               '<audio controls preload="auto">'."\n".
-               '<source src="'.$url.'">'."\n";
+               '<audio controls preload="auto">'.
+               '<source src="'.$url.'">';
 
           if ($type == 'audio/mpeg3') {
@@ -1108 +1108 @@
                     '<param name="FlashVars" value="'.implode('&amp;',$vars).'" />'.
                     __('Embedded Audio Player').
-                    '</object>'."\n";
+                    '</object>';
           }
 
           $audio .=
-               '</audio>'."\n";
+               '</audio>';
 
           return $audio;
@@ -1129 +1129 @@
      {
           $video = '';
+
+          // Cope with width and height, if given
+          $width = 400;
+          $height = 300;
+          if (is_array($args)) {
+               if (!empty($args['width']) && $args['width']) {
+                    $width = (int) $args['width'];
+               }
+               if (!empty($args['height']) && $args['height']) {
+                    $height = (int) $args['height'];
+               }
+          }
+
           if ($type != 'video/x-flv') {
                $video =
-                    '<video controls preload="auto">'."\n".
-                    '<source src="'.$url.'">'."\n";
+                    '<video controls preload="auto"'.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').'>'.
+                    '<source src="'.$url.'">';
           }
 
@@ -1179 +1192 @@
                     '<param name="FlashVars" value="'.implode('&amp;',$vars).'" />'.
                     __('Embedded Video Player').
-                    '</object>'."\n";
+                    '</object>';
           }
 
           if ($type != 'video/x-flv') {
                $video .=
-                    '</video>'."\n";
+                    '</video>';
           }