Merge branch '34c3-cherries'

1 files changed, 7 insertions, 3 deletions

diff --git a/model/Stream.php b/model/Stream.php
index 99abaf1..1c63227 100644
--- a/model/Stream.php
+++ b/model/Stream.php
@@ -123,15 +123,19 @@ class Stream
 		]);
 	}
 
-	public function getVideoUrl($proto)
+	public function getVideoUrl($proto, $selection=null)
 	{
+		if (!$selection) {
+			$selection = $this->getSelection();
+		}
+
 		switch($proto)
 		{
 			case 'webm':
-				return proto().'://cdn.c3voc.de/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($this->getSelection()).'.webm';
+				return proto().'://cdn.c3voc.de/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($selection).'.webm';
 
 			case 'hls':
-				return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($this->getSelection()).'.m3u8';
+				return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($selection).'.m3u8';
 		}
 
 		return null;