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

CC-3224: "On-the-fly" stream rebroadcasting

Browse source 
- Live source is created when only both port and mount point are specified
This commit is contained in:
James 2012-02-23 11:51:20 -05:00
parent 30901aa0d6
commit 1ebe3d1812
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -206,9 +206,10 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_StreamSetting::setStreamSetting($values);
$data = array();
$data['setting'] = Application_Model_StreamSetting::getStreamSetting();
$data['setting']['harbor_input_port'] = $values["harbor_input_port"];
$data['setting']['harbor_input_mount_point'] = $values["harbor_input_mount_point"];
$info = Application_Model_StreamSetting::getStreamSetting();
$info[] = (array("keyname" =>"harbor_input_port", "value"=>$values["harbor_input_port"], "type"=>"integer"));
$info[] = (array("keyname" =>"harbor_input_mount_point", "value"=>$values["harbor_input_mount_point"], "type"=>"string"));
$data['setting'] = $info;
for($i=1;$i<=$num_of_stream;$i++){
Application_Model_StreamSetting::setLiquidsoapError($i, "waiting");
}

1
airtime_mvc/application/forms/LiveStreamingPreferences.php
View file

@ -32,6 +32,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
$master_password->setAttrib('autocomplete', 'off')
->setAttrib('renderPassword','true')
->setAllowEmpty(true)
->setValue(Application_Model_Preference::GetLiveSteamMasterPassword())
->setLabel('Master Password')
->setFilters(array('StringTrim'))
->setDecorators(array('ViewHelper'));

2
airtime_mvc/application/models/Preference.php
View file

@ -722,7 +722,7 @@ class Application_Model_Preference
}
public static function SetLiveSteamMasterPassword($value){
self::SetValue("live_stream_master_password", md5($value), false);
self::SetValue("live_stream_master_password", $value, false);
}
public static function GetLiveSteamMasterPassword(){