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

Merge pull request #742 from mikeopensauce/apistatus

Browse source 
Apistatus
This commit is contained in:
Robb 2019-02-18 12:22:17 -05:00 • committed by GitHub
commit f3b1133c3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
airtime_mvc/application/controllers/ApiController.php
View file

@ -186,6 +186,10 @@ class ApiController extends Zend_Controller_Action
$result["on_air_light"] = false;
$result["on_air_light_expected_status"] = false;
$result["station_down"] = false;
$result["master_stream"] = false;
$result["live_stream"] = false;
$result["master_stream_on_air"] = false;
$result["live_stream_on_air"] = false;
$range = Application_Model_Schedule::GetPlayOrderRange();
@ -211,6 +215,25 @@ class ApiController extends Zend_Controller_Action
$result["station_down"] = true;
}
$live_dj_stream = Application_Model_Preference::GetSourceStatus("live_dj");
$master_dj_stream = Application_Model_Preference::GetSourceStatus("master_dj");
$live_dj_on_air = Application_Model_Preference::GetSourceSwitchStatus("live_dj");
$master_dj_on_air = Application_Model_Preference::GetSourceSwitchStatus("master_dj");
if($live_dj_stream == true){
$result["live_stream"] = true;
if ($live_dj_on_air == "on") {
$result["live_stream_on_air"] = true;
}
}
if($master_dj_stream == true){
$result["master_stream"] = true;
if ($master_dj_on_air == "on") {
$result["master_stream_on_air"] = true;
}
}
$this->returnJsonOrJsonp($request, $result);
}