From a2bad03489d7bb1d609b6b7746da11c97c23d973 Mon Sep 17 00:00:00 2001 From: Anton Schubert Date: Fri, 4 Sep 2020 19:51:14 +0200 Subject: Revert "add back HD streams to streams api, add poster url to api-v2" This reverts commit fa6f1dd85567d19a4e435237b28da7cdc9c6e564. --- model/Room.php | 6 +----- view/streams-json-v2.php | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/model/Room.php b/model/Room.php index f1cb933..28c60c6 100644 --- a/model/Room.php +++ b/model/Room.php @@ -51,10 +51,6 @@ class Room return proto().'://'.joinpath([$GLOBALS['CONFIG']['CDN'], 'thumbnail', $this->getStream(), 'thumb.jpeg']); } - public function getPoster() { - return proto().'://'.joinpath([$GLOBALS['CONFIG']['CDN'], 'thumbnail', $this->getStream(), 'poster.jpeg']); - } - public function getLink() { return joinpath([$this->getConference()->getSlug(), $this->getSlug()]).url_params(); } @@ -252,7 +248,7 @@ class Room public function getSelectionNames() { - $selections = array('hd'); + $selections = array(); if($this->hasDash()) $selections[] = 'dash'; diff --git a/view/streams-json-v2.php b/view/streams-json-v2.php index 24436de..9fe0792 100644 --- a/view/streams-json-v2.php +++ b/view/streams-json-v2.php @@ -105,7 +105,6 @@ foreach (Conferences::getActiveConferences() as $conference) 'slug' => $room->getSlug(), 'schedulename' => $room->getScheduleName(), 'thumb' => $room->getThumb(), - 'poster' => $room->getPoster(), 'link' => forceslash(baseurl()).$room->getLink(), 'display' => $room->getDisplay(), 'stream' => $room->getStream(), -- cgit v1.2.3