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

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

Browse source 
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
This commit is contained in:
James 2012-03-02 16:55:11 -05:00
parent 96c4462adc
commit 128a497059
16 changed files with 304 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/AddShowLiveStream.php
View file

@ -37,7 +37,6 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
->setFilters(array('StringTrim'))
->setValidators(array(
new ConditionalNotEmpty(array("cb_custom_auth"=>"1"))))
->setValue(Application_Model_Preference::GetLiveSteamMasterUsername())
->setDecorators(array('ViewHelper'));
$this->addElement($custom_username);
@ -51,7 +50,6 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
->setFilters(array('StringTrim'))
->setValidators(array(
new ConditionalNotEmpty(array("cb_custom_auth"=>"1"))))
//fix//->setValue(Application_Model_Preference::GetLiveSteamMasterUsername())
->setDecorators(array('ViewHelper'));
$this->addElement($custom_password);

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

@ -39,17 +39,34 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
$this->addElement($master_password);
//liquidsoap harbor.input port
$port = new Zend_Form_Element_Text('harbor_input_port');
$port->setLabel("Port to Connect")
->setValue(Application_Model_Preference::GetLiveSteamPort())
$port = new Zend_Form_Element_Text('master_harbor_input_port');
$port->setLabel("Master DJ Port")
->setValue(Application_Model_StreamSetting::GetMasterLiveSteamPort())
->setValidators(array(new Zend_Validate_Between(array('min'=>0, 'max'=>99999))))
->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
->setDecorators(array('ViewHelper'));
$this->addElement($port);
$mount = new Zend_Form_Element_Text('harbor_input_mount_point');
$mount->setLabel("Mount Point to Connect")
->setValue(Application_Model_Preference::GetLiveSteamMountPoint())
$mount = new Zend_Form_Element_Text('master_harbor_input_mount_point');
$mount->setLabel("Master DJ Mount Point")
->setValue(Application_Model_StreamSetting::GetMasterLiveSteamMountPoint())
->setValidators(array(
array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
->setDecorators(array('ViewHelper'));
$this->addElement($mount);
//liquidsoap harbor.input port
$port = new Zend_Form_Element_Text('dj_harbor_input_port');
$port->setLabel("DJ Port")
->setValue(Application_Model_StreamSetting::GetDJLiveSteamPort())
->setValidators(array(new Zend_Validate_Between(array('min'=>0, 'max'=>99999))))
->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
->setDecorators(array('ViewHelper'));
$this->addElement($port);
$mount = new Zend_Form_Element_Text('dj_harbor_input_mount_point');
$mount->setLabel("DJ Mount Point")
->setValue(Application_Model_StreamSetting::GetDJLiveSteamMountPoint())
->setValidators(array(
array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
->setDecorators(array('ViewHelper'));