Merge pull request kaltura#1307 from kaltura/IX-9.17.0-url-managers

Ix 9.17.0 url managers
jessport1 · Jun 12, 2014 · ef6d4d6 · ef6d4d6
2 parents 9dee485 + a82e096
commit ef6d4d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php b/alpha/apps/kaltura/modules/extwidget/actions/playManifestAction.class.php
@@ -687,7 +687,7 @@ private function serveVodEntry()
 			// Translate to playback protocol format 	
 			$this->deliveryAttributes->setFormat(PlaybackProtocol::AKAMAI_HD);
 		} else if($this->deliveryAttributes->getFormat() == PlaybackProtocol::RTMP) {
-			if(strpos($this->deliveryAttributes->getMediaProtocol(), "rtmp") !== 0)
+			if(strpos($this->deliveryAttributes->getMediaProtocol(), "rtmp") !== 0) 
 				$this->deliveryAttributes->setMediaProtocol("rtmp");
 		} else if($this->deliveryAttributes->getFormat() == PlaybackProtocol::HTTP) {
 			if(strpos($this->deliveryAttributes->getMediaProtocol(), "http") !== 0)

diff --git a/alpha/lib/model/DeliveryProfileLiveAppleHttp.php b/alpha/lib/model/DeliveryProfileLiveAppleHttp.php
@@ -2,6 +2,11 @@
 
 class DeliveryProfileLiveAppleHttp extends DeliveryProfileLive {
 
+	function __construct() {
+		parent::__construct();
+		$this->DEFAULT_RENDERER_CLASS = 'kM3U8ManifestRenderer';
+	}
+
 	public function setDisableExtraAttributes($v)
 	{
 		$this->putInCustomData("disableExtraAttributes", $v);
@@ -128,9 +133,6 @@ public function serve($baseUrl, $backupUrl)
 		$this->buildM3u8Flavors($baseUrl, $flavors);
 		$this->buildM3u8Flavors($backupUrl, $flavors);
 
-		if(is_null($this->params->getResponseFormat()))
-			$this->params->setResponseFormat('m3u8');
-
 		$renderer = $this->getRenderer($flavors);
 		return $renderer;
 	}

diff --git a/alpha/lib/model/DeliveryProfileLiveHds.php b/alpha/lib/model/DeliveryProfileLiveHds.php
@@ -113,8 +113,6 @@ public function serve($baseUrl, $backupUrl)
 //	
 //			if($entry)
 //			{
-//				$this->params->setResponseFormat('f4m');
-//		 		
 //		 		$protocol = $this->params->getMediaProtocol();
 //		 		$baseUrl = $this->getUrl();
 //