Merge branch 'feature/talkinfo-in-json'

1 files changed, 6 insertions, 0 deletions

diff --git a/view/streams-json-v2.php b/view/streams-json-v2.php
index 114e73e..591e309 100644
--- a/view/streams-json-v2.php
+++ b/view/streams-json-v2.php
@@ -2,9 +2,11 @@
 
 header('Content-Type: application/json');
 
+$basetime = time();
 $struct = [];
 foreach (Conferences::getActiveConferences() as $conference)
 {
+	$now = $conference->getSchedule()->getScheduleDisplayTime($basetime);
 	$overview = $conference->getOverview();
 
 	$groupstruct = array();
@@ -91,6 +93,10 @@ foreach (Conferences::getActiveConferences() as $conference)
 				'link' => forceslash(baseurl()).$room->getLink(),
 				'display' => $room->getDisplay(),
 				'stream' => $room->getStream(),
+				'talks' => [
+					'current' => $room->getCurrentTalk($now),
+					'next' => $room->getNextTalk($now),
+				],
 				'streams' => $streams,
 			);
 		}