From 0575b7d60ec7ddf491461c28b0968a0a2b07cba6 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 9 Nov 2014 21:44:42 +0100
Subject: correct streaming domains according to
 https://c3voc.de/wiki/intern:31c3:cdn

---
 lib/helper.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib/helper.php')

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 '#';
-- 
cgit v1.2.3