diff options
| -rw-r--r-- | lib/helper.php | 13 | ||||
| -rw-r--r-- | template/assemblies/player/audio.phtml | 6 | ||||
| -rw-r--r-- | template/assemblies/player/video.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/switcher/audio.phtml | 4 | ||||
| -rw-r--r-- | template/assemblies/switcher/video.phtml | 4 |
5 files changed, 16 insertions, 13 deletions
diff --git a/lib/helper.php b/lib/helper.php index 79770f3..fc47da1 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -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 '#'; diff --git a/template/assemblies/player/audio.phtml b/template/assemblies/player/audio.phtml index a53e2e9..690a0cd 100644 --- a/template/assemblies/player/audio.phtml +++ b/template/assemblies/player/audio.phtml @@ -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> diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml index 14ecc7d..169c81d 100644 --- a/template/assemblies/player/video.phtml +++ b/template/assemblies/player/video.phtml @@ -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" /> diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml index 4e6b571..2ee3690 100644 --- a/template/assemblies/switcher/audio.phtml +++ b/template/assemblies/switcher/audio.phtml @@ -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> diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml index 549b5d7..446b006 100644 --- a/template/assemblies/switcher/video.phtml +++ b/template/assemblies/switcher/video.phtml @@ -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> |