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

CC-3430: Live Stream: Admin should be able to kick out the source connection

Browse source 
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
This commit is contained in:
James 2012-03-14 11:09:59 -04:00
parent 2ee4b227fc
commit c5c9fd7ba8
6 changed files with 50 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
airtime_mvc/application/controllers/DashboardController.php
View file

@ -7,6 +7,7 @@ class DashboardController extends Zend_Controller_Action
{
$ajaxContext = $this->_helper->getHelper('AjaxContext');
$ajaxContext->addActionContext('switch-source', 'json')
->addActionContext('disconnect-source', 'json')
->initContext();
}
@ -15,9 +16,17 @@ class DashboardController extends Zend_Controller_Action
// action body
}
public function disconnectSourceAction(){
$request = $this->getRequest();
$sourcename = $request->getParam('sourcename');
$data = array("sourcename"=>$sourcename);
Application_Model_RabbitMq::SendMessageToPypo("disconnect_source", $data);
}
public function switchSourceAction(){
$request = $this->getRequest();
$baseUrl = $request->getBaseUrl();
$sourcename = $this->_getParam('sourcename');
$current_status = $this->_getParam('status');
$change_status_to = "on";

4
airtime_mvc/application/views/scripts/partialviews/header.phtml
View file

@ -33,7 +33,7 @@
</li>
<li>
<div id="live_dj_div">
<?php if($this->isAdmin){?><a id="live_dj_connection" class="source-kick-button" onclick="kickSource(this)"></a><?php }?>
<?php if($this->isAdmin){?><a id="live_dj" class="source-kick-button" onclick="kickSource(this)"></a><?php }?>
Live DJ
<div class="line-to-on-air off"></div>
<a href="#" id="live_dj" class="source-switch-button" onclick="<?php echo ($this->isAdmin)?"setSwitchListener(this);":"return false"?>"><span><?php echo $this->live_dj_switch?></span></a>
@ -42,7 +42,7 @@
</li>
<li>
<div id="master_dj_div">
<?php if($this->isAdmin){?><a id="master_dj_connection" class="source-kick-button" onclick="kickSource(this)"></a><?php }?>
<?php if($this->isAdmin){?><a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a><?php }?>
Master DJ
<div class="line-to-on-air off"></div>
<a href="#" id="master_dj" class="source-switch-button" onclick="<?php echo ($this->isAdmin)?"setSwitchListener(this);":"return false"?>"><span><?php echo $this->master_dj_switch?></span></a>