aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hubel2020-07-05 22:02:56 +0200
committerAndreas Hubel2020-07-05 22:02:56 +0200
commitbb14de87d899b171966cfd4601e480f64f4eb037 (patch)
treec8ca728869299f3302cb1ea0ee50013b5fffcc81
parent417166a6f9771e43ef50dc2155419c3f78a72b7e (diff)
sotm: change end date
Diffstat (limited to '')
-rw-r--r--configs/conferences/sotm2020/config.php2
-rw-r--r--model/Relive.php5
-rw-r--r--template/relive-player-netcut.phtml2
3 files changed, 7 insertions, 2 deletions
diff --git a/configs/conferences/sotm2020/config.php b/configs/conferences/sotm2020/config.php
index 73b2cd4..ab9abe0 100644
--- a/configs/conferences/sotm2020/config.php
+++ b/configs/conferences/sotm2020/config.php
@@ -16,7 +16,7 @@ $CONFIG['CONFERENCE'] = array(
*
* Wird dieser Zeitpunkt nicht angegeben, endet die Konferenz nie. (Siehe aber CLOSED weiter unten)
*/
- 'ENDS_AT' => strtotime("2020-07-05 22:00"),
+ 'ENDS_AT' => strtotime("2020-07-06 01:00"),
/**
* Hiermit kann die Funktionalitaet von STARTS_AT/ENDS_AT überschrieben werden. Der Wert 'before'
diff --git a/model/Relive.php b/model/Relive.php
index b6d33da..80a9071 100644
--- a/model/Relive.php
+++ b/model/Relive.php
@@ -24,6 +24,11 @@ class Relive
return $this->getConference()->get('CONFERENCE.RELIVE_JSON');
}
+ public function getPreRecOffset()
+ {
+ return $this->getConference()->get('CONFERENCE.RELIVE_SKIP_PREREC_OFFSET') ?: 900;
+ }
+
public function getJsonCache()
{
return sprintf('/tmp/relive-cache-%s.json', $this->getConference()->getSlug());
diff --git a/template/relive-player-netcut.phtml b/template/relive-player-netcut.phtml
index 61a21b2..379a0c3 100644
--- a/template/relive-player-netcut.phtml
+++ b/template/relive-player-netcut.phtml
@@ -46,7 +46,7 @@
<script type="text/javascript">
VIDEO_FPS = 25;
- INFRAME = 900*25;
+ INFRAME = ($relive->getPreRecOffset())*25;
OUTFRAME = <?= ($talk['duration']-900)*25 ?>;
</script>