Skip to content

Commit

Permalink
Merge pull request kaltura#1313 from kaltura/IX-9.17.0-url-managers
Browse files Browse the repository at this point in the history
The default should be still inherited from the parent.
  • Loading branch information
sharonadar committed Jun 12, 2014
2 parents 970683f + 4aa9c4b commit 2e6e809
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions alpha/lib/model/DeliveryProfileLiveAppleHttp.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

class DeliveryProfileLiveAppleHttp extends DeliveryProfileLive {

function __construct() {
parent::__construct();
$this->DEFAULT_RENDERER_CLASS = 'kM3U8ManifestRenderer';
}

public function setDisableExtraAttributes($v)
{
$this->putInCustomData("disableExtraAttributes", $v);
Expand Down Expand Up @@ -128,11 +123,11 @@ public function serve($baseUrl, $backupUrl)
return parent::serve($baseUrl, $backupUrl);
}


$flavors = array();
$this->buildM3u8Flavors($baseUrl, $flavors);
$this->buildM3u8Flavors($backupUrl, $flavors);

$this->DEFAULT_RENDERER_CLASS = 'kM3U8ManifestRenderer';
$renderer = $this->getRenderer($flavors);
return $renderer;
}
Expand Down

0 comments on commit 2e6e809

Please sign in to comment.