Merge branch 'master' of git.c3voc.de:streaming-website

1 files changed, 24 insertions, 24 deletions

diff --git a/configs/conferences/datenspuren18/config.php b/configs/conferences/datenspuren18/config.php
index 52ba90f..6f26d5c 100644
--- a/configs/conferences/datenspuren18/config.php
+++ b/configs/conferences/datenspuren18/config.php
@@ -97,7 +97,7 @@ $CONFIG['CONFERENCE'] = array(
    * Wird beides aktiviert, hat der externe Link Vorrang!
    * Wird beides auskommentiert, wird der Link nicht angezeigt
    */
-  'RELIVE_JSON' => 'http://live.ber.c3voc.de/relive/DS2018/index.json',
+  'RELIVE_JSON' => 'http://live.ber.c3voc.de/relive/datenspuren18/index.json',
 
   /**
    * APCU-Cache-Zeit in Sekunden
@@ -121,7 +121,7 @@ $CONFIG['OVERVIEW'] = array(
   'GROUPS' => array(
     'Lecture rooms' => array(
       'grosser-saal',
-      'workshopraum',
+#      'workshopraum',
     ),
   ),
 );
@@ -342,26 +342,26 @@ $CONFIG['ROOMS'] = array(
     //  'TEXT'    => '#fossgis2016',
     // ),
   ),
-  'workshopraum' => array(
-    'DISPLAY' => 'Workshopraum',
-    'STREAM' => 's4',
-    'PREVIEW' => true,
-    'TRANSLATION' => false,
-    'STEREO' => false,
-    'SD_VIDEO' => true,
-	'HD_VIDEO' => true,
-	'DASH' => true,
-    'SLIDES' => true,
-    'AUDIO' => true,
-    'MUSIC' => false,
-    'SCHEDULE' => true,
-    'SCHEDULE_NAME' => 'Workshopraum',
-    'FEEDBACK' => false,
-    'SUBTITLES' => false,
-    'EMBED' => true,
-    'IRC' => false,
-    'TWITTER' => true,
-  ),
+//  'workshopraum' => array(
+//    'DISPLAY' => 'Workshopraum',
+//    'STREAM' => 's4',
+//    'PREVIEW' => true,
+//    'TRANSLATION' => false,
+//    'STEREO' => false,
+//    'SD_VIDEO' => true,
+//	'HD_VIDEO' => true,
+//	'DASH' => true,
+//    'SLIDES' => true,
+//    'AUDIO' => true,
+//    'MUSIC' => false,
+//    'SCHEDULE' => true,
+//    'SCHEDULE_NAME' => 'Workshopraum',
+//    'FEEDBACK' => false,
+//    'SUBTITLES' => false,
+//    'EMBED' => true,
+//    'IRC' => false,
+//    'TWITTER' => true,
+//  ),
 );
 
 /**
@@ -391,7 +391,7 @@ $CONFIG['SCHEDULE'] = array(
   *
   * Wird diese Zeile auskommentiert, werden alle Räume angezeigt
   */
-  //'ROOMFILTER' => ['Goldberg Saal', 'Museumskino'],
+  'ROOMFILTER' => ['Großer Saal'],
 
   /**
    * Skalierung der Programm-Vorschau in Sekunden pro Pixel
@@ -405,7 +405,7 @@ $CONFIG['SCHEDULE'] = array(
    * Konferenz-Datum 2014-12-29 auf den heutigen Tag 2015-02-24 verschoben ist.
    */
   //'SIMULATE_OFFSET' => strtotime(/* Conference-Date */ '2016-05-21') - strtotime(/* Today */ '2016-05-19'),
-  'SIMULATE_OFFSET' => 3600*2,
+  //'SIMULATE_OFFSET' => 3600*2,
 );
 
 /**