aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/config.php10
-rw-r--r--lib/helper.php5
-rw-r--r--template/assemblies/switcher/audio.phtml2
-rw-r--r--template/assemblies/switcher/miniroom-video.phtml6
-rw-r--r--template/assemblies/switcher/party.phtml2
-rw-r--r--template/assemblies/switcher/video.phtml6
6 files changed, 23 insertions, 8 deletions
diff --git a/lib/config.php b/lib/config.php
index 7053cd7..9ef612d 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -30,6 +30,16 @@ $GLOBALS['CONFIG']['FORMATS'] = array(
'slides' => 'Slide-Images',
);
+$GLOBALS['CONFIG']['FORMAT_TEXT'] = array(
+ 'hd' => '1920x1080, h264+aac, 5 MBit/s',
+ 'hq' => '1024x576, h264+aac, 1 MBit/s',
+ 'lq' => '640x360, h264+aac, 0.5 MBit/s',
+ 'webm' => '1024x576 vp8+vorbis in webm, zzz MBit/s',
+ 'mp3' => 'MP3, 192 kBit/s',
+ 'ogg' => 'OGG Vorbis, xxx kBit/s',
+ 'opus' => 'Opus (RFC 6716), yyy kBit/s',
+);
+
// various room-name nappings
$GLOBALS['CONFIG']['FAHRPLAN_ROOM_MAPPING'] = array(
'Grossbaustelle BER' => 'saal1',
diff --git a/lib/helper.php b/lib/helper.php
index fc47da1..450b3e9 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -48,6 +48,11 @@ function irc_channel($room)
return '31C3-hall-'.strtoupper(substr($room, 4, 1));
}
+function format_text($format)
+{
+ return @$GLOBALS['CONFIG']['FORMAT_TEXT'][$format] ?: '';
+}
+
function baseurl()
{
if(isset($GLOBALS['CONFIG']['baseurl']))
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml
index 2ee3690..4d48777 100644
--- a/template/assemblies/switcher/audio.phtml
+++ b/template/assemblies/switcher/audio.phtml
@@ -19,7 +19,7 @@
<ul>
<? foreach(array('mp3', 'ogg', '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-flag-o"></span>
native
diff --git a/template/assemblies/switcher/miniroom-video.phtml b/template/assemblies/switcher/miniroom-video.phtml
index 619d50b..b03561e 100644
--- a/template/assemblies/switcher/miniroom-video.phtml
+++ b/template/assemblies/switcher/miniroom-video.phtml
@@ -2,7 +2,7 @@
<ul>
<? foreach(array('hq', 'lq') 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_player($room, $iter))?>">
<span class="fa fa-video-camera"></span>
live video-podcast
@@ -18,7 +18,7 @@
<ul>
<? foreach(array('hq', 'lq') 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($protocol, $room, $iter))?>">
<span class="fa fa-video-camera"></span>
live video-podcast
@@ -31,7 +31,7 @@
<h3>Directlinks (WebM)</h3>
<ul>
<li>
- <span class="label filetype">HQ</span>
+ <span class="label filetype" title="<?=h(format_text('webm'))?>">HQ</span>
<a href="<?=h(link_stream('webm', $room, 'webm'))?>">
<span class="fa fa-video-camera"></span>
live video-podcast
diff --git a/template/assemblies/switcher/party.phtml b/template/assemblies/switcher/party.phtml
index f7e7bd7..6507450 100644
--- a/template/assemblies/switcher/party.phtml
+++ b/template/assemblies/switcher/party.phtml
@@ -2,7 +2,7 @@
<ul>
<? foreach(array('mp3', 'ogg', '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-music"></span>
livemusic
diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml
index 446b006..7cbb2af 100644
--- a/template/assemblies/switcher/video.phtml
+++ b/template/assemblies/switcher/video.phtml
@@ -2,7 +2,7 @@
<ul>
<? foreach(array('hd', 'hq', 'lq') 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_player($room, $iter))?>">
<span class="fa fa-flag-o"></span>
native
@@ -22,7 +22,7 @@
<ul>
<? foreach(array('hd', 'hq', 'lq') 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($protocol, $room, $iter))?>">
<span class="fa fa-flag-o"></span>
native
@@ -39,7 +39,7 @@
<h3>Directlinks (WebM)</h3>
<ul>
<li>
- <span class="label filetype">HQ</span>
+ <span class="label filetype" title="<?=h(format_text('webm'))?>">HQ</span>
<a href="<?=h(link_stream('webm', $room, 'webm'))?>">
<span class="fa fa-flag-o"></span>
native