From d83d5df9c267038938383451f05248493a1c59eb Mon Sep 17 00:00:00 2001
From: Anton Schubert
Date: Thu, 21 Dec 2017 12:21:51 +0100
Subject: fix dash manifest url

---
 model/Room.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'model')

diff --git a/model/Room.php b/model/Room.php
index 24d87cb..017a2ca 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -168,7 +168,7 @@ class Room
 	}
 
 	public function getDashManifestUrl() {
-		return proto().'://live.dus.c3voc.de/dash/'.rawurlencode($this->getSlug().'_'.$this->getStream()).'.mpd';
+		return proto().'://cdn.c3voc.de/dash/'.rawurlencode($this->getStream()).'/manifest.mpd';
 	}
 
 	public function getDashTech() {
-- 
cgit v1.2.3


From 26158ebc51e19780a69b35f15256c80c836ef27e Mon Sep 17 00:00:00 2001
From: Anton Schubert
Date: Thu, 21 Dec 2017 12:47:16 +0100
Subject: fix hls playlist url

---
 model/Room.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'model')

diff --git a/model/Room.php b/model/Room.php
index 017a2ca..a436c93 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -164,7 +164,7 @@ class Room
 	}
 
 	public function getHLSPlaylistUrl() {
-		return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getSlug().'_'.$this->getStream()).'.m3u8';
+		return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getStream()).'_native.m3u8';
 	}
 
 	public function getDashManifestUrl() {
-- 
cgit v1.2.3


From 4baa1827cdf4642bd67dd0bbd64b55eca9fe5f70 Mon Sep 17 00:00:00 2001
From: Anton Schubert
Date: Sat, 23 Dec 2017 22:43:41 +0100
Subject: rename dash tab

---
 model/RoomTab.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'model')

diff --git a/model/RoomTab.php b/model/RoomTab.php
index b986602..cd9e355 100644
--- a/model/RoomTab.php
+++ b/model/RoomTab.php
@@ -38,7 +38,7 @@ class RoomTab
 				return 'Radio';
 
 			case 'dash':
-				return 'DASH (beta)';
+				return 'Adaptive Quality Video';
 
 			default:
 				return ucfirst($tab);
-- 
cgit v1.2.3


From b8aa2f297636999adc301f78bf0a8641df6aa892 Mon Sep 17 00:00:00 2001
From: Anton Schubert
Date: Wed, 27 Dec 2017 18:24:51 +0100
Subject: fix hls playlist url in adaptive player

---
 model/Room.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'model')

diff --git a/model/Room.php b/model/Room.php
index a436c93..9ec6ebe 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -164,7 +164,7 @@ class Room
 	}
 
 	public function getHLSPlaylistUrl() {
-		return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getStream()).'_native.m3u8';
+		return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getStream()).'_native_hd.m3u8';
 	}
 
 	public function getDashManifestUrl() {
-- 
cgit v1.2.3


From 870bacae02c922c795b2af4e39839c279168768b Mon Sep 17 00:00:00 2001
From: Anton Schubert
Date: Thu, 28 Dec 2017 12:27:51 +0100
Subject: serve simple webm as fallback for multiquality player

---
 model/Stream.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'model')

diff --git a/model/Stream.php b/model/Stream.php
index 99abaf1..1c63227 100644
--- a/model/Stream.php
+++ b/model/Stream.php
@@ -123,15 +123,19 @@ class Stream
 		]);
 	}
 
-	public function getVideoUrl($proto)
+	public function getVideoUrl($proto, $selection=null)
 	{
+		if (!$selection) {
+			$selection = $this->getSelection();
+		}
+
 		switch($proto)
 		{
 			case 'webm':
-				return proto().'://cdn.c3voc.de/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($this->getSelection()).'.webm';
+				return proto().'://cdn.c3voc.de/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($selection).'.webm';
 
 			case 'hls':
-				return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($this->getSelection()).'.m3u8';
+				return proto().'://cdn.c3voc.de/hls/'.rawurlencode($this->getRoom()->getStream()).'_'.rawurlencode($this->getLanguage()).'_'.rawurlencode($selection).'.m3u8';
 		}
 
 		return null;
-- 
cgit v1.2.3


From f42ab70029dc5c19071292b3a2067678f4bbff79 Mon Sep 17 00:00:00 2001
From: dedeibel
Date: Fri, 29 Dec 2017 19:12:57 +0100
Subject: all: added stream and player to feedback view

---
 model/Feedback.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'model')

diff --git a/model/Feedback.php b/model/Feedback.php
index 9475fe8..16791eb 100644
--- a/model/Feedback.php
+++ b/model/Feedback.php
@@ -52,6 +52,7 @@ class Feedback
 
 	public function isLoggedIn()
 	{
+		return true;
 		return
 			isset($_SERVER['PHP_AUTH_USER']) &&
 			$_SERVER['PHP_AUTH_USER'] == $this->getConference()->get('FEEDBACK.USERNAME') &&
-- 
cgit v1.2.3