Merge branch 'saas-dev' into saas-speedy
This commit is contained in:
commit
e86e1cb4ac
20 changed files with 553 additions and 55 deletions
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
require_once('TuneIn.php');
|
||||
|
||||
$filepath = realpath (dirname(__FILE__));
|
||||
require_once($filepath."/../modules/rest/controllers/MediaController.php");
|
||||
|
@ -313,6 +314,14 @@ class ScheduleController extends Zend_Controller_Action
|
|||
public function getCurrentPlaylistAction()
|
||||
{
|
||||
$range = Application_Model_Schedule::GetPlayOrderRangeOld();
|
||||
|
||||
// If there is no current track playing update TuneIn so it doesn't
|
||||
// display outdated metadata
|
||||
//TODO: find a better solution for this so we don't spam the station on TuneIn
|
||||
/*if (is_null($range["current"]) && Application_Model_Preference::getTuneinEnabled()) {
|
||||
Application_Common_TuneIn::updateOfflineMetadata();
|
||||
}*/
|
||||
|
||||
$show = Application_Model_Show::getCurrentShow();
|
||||
|
||||
/* Convert all UTC times to localtime before sending back to user. */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue