nerd-compatibly explanations to the formats

This commit is contained in:
MaZderMind 2014-11-10 23:42:34 +01:00
parent c05b9a49f0
commit bdb6996709
6 changed files with 23 additions and 8 deletions

View file

@ -30,6 +30,16 @@ $GLOBALS['CONFIG']['FORMATS'] = array(
'slides' => 'Slide-Images', '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 // various room-name nappings
$GLOBALS['CONFIG']['FAHRPLAN_ROOM_MAPPING'] = array( $GLOBALS['CONFIG']['FAHRPLAN_ROOM_MAPPING'] = array(
'Grossbaustelle BER' => 'saal1', 'Grossbaustelle BER' => 'saal1',

View file

@ -48,6 +48,11 @@ function irc_channel($room)
return '31C3-hall-'.strtoupper(substr($room, 4, 1)); return '31C3-hall-'.strtoupper(substr($room, 4, 1));
} }
function format_text($format)
{
return @$GLOBALS['CONFIG']['FORMAT_TEXT'][$format] ?: '';
}
function baseurl() function baseurl()
{ {
if(isset($GLOBALS['CONFIG']['baseurl'])) if(isset($GLOBALS['CONFIG']['baseurl']))

View file

@ -19,7 +19,7 @@
<ul> <ul>
<? foreach(array('mp3', 'ogg', 'opus') as $iter): ?> <? foreach(array('mp3', 'ogg', 'opus') as $iter): ?>
<li> <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))?>"> <a href="<?=h(link_stream('audio', $room, $iter))?>">
<span class="fa fa-flag-o"></span> <span class="fa fa-flag-o"></span>
native native

View file

@ -2,7 +2,7 @@
<ul> <ul>
<? foreach(array('hq', 'lq') as $iter): ?> <? foreach(array('hq', 'lq') as $iter): ?>
<li> <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))?>"> <a href="<?=h(link_player($room, $iter))?>">
<span class="fa fa-video-camera"></span> <span class="fa fa-video-camera"></span>
live video-podcast live video-podcast
@ -18,7 +18,7 @@
<ul> <ul>
<? foreach(array('hq', 'lq') as $iter): ?> <? foreach(array('hq', 'lq') as $iter): ?>
<li> <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))?>"> <a href="<?=h(link_stream($protocol, $room, $iter))?>">
<span class="fa fa-video-camera"></span> <span class="fa fa-video-camera"></span>
live video-podcast live video-podcast
@ -31,7 +31,7 @@
<h3>Directlinks (WebM)</h3> <h3>Directlinks (WebM)</h3>
<ul> <ul>
<li> <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'))?>"> <a href="<?=h(link_stream('webm', $room, 'webm'))?>">
<span class="fa fa-video-camera"></span> <span class="fa fa-video-camera"></span>
live video-podcast live video-podcast

View file

@ -2,7 +2,7 @@
<ul> <ul>
<? foreach(array('mp3', 'ogg', 'opus') as $iter): ?> <? foreach(array('mp3', 'ogg', 'opus') as $iter): ?>
<li> <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))?>"> <a href="<?=h(link_stream('audio', $room, $iter))?>">
<span class="fa fa-music"></span> <span class="fa fa-music"></span>
livemusic livemusic

View file

@ -2,7 +2,7 @@
<ul> <ul>
<? foreach(array('hd', 'hq', 'lq') as $iter): ?> <? foreach(array('hd', 'hq', 'lq') as $iter): ?>
<li> <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))?>"> <a href="<?=h(link_player($room, $iter))?>">
<span class="fa fa-flag-o"></span> <span class="fa fa-flag-o"></span>
native native
@ -22,7 +22,7 @@
<ul> <ul>
<? foreach(array('hd', 'hq', 'lq') as $iter): ?> <? foreach(array('hd', 'hq', 'lq') as $iter): ?>
<li> <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))?>"> <a href="<?=h(link_stream($protocol, $room, $iter))?>">
<span class="fa fa-flag-o"></span> <span class="fa fa-flag-o"></span>
native native
@ -39,7 +39,7 @@
<h3>Directlinks (WebM)</h3> <h3>Directlinks (WebM)</h3>
<ul> <ul>
<li> <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'))?>"> <a href="<?=h(link_stream('webm', $room, 'webm'))?>">
<span class="fa fa-flag-o"></span> <span class="fa fa-flag-o"></span>
native native