diff options
| -rw-r--r-- | assets/js/lustiges-script.js | 1 | ||||
| -rw-r--r-- | template/assemblies/player/audio.phtml | 17 | ||||
| -rw-r--r-- | template/assemblies/switcher/dash.phtml | 8 |
3 files changed, 14 insertions, 12 deletions
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 3b38a2d..e7f8a86 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -40,6 +40,7 @@ $(function() { baseUrl: 'assets/voc-player/', autoPlay: true, poster: $player.data("poster"), + audioOnly: !!$player.data("audio-only"), events: { onReady: function() { var player = this; diff --git a/template/assemblies/player/audio.phtml b/template/assemblies/player/audio.phtml index c3594eb..71b01b4 100644 --- a/template/assemblies/player/audio.phtml +++ b/template/assemblies/player/audio.phtml @@ -1,3 +1,5 @@ +<!-- Uses regular player only if translation is forced --> +<? if($stream->isTranslated()): ?> <video preload="auto" controls="controls" @@ -9,8 +11,15 @@ src="<?=h($stream->getAudioUrl('mp3'))?>" type="audio/mp3" /> - <source - src="<?=h($stream->getAudioUrl('opus'))?>" - type="audio/opus" - /> </video> + +<!-- Use voc-player per default, TODO: implement preferred language feature --> +<? else: ?> +<div class="video-wrap" + data-voc-player + data-stream="<?=h($room->getStream())?>" + data-poster="<?=h($stream->getPoster())?>" + data-audio-only="true" +></div> +<? endif ?> + diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml index 5aa56b4..485b5e1 100644 --- a/template/assemblies/switcher/dash.phtml +++ b/template/assemblies/switcher/dash.phtml @@ -1,13 +1,5 @@ <div class="container-fluid"> - <div class="notes well"> - <h3 class="beta">WebM DASH</h3> - <p><a href="https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP">DASH</a> is an adaptive-bitrate HTTP-based streaming solution that is (unlike existing proprietary solutions such as HLS) internationally standardized.</p> - <p>Support for DASH in open source software such as ffmpeg is still pretty rough, so consider this a technology-preview, it's not yet a stable solution.</p> - <p>Please report your experience to <a href="https://twitter.com/c3voc">@c3voc</a>.</p> - </div> - - <div class="directlinks"> <? foreach(Stream::getVideoProtos() as $proto => $display): ?> <h3>Direct links (<?=h($display)?>)</h3> |