diff options
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/player/dash.phtml | 14 | ||||
| -rw-r--r-- | template/assemblies/schedule.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/switcher/dash.phtml | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/template/assemblies/player/dash.phtml b/template/assemblies/player/dash.phtml index 8a70d25..7048006 100644 --- a/template/assemblies/player/dash.phtml +++ b/template/assemblies/player/dash.phtml @@ -1,4 +1,3 @@ -<script type="text/javascript" src="<?=h($assets)?>clapprio/clappr.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/dash-shaka-playback.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/level-selector.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/audio-selector.min.js"></script> @@ -12,21 +11,22 @@ interference with the new dash-player. --> <script type="text/javascript"> + var nativeHLS = document.createElement('video').canPlayType('application/vnd.apple.mpegURL') != ""; var player = new Clappr.Player({ - // source: "http://dash.edgesuite.net/envivio/EnvivioDash3/manifest.mpd", - source: '<?=h($room->getDashManifestUrl())?>', + source: nativeHLS ? '<?=h($room->getHLSPlaylistUrl())?>' : '<?=h($room->getDashManifestUrl())?>', width: "100%", plugins: [DashShakaPlayback, LevelSelector, AudioSelector], shakaConfiguration: { - preferredAudioLanguage: 'de-DE', - streaming: { - rebufferingGoal: 15 - } + abr: { + defaultBandwidthEstimate: 600000 + }, }, autoPlay: true, parentId: '#player' }); </script> + + <style type="text/css"> #player > [data-player] { padding-bottom: 56.25%; diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index ad58ce7..62eb077 100644 --- a/template/assemblies/schedule.phtml +++ b/template/assemblies/schedule.phtml @@ -3,6 +3,7 @@ <div class="now"><span>now</span></div> <? $rooms = $schedule->getSchedule() ?> <? foreach($rooms as $roomname => $events): ?> + <? $scheduleRoom = $schedule->getMappedRoom($roomname) ?> <div class="room <? if(isset($room) && $roomname == $room->getScheduleName()): ?>highlight<? endif ?>" style="width: <?=round($schedule->getDurationSum() / $schedule->getScale())?>px"> <? $fromstart = 0; ?> <? foreach($events as $event): ?> @@ -13,7 +14,6 @@ data-end="<?=intval($event['end'])?>" > <? $fromstart += $event['duration'] ?> - <? $scheduleRoom = $conference->getRoomIfExists($roomname) ?> <? if($scheduleRoom): ?> <a class="inner" diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml index 164af12..63b8381 100644 --- a/template/assemblies/switcher/dash.phtml +++ b/template/assemblies/switcher/dash.phtml @@ -22,6 +22,14 @@ </a> </div> + <div class="btn-group" role="group"> + <div class="btn btn-primary" disabled>HLS</div> + <a href="<?=h($room->GetHLSPlaylistUrl())?>" target="_blank" class="btn btn-default"> + <span class="fa fa-flask"></span> + Playlist + </a> + </div> + </div> </div> </div> |