CC-3224: "On-the-fly" stream rebroadcasting
- removed "Allow override" checkbox from show live stream section. - removed "auto enable live stream" checkbox from stream setting page. - implemented authentication functionality of live dj source connection.
This commit is contained in:
parent
efee025691
commit
540f262a77
14 changed files with 49 additions and 171 deletions
|
@ -6,12 +6,6 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
|
|||
|
||||
public function init()
|
||||
{
|
||||
$allow_live_stream = new Zend_Form_Element_Checkbox("allow_live_stream_override");
|
||||
$allow_live_stream->setLabel("Allow Live Stream Override")
|
||||
->setRequired(false)
|
||||
->setDecorators(array('ViewHelper'));
|
||||
$this->addElement($allow_live_stream);
|
||||
|
||||
$description1 = "This follows the same security pattern for the shows: if no users are explicitly set for the show, then anyone with a valid airtime login can connect to the stream, otherwise if there are users assigned to the show, then only those users can connect.";
|
||||
$cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
|
||||
$cb_airtime_auth->setLabel("Connect using Airtime username & password")
|
||||
|
|
|
@ -9,14 +9,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
|
|||
array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml'))
|
||||
));
|
||||
|
||||
//enable Auto-enable for all shows
|
||||
$auto_enable = new Zend_Form_Element_Checkbox('auto_enable_live_stream');
|
||||
$auto_enable->setLabel('Auto-enable for all shows')
|
||||
->setRequired(false)
|
||||
->setValue(Application_Model_Preference::GetLiveSteamAutoEnable())
|
||||
->setDecorators(array('ViewHelper'));
|
||||
$this->addElement($auto_enable);
|
||||
|
||||
//Master username
|
||||
$master_username = new Zend_Form_Element_Text('master_username');
|
||||
$master_username->setAttrib('autocomplete', 'off')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue