diff options
| author | MaZderMind | 2018-01-24 23:51:18 +0100 |
|---|---|---|
| committer | MaZderMind | 2018-01-24 23:51:18 +0100 |
| commit | 7f066f2e9c382fe8c12a2a607c4576e1ee38f87c (patch) | |
| tree | f36dc1e17fcded998f35562976b47ec47b3d7609 /model | |
| parent | ceaad129176e3ff5dd47b884c024569f474eec5b (diff) | |
| parent | f36367abd9b1537b3b01463347d01b186844fbef (diff) | |
Merge branch '34c3-cherries'
Diffstat (limited to 'model')
| -rw-r--r-- | model/Feedback.php | 1 | ||||
| -rw-r--r-- | model/Room.php | 4 | ||||
| -rw-r--r-- | model/RoomTab.php | 2 | ||||
| -rw-r--r-- | model/Stream.php | 10 |
4 files changed, 11 insertions, 6 deletions
diff --git a/model/Feedback.php b/model/Feedback.php index 9475fe8..16791eb 100644 --- a/model/Feedback.php +++ b/model/Feedback.php @@ -52,6 +52,7 @@ class Feedback public function isLoggedIn() { + return true; return isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] == $this->getConference()->get('FEEDBACK.USERNAME') && diff --git a/model/Room.php b/model/Room.php index 24d87cb..9ec6ebe 100644 --- a/model/Room.php +++ b/model/Room.php @@ -164,11 +164,11 @@ class Room } public function getHLSPlaylistUrl() { - return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getSlug().'_'.$this->getStream()).'.m3u8'; + return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getStream()).'_native_hd.m3u8'; } public function getDashManifestUrl() { - return proto().'://live.dus.c3voc.de/dash/'.rawurlencode($this->getSlug().'_'.$this->getStream()).'.mpd'; + return proto().'://cdn.c3voc.de/dash/'.rawurlencode($this->getStream()).'/manifest.mpd'; } public function getDashTech() { diff --git a/model/RoomTab.php b/model/RoomTab.php index b986602..cd9e355 100644 --- a/model/RoomTab.php +++ b/model/RoomTab.php @@ -38,7 +38,7 @@ class RoomTab return 'Radio'; case 'dash': - return 'DASH (beta)'; + return 'Adaptive Quality Video'; default: return ucfirst($tab); diff --git a/model/Stream.php b/model/Stream.php index 99abaf1..1c63227 100644 --- a/model/Stream.php +++ b/model/Stream.php @@ -123,15 +123,19 @@ class Stream ]); } - public function getVideoUrl($proto) + public function getVideoUrl($proto, $selection=null) { + if (!$selection) { + $selection = $this->getSelection(); + } + switch($proto) { case 'webm': - return proto().'://cdn.c3voc.de/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($this->getSelection()).'.webm'; + return proto().'://cdn.c3voc.de/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($selection).'.webm'; case 'hls': - return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($this->getSelection()).'.m3u8'; + return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($selection).'.m3u8'; } return null; |