From 018f7b3ab15d8ae51862f6bce7d6dcda77f03c12 Mon Sep 17 00:00:00 2001
From: dedeibel
Date: Wed, 26 Dec 2018 20:00:09 +0100
Subject: 35c3: open infrastructure oio ergänzt

---
 configs/conferences/35c3/config.php | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

(limited to 'configs/conferences/35c3')

diff --git a/configs/conferences/35c3/config.php b/configs/conferences/35c3/config.php
index 166dca7..8c7fe52 100644
--- a/configs/conferences/35c3/config.php
+++ b/configs/conferences/35c3/config.php
@@ -132,8 +132,8 @@ $CONFIG['OVERVIEW'] = array(
 		),
 		'Assemblies Live' => array(
 			'chaoswest',
-			'wikipakawg'
-			# freifunk / Open Infrastructure Orbit mit eigener infrastruktur, falls mögl verlinken
+			'wikipakawg',
+			'oio'
 		),
 	),
 );
@@ -579,6 +579,33 @@ $CONFIG['ROOMS'] = array(
 			'TEXT'    => '#wikipakaWG',
 		),
 	),
+
+	'oio' => array(
+		'DISPLAY' => 'Open Infrastructure Orbit Vortrags-Arena',
+		'STREAM' => 'soio', # TODO check with streaming config
+		'PREVIEW' => true,
+		'TRANSLATION' => [
+		],
+		'SD_VIDEO' => true,
+		'HD_VIDEO' => true,
+		'DASH' => true,
+		'AUDIO' => true,
+		'SLIDES' => false,
+		'MUSIC' => false,
+
+		'SCHEDULE' => true,
+		'SCHEDULE_NAME' => 'OIO Vortrags-Arena',
+		'FEEDBACK' => true,
+		'SUBTITLES' => false,
+		'SUBTITLES_ROOM_ID' => 2,
+		'EMBED' => true,
+		'IRC' => false,
+		'TWITTER' => true,
+		'TWITTER_CONFIG' => array(
+			'DISPLAY' => 'freifunk @ twitter',
+			'TEXT'    => '@freifunk',
+		),
+	),
 );
 
 /**
@@ -603,7 +630,8 @@ $CONFIG['SCHEDULE'] = array(
 	 *
 	 * Wird diese Zeile auskommentiert, werden alle Räume angezeigt
 	 */
-	'ROOMFILTER' => array('Adams', 'Borg', 'Clarke', 'Dijkstra', 'Eliza', 'WikiPakaWG Esszimmer', 'Chaos West Bühne'),
+	'ROOMFILTER' => array('Adams', 'Borg', 'Clarke', 'Dijkstra', 'Eliza',
+		'WikiPakaWG Esszimmer', 'Chaos West Bühne', 'OIO Vortrags-Arena'),
 
 	/**
 	 * Skalierung der Programm-Vorschau in Sekunden pro Pixel
-- 
cgit v1.2.3