From bdb6996709369e56b0bae93525fe60a0fdb5124c Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Mon, 10 Nov 2014 23:42:34 +0100 Subject: nerd-compatibly explanations to the formats --- lib/config.php | 10 ++++++++++ lib/helper.php | 5 +++++ template/assemblies/switcher/audio.phtml | 2 +- template/assemblies/switcher/miniroom-video.phtml | 6 +++--- template/assemblies/switcher/party.phtml | 2 +- template/assemblies/switcher/video.phtml | 6 +++--- 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 @@