Mirrors/streaming-website
2
0
Fork 0
mirror of https://github.com/voc/streaming-website synced 2024-11-10 06:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Repair Switchers to not shadow $stream in the following Templates

Browse source
This commit is contained in:
MaZderMind 2015-04-06 00:28:17 +02:00
parent 8f14dd9084
commit d8eca933a6
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
template/assemblies/switcher/audio.phtml
View file

@ -30,9 +30,9 @@
<? foreach(Stream::getAudioProtos() as $proto => $display): ?>
<h3>Directlinks (<?=h($display)?>)</h3>
<div class="row">
<? $stream = $room->createStreamObject('music') ?>
<? $switcherstream = $room->createStreamObject('music') ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
<div class="btn-group" role="group" title="<?=h($stream->getAudioTech($proto))?>">
<div class="btn-group" role="group" title="<?=h($switcherstream->getAudioTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
@ -47,7 +47,7 @@
<? else: ?>
<a href="<?=h($stream->getAudioUrl($proto))?>" class="btn btn-default">
<a href="<?=h($switcherstream->getAudioUrl($proto))?>" class="btn btn-default">
<span class="fa fa-volume-up"></span>
video
</a>

6
template/assemblies/switcher/music.phtml
View file

@ -3,12 +3,12 @@
<div class="directlinks">
<div class="row">
<? foreach(Stream::getMusicProtos() as $proto => $display): ?>
<? $stream = $room->createStreamObject('music') ?>
<? $switcherstream = $room->createStreamObject('music') ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
<div class="btn-group" role="group" title="<?=h($stream->getMusicTech($proto))?>">
<div class="btn-group" role="group" title="<?=h($switcherstream->getMusicTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($display)?></div>
<a href="<?=h($stream->getMusicUrl($proto))?>" class="btn btn-default">
<a href="<?=h($switcherstream->getMusicUrl($proto))?>" class="btn btn-default">
<span class="fa fa-music"></span>
live music
</a>

6
template/assemblies/switcher/slides.phtml
View file

@ -30,9 +30,9 @@
<? foreach(Stream::getSlidesProtos() as $proto => $display): ?>
<h3>Directlinks (<?=h($display)?>)</h3>
<div class="row">
<? $stream = $room->createStreamObject('slides') ?>
<? $switcherstream = $room->createStreamObject('slides') ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
<div class="btn-group" role="group" title="<?=h($stream->getSlidesTech($proto))?>">
<div class="btn-group" role="group" title="<?=h($switcherstream->getSlidesTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
@ -47,7 +47,7 @@
<? else: ?>
<a href="<?=h($stream->getSlidesUrl($proto))?>" class="btn btn-default">
<a href="<?=h($switcherstream->getSlidesUrl($proto))?>" class="btn btn-default">
<span class="fa fa-picture-o"></span>
slides
</a>

6
template/assemblies/switcher/video.phtml
View file

@ -43,9 +43,9 @@
<div class="row">
<? foreach($room->getVideoResolutions() as $res): ?>
<? $selection = $room->createSelectionObject($res) ?>
<? $stream = $room->createStreamObject($res) ?>
<? $switcherstream = $room->createStreamObject($res) ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
<div class="btn-group" role="group" title="<?=h($stream->getVideoTech($proto))?>">
<div class="btn-group" role="group" title="<?=h($switcherstream->getVideoTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
@ -60,7 +60,7 @@
<? else: ?>
<a href="<?=h($stream->getVideoUrl($proto))?>" class="btn btn-default">
<a href="<?=h($switcherstream->getVideoUrl($proto))?>" class="btn btn-default">
<span class="fa fa-video-camera"></span>
video
</a>