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

Refactor some stuff related to four streams, Liquidsoap is a piece of

Browse source 
shit too - no dynamic variables
This commit is contained in:
Albert Santoni 2015-03-10 19:15:38 -04:00
parent 6232e3f4f0
commit 0042fb50fe
9 changed files with 130 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1308,7 +1308,7 @@ class ApiController extends Zend_Controller_Action
}
public function getStreamParametersAction() {
$streams = array("s1", "s2", "s3");
$streams = array("s1", "s2", "s3", "s4");
$stream_params = array();
foreach ($streams as $s) {
$stream_params[$s] =

10
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -141,11 +141,7 @@ class PreferenceController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/streamsetting.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
// get current settings
$temp = Application_Model_StreamSetting::getStreamSetting();
$setting = array();
foreach ($temp as $t) {
$setting[$t['keyname']] = $t['value'];
}
$setting = Application_Model_StreamSetting::getStreamSetting();
$name_map = array(
'ogg' => 'Ogg Vorbis',
@ -208,6 +204,7 @@ class PreferenceController extends Zend_Controller_Action
$s1_data = array();
$s2_data = array();
$s3_data = array();
$s4_data = array();
$values = array();
foreach($postData as $k=>$v) {
$v = explode('=', urldecode($v));
@ -447,7 +444,8 @@ class PreferenceController extends Zend_Controller_Action
public function getAdminPasswordStatusAction()
{
$out = array();
for ($i=1; $i<=4; $i++) {
$num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
for ($i=1; $i<=$num_of_stream; $i++) {
if (Application_Model_StreamSetting::getAdminPass('s'.$i)=='') {
$out["s".$i] = false;
} else {