diff options
Diffstat (limited to '')
| -rw-r--r-- | model/Conference.php | 7 | ||||
| -rw-r--r-- | model/Conferences.php | 2 | ||||
| -rw-r--r-- | model/Room.php | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/model/Conference.php b/model/Conference.php index 8d387a0..0ce0a55 100644 --- a/model/Conference.php +++ b/model/Conference.php @@ -225,4 +225,11 @@ class Conference extends ModelBase public function getExtraFiles() { return $this->get('EXTRA_FILES', []); } + + public function hasAdditionalHtml() { + return $this->has('CONFERENCE.ADDITIONAL_HTML'); + } + public function getAdditionalHtml() { + return $this->get('CONFERENCE.ADDITIONAL_HTML'); + } } diff --git a/model/Conferences.php b/model/Conferences.php index f930e32..f7276ac 100644 --- a/model/Conferences.php +++ b/model/Conferences.php @@ -48,7 +48,7 @@ class Conferences $sorted = Conferences::getConferences(); usort($sorted, function($a, $b) { - return $b->startsAt() > $a->endsAt() ? 1 : -1; + return $b->startsAt() > $a->startsAt() ? 1 : -1; }); return $sorted; diff --git a/model/Room.php b/model/Room.php index ecab17e..f5eedbd 100644 --- a/model/Room.php +++ b/model/Room.php @@ -163,8 +163,12 @@ class Room return $this->getConference()->get('ROOMS.'.$this->getSlug().'.DASH'); } + public function getHLSPlaylistUrl() { + return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getSlug().'_'.$this->getStream()).'/master.m3u8'; + } + public function getDashManifestUrl() { - return proto().'://dekan.cch.c3voc.de/dash/'.rawurlencode($this->getStream()).'/manifest.mpd'; + return proto().'://cdn.c3voc.de/dash/'.rawurlencode($this->getSlug().'_'.$this->getStream()).'/manifest.mpd'; } public function getDashTech() { |