diff options
| author | MaZderMind | 2016-12-28 20:52:27 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-28 20:52:27 +0100 |
| commit | 3b896417ec6424130e85f21c5ce44a0525fe0395 (patch) | |
| tree | 47fa37714d7d4802f527cd688dffb5b6cbe5ac84 | |
| parent | 0fec82ef10af44f53640bec4e472d374a9f8f5f3 (diff) | |
enable dash on dekan only
Diffstat (limited to '')
| -rw-r--r-- | configs/conferences/33c3/config.php | 8 | ||||
| -rw-r--r-- | model/Room.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configs/conferences/33c3/config.php b/configs/conferences/33c3/config.php index 225a2a1..4592905 100644 --- a/configs/conferences/33c3/config.php +++ b/configs/conferences/33c3/config.php @@ -209,7 +209,7 @@ $CONFIG['ROOMS'] = array( * als Default-Stream angenommen. */ 'HD_VIDEO' => true, - 'DASH' => false, + 'DASH' => true, /** * Slide-Only-Stream (1024×576) verfügbar @@ -371,7 +371,7 @@ $CONFIG['ROOMS'] = array( 'TRANSLATION' => true, 'SD_VIDEO' => true, 'HD_VIDEO' => true, - 'DASH' => false, + 'DASH' => true, 'AUDIO' => true, 'SLIDES' => true, 'MUSIC' => false, @@ -402,7 +402,7 @@ $CONFIG['ROOMS'] = array( 'TRANSLATION' => true, 'SD_VIDEO' => true, 'HD_VIDEO' => true, - 'DASH' => false, + 'DASH' => true, 'AUDIO' => true, 'SLIDES' => true, 'MUSIC' => false, @@ -432,7 +432,7 @@ $CONFIG['ROOMS'] = array( 'TRANSLATION' => true, 'SD_VIDEO' => true, 'HD_VIDEO' => true, - 'DASH' => false, + 'DASH' => true, 'AUDIO' => true, 'SLIDES' => true, 'MUSIC' => false, diff --git a/model/Room.php b/model/Room.php index 8ee4ce2..fffb3c4 100644 --- a/model/Room.php +++ b/model/Room.php @@ -164,7 +164,7 @@ class Room } public function getDashManifestUrl() { - return proto().'://cdn.c3voc.de/dash/'.rawurlencode($this->getStream()).'/manifest.mpd'; + return proto().'://dekan.cch.c3voc.de/dash/'.rawurlencode($this->getStream()).'/manifest.mpd'; } public function hasTranslation() { |