From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sun, 14 Aug 2011 01:51:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bf9d1b3e9656240a0ecf5e3c2ffd742ba099f1d9;p=cubeextranet.git

---

diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
index 489cc3f1c..e65d619a9 100644
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.links.php
@@ -197,8 +197,10 @@ class videoLink extends wsPackagerHTML5Link {
 		$e = explode('.', $file);
 		$ext = array_pop($e);
 		$basename = implode('.', $e);
+		$w = round($this->width);
+		$h = round($this->height);
 
-		$res = '<video width="' . round($this->width) . '" height="' . round($this->height) . '"';
+		$res = '<video width="' . $w . '" height="' . $h . '"';
 		if ($this->video_auto_start) {
 			$res.=' autoplay="autoplay"';
 		}
@@ -217,13 +219,19 @@ class videoLink extends wsPackagerHTML5Link {
 
 
 		$this->copyExternalFile($this->to, true);
-		$types = array( 'webm' => 'video/webm; codecs="vp8, vorbis"', 'ogv' => 'video/ogg; codecs="theora, vorbis"','mp4' => '');
+		$types = array('webm' => 'video/webm; codecs="vp8, vorbis"', 'ogv' => 'video/ogg; codecs="theora, vorbis"', 'mp4' => '');
 		foreach ($types as $ext => $type) {
 			if ($type != '') {
 				$type = " type='" . $type . "'";
 			}
 			$res.='<source src="' . wsPackagerHTML5Link::getUniversalLocation($basename . '.' . $ext) . '"' . $type . ' />';
 		}
+		$flashvars = array('video' => wsPackagerHTML5Link::getUniversalLocation($basename . '.mp4'),
+			'poster' => wsPackagerHTML5Link::getUniversalLocation($basename . '.jpg'),
+			'controls' => $this->video_controls == '1',
+			'autoPlay' => $this->video_auto_start == '1',
+			'loop' => $this->video_loop);
+		$res.=cubeMedia::flashObject('data/swf/video.swf', $w, $h, $flashvars, 'swfplayer-' . $basename, '', 9, '#ffffff', '', 'true', 'noscale', 'normal');
 		$res.='</video>';
 		return $res;
 	}