From c1348eec03d5412d073b019a9c529843d9b96e86 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 29 Nov 2014 20:44:21 +0100
Subject: miniroom formats

---
 template/assemblies/switcher/miniroom-audio.phtml |  6 +--
 template/assemblies/switcher/miniroom-video.phtml | 55 +++++++++++++++++------
 2 files changed, 45 insertions(+), 16 deletions(-)

(limited to 'template/assemblies/switcher')

diff --git a/template/assemblies/switcher/miniroom-audio.phtml b/template/assemblies/switcher/miniroom-audio.phtml
index 2de9169..12a7921 100644
--- a/template/assemblies/switcher/miniroom-audio.phtml
+++ b/template/assemblies/switcher/miniroom-audio.phtml
@@ -2,10 +2,10 @@
 <ul>
 	<? foreach(array('mp3', 'opus') as $iter): ?>
 		<li>
-			<span class="label filetype"><?=h(strtoupper($iter))?></span>
+			<span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span>
 			<a href="<?=h(link_stream('audio', $room, $iter))?>">
-				<span class="fa fa-volume-up"></span>
-				live podcast
+				<span class="fa fa-flag-o"></span>
+				audio
 			</a>
 		</li>
 	<? endforeach ?>
diff --git a/template/assemblies/switcher/miniroom-video.phtml b/template/assemblies/switcher/miniroom-video.phtml
index ace02bc..f6d052d 100644
--- a/template/assemblies/switcher/miniroom-video.phtml
+++ b/template/assemblies/switcher/miniroom-video.phtml
@@ -1,19 +1,48 @@
-<h3>Directlinks</h3>
+<h3>Formats</h3>
 <ul>
-<? foreach(array('rtmp', 'hls') as $protocol): ?>
+	<? foreach(array('hd', 'sd') as $iter): ?>
 		<li>
-			<span class="label filetype" title="<?=h(format_text('sd'))?>"><?=h($protocol)?></span>
-			<a href="<?=h(link_stream($protocol, $room, 'sd'))?>">
-				<span class="fa fa-video-camera"></span>
-				live video-podcast
+			<span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span>
+			<a href="<?=h(link_player($room, $iter))?>">
+				<span class="fa fa-flag-o"></span>
+				video
 			</a>
 		</li>
+	<? endforeach ?>
+</ul>
+
+<hr />
+
+<? foreach(array('rtmp', 'hls') as $protocol): ?>
+	<h3>Directlinks (<?=h(strtoupper($protocol))?>)</h3>
+	<ul>
+		<?
+			if($protocol == 'hls')
+				$formats = array('auto', 'hd', 'sd');
+			else
+				$formats = array('hd', 'sd');
+		?>
+		<? foreach($formats as $iter): ?>
+			<li>
+				<span class="label filetype" title="<?=h(format_text($iter))?>"><?=h(strtoupper($iter))?></span>
+				<a href="<?=h(link_stream($protocol, $room, $iter))?>">
+					<span class="fa fa-flag-o"></span>
+					video
+				</a>
+			</li>
+		<? endforeach ?>
+	</ul>
 <? endforeach ?>
-	<li>
-		<span class="label filetype" title="<?=h(format_text('webm'))?>">WebM</span>
-		<a href="<?=h(link_stream('webm', $room, 'webm'))?>">
-			<span class="fa fa-video-camera"></span>
-			live video-podcast
-		</a>
-	</li>
+
+<h3>Directlinks (WebM)</h3>
+<ul>
+	<? foreach(array('hd', 'sd') as $iter): ?>
+		<li>
+			<span class="label filetype" title="<?=h(format_text('webm'))?>"><?=h(strtoupper($iter))?></span>
+			<a href="<?=h(link_stream('webm', $room, $iter))?>">
+				<span class="fa fa-flag-o"></span>
+				video
+			</a>
+		</li>
+	<? endforeach ?>
 </ul>
-- 
cgit v1.2.3