diff options
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/switcher/audio.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/switcher/miniroom-audio.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/switcher/miniroom-video.phtml | 31 | ||||
| -rw-r--r-- | template/assemblies/switcher/party.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/switcher/video.phtml | 34 |
5 files changed, 29 insertions, 42 deletions
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml index 4d48777..fb12e60 100644 --- a/template/assemblies/switcher/audio.phtml +++ b/template/assemblies/switcher/audio.phtml @@ -17,7 +17,7 @@ <h3>Directlinks</h3> <ul> - <? foreach(array('mp3', 'ogg', 'opus') as $iter): ?> + <? foreach(array('mp3', 'opus') as $iter): ?> <li> <span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span> <a href="<?=h(link_stream('audio', $room, $iter))?>"> diff --git a/template/assemblies/switcher/miniroom-audio.phtml b/template/assemblies/switcher/miniroom-audio.phtml index f96fb71..2de9169 100644 --- a/template/assemblies/switcher/miniroom-audio.phtml +++ b/template/assemblies/switcher/miniroom-audio.phtml @@ -1,6 +1,6 @@ <h3>Directlinks</h3> <ul> - <? foreach(array('mp3', 'ogg', 'opus') as $iter): ?> + <? foreach(array('mp3', 'opus') as $iter): ?> <li> <span class="label filetype"><?=h(strtoupper($iter))?></span> <a href="<?=h(link_stream('audio', $room, $iter))?>"> diff --git a/template/assemblies/switcher/miniroom-video.phtml b/template/assemblies/switcher/miniroom-video.phtml index b03561e..ace02bc 100644 --- a/template/assemblies/switcher/miniroom-video.phtml +++ b/template/assemblies/switcher/miniroom-video.phtml @@ -1,37 +1,16 @@ -<h3>Formats</h3> +<h3>Directlinks</h3> <ul> - <? foreach(array('hq', 'lq') as $iter): ?> +<? foreach(array('rtmp', 'hls') as $protocol): ?> <li> - <span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span> - <a href="<?=h(link_player($room, $iter))?>"> + <span class="label filetype" title="<?=h(format_text('sd'))?>"><?=h($protocol)?></span> + <a href="<?=h(link_stream($protocol, $room, 'sd'))?>"> <span class="fa fa-video-camera"></span> live video-podcast </a> </li> - <? endforeach ?> -</ul> - -<hr /> - -<? foreach(array('rtmp', 'hls') as $protocol): ?> - <h3>Directlinks (<?=h(strtoupper($protocol))?>)</h3> - <ul> - <? foreach(array('hq', 'lq') as $iter): ?> - <li> - <span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span> - <a href="<?=h(link_stream($protocol, $room, $iter))?>"> - <span class="fa fa-video-camera"></span> - live video-podcast - </a> - </li> - <? endforeach ?> - </ul> <? endforeach ?> - -<h3>Directlinks (WebM)</h3> -<ul> <li> - <span class="label filetype" title="<?=h(format_text('webm'))?>">HQ</span> + <span class="label filetype" title="<?=h(format_text('webm'))?>">WebM</span> <a href="<?=h(link_stream('webm', $room, 'webm'))?>"> <span class="fa fa-video-camera"></span> live video-podcast diff --git a/template/assemblies/switcher/party.phtml b/template/assemblies/switcher/party.phtml index 6507450..9a60556 100644 --- a/template/assemblies/switcher/party.phtml +++ b/template/assemblies/switcher/party.phtml @@ -1,6 +1,6 @@ <h3>Directlinks</h3> <ul> - <? foreach(array('mp3', 'ogg', 'opus') as $iter): ?> + <? foreach(array('mp3', 'opus') as $iter): ?> <li> <span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span> <a href="<?=h(link_stream('audio', $room, $iter))?>"> diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml index 7cbb2af..598f533 100644 --- a/template/assemblies/switcher/video.phtml +++ b/template/assemblies/switcher/video.phtml @@ -1,6 +1,6 @@ <h3>Formats</h3> <ul> - <? foreach(array('hd', 'hq', 'lq') as $iter): ?> + <? foreach(array('hd', 'sd') as $iter): ?> <li> <span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span> <a href="<?=h(link_player($room, $iter))?>"> @@ -20,7 +20,13 @@ <? foreach(array('rtmp', 'hls') as $protocol): ?> <h3>Directlinks (<?=h(strtoupper($protocol))?>)</h3> <ul> - <? foreach(array('hd', 'hq', 'lq') as $iter): ?> + <? + if($protocol == 'hls') + $formats = array('auto', 'hd', 'sd'); + else + $formats = array('hd', 'sd'); + ?> + <? foreach($formats as $iter): ?> <li> <span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span> <a href="<?=h(link_stream($protocol, $room, $iter))?>"> @@ -38,15 +44,17 @@ <h3>Directlinks (WebM)</h3> <ul> - <li> - <span class="label filetype" title="<?=h(format_text('webm'))?>">HQ</span> - <a href="<?=h(link_stream('webm', $room, 'webm'))?>"> - <span class="fa fa-flag-o"></span> - native - </a> - <a href="<?=h(link_stream('webm', $room, 'webm', true))?>"> - <span class="fa fa-flag"></span> - translated - </a> - </li> + <? foreach(array('hd', 'sd') as $iter): ?> + <li> + <span class="label filetype" title="<?=h(format_text('webm'))?>"><?=h(strtoupper($iter))?></span> + <a href="<?=h(link_stream('webm', $room, $iter))?>"> + <span class="fa fa-flag-o"></span> + native + </a> + <a href="<?=h(link_stream('webm', $room, $iter, true))?>"> + <span class="fa fa-flag"></span> + translated + </a> + </li> + <? endforeach ?> </ul> |