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

remove legacy video tab

Browse source
This commit is contained in:
Anton Schubert 2020-05-02 22:34:48 +02:00
parent aec18c42ef
commit 6ca102c77d
No known key found for this signature in database
GPG key ID: B8DDB0A46D2D8626
6 changed files with 7 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
model/Room.php
View file

@ -184,10 +184,6 @@ class Room
return $this->getConference()->get('ROOMS.'.$this->getSlug().'.HD_VIDEO');
}
public function hasVideo() {
return $this->hasSdVideo() || $this->hasHdVideo();
}
public function hasAudio() {
return $this->getConference()->get('ROOMS.'.$this->getSlug().'.AUDIO');
}
@ -262,12 +258,6 @@ class Room
if($this->hasMusic())
$selections[] = 'music';
if($this->hasHdVideo())
$selections[] = 'hd';
if($this->hasSdVideo())
$selections[] = 'sd';
if($this->hasSlides())
$selections[] = 'slides';
@ -291,9 +281,6 @@ class Room
if($this->hasMusic())
$tabs[] = 'music';
if($this->hasVideo())
$tabs[] = 'video';
if($this->hasSlides())
$tabs[] = 'slides';

7
model/Stream.php
View file

@ -150,10 +150,10 @@ class Stream
{
case 'webm':
if($this->getSelection() == 'hd')
return '1920x1080, VP8+Vorbis in WebM, 3.5 MBit/s';
return '1920x1080, VP9+Opus in WebM, 3.5 MBit/s';
else if($this->getSelection() == 'sd')
return '1024x576, VP8+Vorbis in WebM, 1 MBit/s';
return '1024x576, VP9+Opus in WebM, 1 MBit/s';
case 'hls':
if($this->getSelection() == 'hd')
@ -161,6 +161,9 @@ class Stream
else if($this->getSelection() == 'sd')
return '1024x576, h264+AAC im MPEG-TS-Container via HTTP, 800 kBit/s';
case 'dash':
return 'VP9+Opus mit WebM-Segmenten';
}
return null;

30
template/assemblies/player/video.phtml
View file

@ -1,30 +0,0 @@
<div
style="max-width: <?=h($stream->getVideoWidth())?>px; max-height: <?=h($stream->getVideoHeight())?>px;"
class="video-wrap <? if($room->hasSubtitles()): ?>has-subtitles<? endif ?>"
data-subtitles-room-id="<?=h($room->getSubtitlesRoomId())?>"
>
<video
<? if(!isset($autoplay) || $autoplay == true): ?>
autoplay="autoplay"
<? endif ?>
preload="auto"
width="<?=h($stream->getVideoWidth())?>"
height="<?=h($stream->getVideoHeight())?>"
poster="<?=h($stream->getPoster())?>"
style="width: 100%; height: 100%;"
class="mejs"
>
<source
data-plugin-type="native"
src="<?=h($stream->getVideoUrl('webm'))?>"
title="WebM (Icecast)"
type="video/webm"
/>
<source
data-plugin-type="native"
src="<?=h($stream->getVideoUrl('hls'))?>"
title="h.264 (HLS)"
type="application/vnd.apple.mpegURL"
/>
</video>
</div>

2
template/assemblies/switcher/dash.phtml
View file

@ -44,7 +44,7 @@
<div class="row">
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
<div class="btn-group" role="group">
<div class="btn-group" role="group" title="<?=h($switcherstream->getVideoTech("dash"))?>">
<div class="btn btn-primary" disabled>DASH</div>
<a href="<?=h($room->getDashManifestUrl())?>" target="_blank" class="btn btn-default">
<span class="fa fa-flask"></span>

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

@ -1,79 +0,0 @@
<div class="container-fluid">
<h3>Video</h3>
<div class="formats row">
<? foreach($room->getVideoResolutions() as $res): ?>
<? $selection = $room->createSelectionObject($res) ?>
<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
<div class="btn-group" role="group">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
<a href="<?=h($selection->getLink())?>" class="btn btn-primary">
<span class="fa fa-flag-o"></span>
Native
</a>
<? foreach($room->getTranslations() as $translation): ?>
<a href="<?=h($selection->getTranslatedLink($translation['endpoint']))?>" class="btn btn-primary">
<span class="fa fa-flag"></span>
<?=h(ucfirst($translation['label']))?>
</a>
<? endforeach ?>
<? else: ?>
<a href="<?=h($selection->getLink())?>" class="btn btn-primary">
<span class="fa fa-video-camera"></span>
Video
</a>
<? endif ?>
</div>
</div>
<? endforeach ?>
</div>
<div class="notes well">
<? include("$assemblies/desktop-player.phtml") ?>
</div>
<div class="directlinks">
<? foreach(Stream::getVideoProtos() as $proto => $display): ?>
<h3>Direct links (<?=h($display)?>)</h3>
<div class="row">
<? foreach($room->getVideoResolutions() as $res): ?>
<? $selection = $room->createSelectionObject($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($switcherstream->getVideoTech($proto))?>">
<div class="btn btn-primary" disabled><?=h($selection->getDisplay())?></div>
<? if($room->hasTranslation()): ?>
<a href="<?=h($room->createStreamObject($res, 'native')->getVideoUrl($proto))?>" class="btn btn-default">
<span class="fa fa-flag-o"></span>
Native
</a>
<? foreach($room->getTranslations() as $translation): ?>
<a href="<?=h($room->createStreamObject($res, $translation['endpoint'])->getVideoUrl($proto))?>" class="btn btn-default">
<span class="fa fa-flag"></span>
<?=h(ucfirst($translation['label']))?>
</a>
<? endforeach ?>
<? else: ?>
<a href="<?=h($switcherstream->getVideoUrl($proto))?>" class="btn btn-default">
<span class="fa fa-video-camera"></span>
Video
</a>
<? endif ?>
</div>
</div>
<? endforeach ?>
</div>
<? endforeach ?>
</div>
</div>

2
view/streams-json-v1.php
View file

@ -66,7 +66,7 @@ foreach (Conferences::getActiveConferences() as $conference)
case 'dash':
$urls['dash'] = array(
'display' => $display,
'display' => "MPEG-Dash",
'tech' => $room->getDashTech(),
'url' => $room->getDashManifestUrl(),
);