Mirrors/streaming-website
2
0
Fork 0
mirror of https://github.com/voc/streaming-website synced 2024-09-20 06:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

correct streaming domains

Browse source 
according to https://c3voc.de/wiki/intern:31c3:cdn
This commit is contained in:
MaZderMind 2014-11-09 21:44:42 +01:00
parent 019368a69a
commit 0575b7d60e
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/helper.php
View file

@ -25,16 +25,19 @@ function link_stream($protocol, $room, $format, $translated = false)
switch ($protocol) {
case 'rtmp':
return 'rtmp://rtmp.streaming.media.ccc.de:1935/stream/'.rawurlencode($room).'_'.rawurlencode($language).'_'.rawurlencode($format);
return 'rtmp://'.($format == 'hd' ? 'rtmp' : 'rtmp-sd').'.stream.c3voc.de:1935/stream/'.rawurlencode($room).'_'.rawurlencode($language).'_'.rawurlencode($format);
case 'hls':
return 'http://hls.streaming.media.ccc.de/hls/'.rawurlencode($room).'_'.rawurlencode($language).'_'.rawurlencode($format).'.m3u8';
return 'http://hls.stream.c3voc.de/hls/'.rawurlencode($room).'_'.rawurlencode($language).'_'.rawurlencode($format).'.m3u8';
case 'icecast':
return 'http://webm.streaming.media.ccc.de:8000/'.rawurlencode($room).'_'.rawurlencode($language).'.'.rawurlencode($format);
case 'webm':
return 'http://webm.stream.c3voc.de:8000/'.rawurlencode($room).'_'.rawurlencode($language).'.'.rawurlencode($format);
case 'audio':
return 'http://audio.stream.c3voc.de:8000/'.rawurlencode($room).'_'.rawurlencode($language).'.'.rawurlencode($format);
case 'slide':
return 'http://localhost/~peter/slide-stream-test/'.rawurlencode($room).'/current.png';
return 'http://www.stream.c3voc.de/slides/'.rawurlencode($room).'/current.png';
}
return '#';

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

@ -4,15 +4,15 @@
style="width: 960px;"
>
<source
src="<?=h(link_stream('icecast', $room, 'mp3', $translated))?>"
src="<?=h(link_stream('audio', $room, 'mp3', $translated))?>"
type="audio/mp3"
/>
<source
src="<?=h(link_stream('icecast', $room, 'ogg', $translated))?>"
src="<?=h(link_stream('audio', $room, 'ogg', $translated))?>"
type="audio/ogg"
/>
<source
src="<?=h(link_stream('icecast', $room, 'opus', $translated))?>"
src="<?=h(link_stream('audio', $room, 'opus', $translated))?>"
type="audio/opus"
/>
</audio>

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

@ -9,7 +9,7 @@
<? if($format == 'hq'): ?>
<source
data-plugin-type="native"
src="<?=h(link_stream('icecast', $room, 'webm', $translated))?>"
src="<?=h(link_stream('webm', $room, 'webm', $translated))?>"
title="WebM (Icecast)"
type="video/webm"
/>

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

@ -20,11 +20,11 @@
<? foreach(array('mp3', 'ogg', 'opus') as $iter): ?>
<li>
<span class="label filetype"><?=h(strtoupper($iter))?></span>
<a href="<?=h(link_stream('icecast', $room, $iter))?>">
<a href="<?=h(link_stream('audio', $room, $iter))?>">
<span class="fa fa-flag-o"></span>
native
</a>
<a href="<?=h(link_stream('icecast', $room, $iter, true))?>">
<a href="<?=h(link_stream('audio', $room, $iter, true))?>">
<span class="fa fa-flag"></span>
translated
</a>

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

@ -40,11 +40,11 @@
<ul>
<li>
<span class="label filetype">HQ</span>
<a href="<?=h(link_stream('icecast', $room, 'webm'))?>">
<a href="<?=h(link_stream('webm', $room, 'webm'))?>">
<span class="fa fa-flag-o"></span>
native
</a>
<a href="<?=h(link_stream('icecast', $room, 'webm', true))?>">
<a href="<?=h(link_stream('webm', $room, 'webm', true))?>">
<span class="fa fa-flag"></span>
translated
</a>