Click here to Download this Relive recording. Beware! This is an unprocessed streamdump – a final release will follow soon.
+
Click here to Download this Relive recording. Beware! This is an unprocessed streamdump – a final release will follow soon.
@@ -42,7 +42,7 @@
Sorry about the Flash
As there is no desktop player which supports time-shifting, we chose embed a Flash player here which does.
- If you still want to watch with a desktop player, use this URL: =h($talk['playlist'])?>
+ If you still want to watch with a desktop player, use this URL: =h(forceproto($talk['playlist']))?>
Note: Downloading this file is useless because of the way HLS works. You need to play the URL from your player.
--
cgit v1.2.3
From 327cbb3cae07b2463f3bc466db4814dee368928e Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 28 Dec 2015 11:26:07 +0100
Subject: fix multiview style
---
assets/css/_multiview.less | 1 +
configs/conferences/32c3/main.less | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/assets/css/_multiview.less b/assets/css/_multiview.less
index 59b8e37..66dc25d 100644
--- a/assets/css/_multiview.less
+++ b/assets/css/_multiview.less
@@ -1,6 +1,7 @@
body.multiview {
.cell {
background-color: white;
+ margin-top: 15px;
h2 {
font-size: 14px;
diff --git a/configs/conferences/32c3/main.less b/configs/conferences/32c3/main.less
index 1f9f6fa..012b8a4 100644
--- a/configs/conferences/32c3/main.less
+++ b/configs/conferences/32c3/main.less
@@ -152,3 +152,7 @@ nav .button-wrapper > .about {
color: @state-danger-text;
}
}
+
+body.multiview .cell {
+ color: black;
+}
--
cgit v1.2.3
From 6be05f60903348f4690249052c98a15ca10ab3ed Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Mon, 28 Dec 2015 11:26:17 +0100
Subject: add audio-only multiview
---
index.php | 6 ++++++
template/multiview.phtml | 3 ++-
view/multiview.php | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/index.php b/index.php
index d044cfe..eeaca82 100644
--- a/index.php
+++ b/index.php
@@ -210,6 +210,12 @@ try {
require('view/multiview.php');
}
+ else if($route == 'multiview/audio')
+ {
+ $_GET['selection'] = 'audio';
+ require('view/multiview.php');
+ }
+
else if($route == 'feedback')
{
require('view/feedback.php');
diff --git a/template/multiview.phtml b/template/multiview.phtml
index e07446b..4f8597f 100644
--- a/template/multiview.phtml
+++ b/template/multiview.phtml
@@ -7,7 +7,8 @@
foreach($rooms as $room): ?>
- foreach($room->getStreams() as $stream): ?>
+ foreach($room->getStreams() as $stream): ?>
+ if($selection && $stream->getSelection() != $selection) continue ?>