From 663a234bb19cd9db56072af3b4c866150f05f0db Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 28 Feb 2015 19:12:27 +0100
Subject: room selection handling rewrite

---
 template/assemblies/player/video.phtml | 43 ++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'template/assemblies/player')

diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
index 1508aba..0861cf8 100644
--- a/template/assemblies/player/video.phtml
+++ b/template/assemblies/player/video.phtml
@@ -5,27 +5,30 @@
 		width="<?=h($width)?>"
 		height="<?=h($height)?>"
 		style="width: 100%; height: 100%;"
-		class="<?=h($miniroom ? 'nosubs' : 'subs')?>"
 	>
-		<? if(!$translated): ?>
-		<source
-			data-plugin-type="native"
-			src="<?=h(link_stream('webm', $room, $format, $translated))?>"
-			title="WebM (Icecast)"
-			type="video/webm"
-		/>
+		<? if(in_array("webm-$selection", $formats)): ?>
+			<source
+				data-plugin-type="native"
+				src="<?=h(link_stream('webm', $room, $selection, $translated))?>"
+				title="WebM (Icecast)"
+				type="video/webm"
+			/>
+		<? endif ?>
+		<? if(in_array("hls-$selection", $formats)): ?>
+			<source
+				data-plugin-type="native"
+				src="<?=h(link_stream('hls', $room, $hlsformat, $translated))?>"
+				title="h.264 (HLS)"
+				type="application/vnd.apple.mpegURL"
+			/>
+		<? endif ?>
+		<? if(in_array("rtmp-$selection", $formats)): ?>
+			<source
+				data-plugin-type="flash"
+				src="<?=h(link_stream('rtmp', $room, $selection, $translated))?>"
+				title="h.264 (RTMP)"
+				type="video/rtmp"
+			/>
 		<? endif ?>
-		<source
-			data-plugin-type="flash"
-			src="<?=h(link_stream('rtmp', $room, $format, $translated))?>"
-			title="h.264 (RTMP)"
-			type="video/rtmp"
-		/>
-		<source
-			data-plugin-type="native"
-			src="<?=h(link_stream('hls', $room, $hlsformat, $translated))?>"
-			title="h.264 (HLS)"
-			type="application/vnd.apple.mpegURL"
-		/>
 	</video>
 </div>
-- 
cgit v1.2.3