diff options
| author | MaZderMind | 2015-04-06 00:28:17 +0200 |
|---|---|---|
| committer | MaZderMind | 2015-04-06 00:28:17 +0200 |
| commit | d8eca933a6713d0deaabe6883e5cf4939120eec0 (patch) | |
| tree | 93dc04c765a3bd6f36c4f3673665402910d57946 /template/assemblies | |
| parent | 8f14dd9084b10c223508bc9948c5724fc2c9eb63 (diff) | |
Repair Switchers to not shadow $stream in the following Templates
Diffstat (limited to 'template/assemblies')
| -rw-r--r-- | template/assemblies/switcher/audio.phtml | 6 | ||||
| -rw-r--r-- | template/assemblies/switcher/music.phtml | 6 | ||||
| -rw-r--r-- | template/assemblies/switcher/slides.phtml | 6 | ||||
| -rw-r--r-- | template/assemblies/switcher/video.phtml | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml index 271191e..ede7a0e 100644 --- a/template/assemblies/switcher/audio.phtml +++ b/template/assemblies/switcher/audio.phtml @@ -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> diff --git a/template/assemblies/switcher/music.phtml b/template/assemblies/switcher/music.phtml index 6f5f218..c349aec 100644 --- a/template/assemblies/switcher/music.phtml +++ b/template/assemblies/switcher/music.phtml @@ -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> diff --git a/template/assemblies/switcher/slides.phtml b/template/assemblies/switcher/slides.phtml index f3281b9..a401729 100644 --- a/template/assemblies/switcher/slides.phtml +++ b/template/assemblies/switcher/slides.phtml @@ -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> diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml index 3214212..2d31532 100644 --- a/template/assemblies/switcher/video.phtml +++ b/template/assemblies/switcher/video.phtml @@ -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> |