aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2016-12-29 03:55:26 +0100
committerMaZderMind2016-12-29 03:55:26 +0100
commitfbb304af5aa8655ff48c5b9c867509dd9f5b1de5 (patch)
tree68505636e47da605428427bd621e1ce0a4f5d80a
parentf7d1aa166e9f3006e17399c7dd0c236386abc4d7 (diff)
add dash to the json-api
Diffstat (limited to '')
-rw-r--r--model/Room.php4
-rw-r--r--view/streams-json-v1.php8
2 files changed, 12 insertions, 0 deletions
diff --git a/model/Room.php b/model/Room.php
index fffb3c4..ecab17e 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -167,6 +167,10 @@ class Room
return proto().'://dekan.cch.c3voc.de/dash/'.rawurlencode($this->getStream()).'/manifest.mpd';
}
+ public function getDashTech() {
+ return 'Adaptive multi-format-multi-bitrate-Stream to rule the World!!1elf';
+ }
+
public function hasTranslation() {
return $this->getConference()->get('ROOMS.'.$this->getSlug().'.TRANSLATION');
}
diff --git a/view/streams-json-v1.php b/view/streams-json-v1.php
index f64f627..8cdac19 100644
--- a/view/streams-json-v1.php
+++ b/view/streams-json-v1.php
@@ -62,6 +62,14 @@ foreach (Conferences::getActiveConferences() as $conference)
);
}
break;
+
+ case 'dash':
+ $urls['dash'] = array(
+ 'display' => $display,
+ 'tech' => $room->getDashTech(),
+ 'url' => $room->getDashManifestUrl(),
+ );
+ break;
}
$streams[] = array(