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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-04-18 15:45:15 -04:00
commit 70a51f1aca
5 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -333,6 +333,7 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction()
{
$range = Application_Model_Schedule::GetPlayOrderRange();
$show = Application_Model_Show::GetCurrentShow();
/* Convert all UTC times to localtime before sending back to user. */
if (isset($range["previous"])){
@ -371,6 +372,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->switch_status = $switch_status;
$this->view->entries = $range;
$this->view->show_name = $show[0]["name"];
}
public function removeGroupAction()
@ -850,7 +852,10 @@ class ScheduleController extends Zend_Controller_Action
try {
$scheduler = new Application_Model_Scheduler();
$scheduler->cancelShow($id);
$scheduler->cancelShow($id);
// send kick out source stream signal to pypo
$data = array("sourcename"=>"live_dj");
Application_Model_RabbitMq::SendMessageToPypo("disconnect_source", $data);
}
catch (Exception $e) {
$this->view->error = $e->getMessage();