Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch 

status when it restarts

- missed one file from previous commit
This commit is contained in:
James 2012-03-14 10:28:48 -04:00
parent 3c6aff093e
commit 06e810c35d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
airtime_mvc/application/controllers/ApiController.php
View File

@ -30,6 +30,7 @@ class ApiController extends Zend_Controller_Action
->addActionContext('rabbitmq-do-push', 'json') ->addActionContext('rabbitmq-do-push', 'json')
->addActionContext('check-live-stream-auth', 'json') ->addActionContext('check-live-stream-auth', 'json')
->addActionContext('update-source-status', 'json') ->addActionContext('update-source-status', 'json')
->addActionContext('get-switch-status', 'json')
->initContext(); ->initContext();
} }
@ -995,6 +996,17 @@ class ApiController extends Zend_Controller_Action
Application_Model_RabbitMq::PushSchedule(); Application_Model_RabbitMq::PushSchedule();
} }
public function getSwitchStatusAction(){
$live_dj = Application_Model_Preference::GetSourceSwitchStatus('live_dj');
$master_dj = Application_Model_Preference::GetSourceSwitchStatus('master_dj');
$scheduled_play = Application_Model_Preference::GetSourceSwitchStatus('scheduled_play');
$res = array("live_dj"=>$live_dj, "master_dj"=>$master_dj, "scheduled_play"=>$scheduled_play);
$this->view->status = $res;
}
/* This is used but Liquidsoap to check authentication of live streams*/
public function checkLiveStreamAuthAction(){ public function checkLiveStreamAuthAction(){
global $CC_CONFIG; global $CC_CONFIG;