diff options
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/player/dash.phtml | 36 | ||||
| -rw-r--r-- | template/assemblies/player/relive.phtml | 6 | ||||
| -rw-r--r-- | template/page.phtml | 7 |
3 files changed, 11 insertions, 38 deletions
diff --git a/template/assemblies/player/dash.phtml b/template/assemblies/player/dash.phtml index f5c6510..fc1a4eb 100644 --- a/template/assemblies/player/dash.phtml +++ b/template/assemblies/player/dash.phtml @@ -1,31 +1,5 @@ -<script type="text/javascript" src="<?=h($assets)?>js/player.js"></script> - -<div class="dashContainer" style="min-height: 100px" > - <div id="stream-player"></div> -</div> - -<!-- - TODO: do this properly ---> -<script type="text/javascript"> -(function(){ - new VOCPlayer.default({ - parentId: "#stream-player", - vocStream: "<?=h($room->getStream())?>", - poster: "<?=h($stream->getPoster())?>", - }); -}()); -</script> - -<style type="text/css"> -#stream-player > [data-player] { - padding-bottom: 56.25%; - height: auto !important; -} -#stream-player > .fullscreen { - padding-bottom: 0; -} -body.room .player-wrap.tab-content { - padding: 0; -} -</style> +<div class="video-wrap" + data-voc-player + data-stream="<?=h($room->getStream())?>" + data-poster="<?=h($stream->getPoster())?>" +></div>
\ No newline at end of file diff --git a/template/assemblies/player/relive.phtml b/template/assemblies/player/relive.phtml index 361e1bb..91c79ba 100644 --- a/template/assemblies/player/relive.phtml +++ b/template/assemblies/player/relive.phtml @@ -1,9 +1,7 @@ <div - style="max-width: <?=h($width)?>px; max-height: <?=h($height)?>px;" class="video-wrap" - data-width="<?=h($width)?>" - data-height="<?=h($height)?>" - data-m3u8="<?=h(forceproto($talk['playlist']))?>" + data-voc-player + data-source="<?= h(forceproto($talk['playlist'])) ?>" <? if(array_key_exists('sprites', $talk)): ?> data-sprites="<?= h($talk['sprites']['url']) ?>" data-sprites-n="<?= h($talk['sprites']['n']) ?>" diff --git a/template/page.phtml b/template/page.phtml index 797589d..ccd5ea8 100644 --- a/template/page.phtml +++ b/template/page.phtml @@ -63,9 +63,10 @@ <script type="text/javascript" src="<?=h($assets)?>js/lib/bootstrap-datepicker.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>mejs/mediaelement-and-player.min.js"></script> - <script type="text/javascript" src="<?=h($assets)?>clapprio/clappr.min.js"></script> - <script type="text/javascript" src="<?=h($assets)?>clapprio/clappr-thumbnails-plugin.js"></script> - <script type="text/javascript" src="<?=h($assets)?>clapprio/clappr-playback-rate-plugin.js"></script> + <script type="text/javascript" src="<?=h($assets)?>voc-player/player.js"></script> + <script type="text/javascript">window.Clappr = window.VOCPlayer</script> + <script type="text/javascript" src="<?=h($assets)?>voc-player/clappr-thumbnails-plugin.js"></script> + <script type="text/javascript" src="<?=h($assets)?>voc-player/clappr-playback-rate-plugin.js"></script> <script type="text/javascript" src="<?=h($assets)?>js/lustiges-script.js"></script> <? if(isset($subtitles) && $subtitles->isEnabled()): ?> |