aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMaZderMind2015-03-03 13:35:39 +0100
committerMaZderMind2015-03-03 13:35:39 +0100
commit83fb8d1a9bb81324690554ce8f5a5f70e29f4927 (patch)
tree25e2b117a004e91ec7800471e9e4d187d38121e2 /lib
parentf386a6b7e99f951571873c76d801230961d17512 (diff)
Use STREAM-Setting when Configured
Diffstat (limited to 'lib')
-rw-r--r--lib/helper.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/helper.php b/lib/helper.php
index 4d82d87..7a652cd 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -25,22 +25,22 @@ function link_stream($protocol, $room, $format, $translated = false)
switch ($protocol) {
case 'rtmp':
- return 'rtmp://cdn.c3voc.de/stream/'.rawurlencode(streamname($room)).'_'.rawurlencode($language).'_'.rawurlencode($format);
+ return 'rtmp://cdn.c3voc.de/stream/'.rawurlencode(get("ROOMS.$room.STREAM", $room)).'_'.rawurlencode($language).'_'.rawurlencode($format);
case 'hls':
- return 'http://cdn.c3voc.de/hls/'.rawurlencode(streamname($room)).'_'.rawurlencode($language).($format == 'auto' ? '' : '_'.rawurlencode($format)).'.m3u8';
+ return 'http://cdn.c3voc.de/hls/'.rawurlencode(get("ROOMS.$room.STREAM", $room)).'_'.rawurlencode($language).($format == 'auto' ? '' : '_'.rawurlencode($format)).'.m3u8';
case 'webm':
- return 'http://cdn.c3voc.de/'.rawurlencode(streamname($room)).'_'.rawurlencode($language).'_'.rawurlencode($format).'.webm';
+ return 'http://cdn.c3voc.de/'.rawurlencode(get("ROOMS.$room.STREAM", $room)).'_'.rawurlencode($language).'_'.rawurlencode($format).'.webm';
case 'music':
- return 'http://cdn.c3voc.de/'.rawurlencode(streamname($room)).'.'.rawurlencode($format);
+ return 'http://cdn.c3voc.de/'.rawurlencode(get("ROOMS.$room.STREAM", $room)).'.'.rawurlencode($format);
case 'audio':
- return 'http://cdn.c3voc.de/'.rawurlencode(streamname($room)).'_'.rawurlencode($language).'.'.rawurlencode($format);
+ return 'http://cdn.c3voc.de/'.rawurlencode(get("ROOMS.$room.STREAM", $room)).'_'.rawurlencode($language).'.'.rawurlencode($format);
case 'slide':
- return 'http://cdn.c3voc.de/slides/'.rawurlencode(streamname($room)).'/current.png';
+ return 'http://cdn.c3voc.de/slides/'.rawurlencode(get("ROOMS.$room.STREAM", $room)).'/current.png';
}
return '#';