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

CC-2301 : creating an offset column to help create crossfades in the playlist.

Browse source 
changing default fade to be a separate default fade in/out
This commit is contained in:
Naomi 2013-04-29 16:55:08 -04:00
parent ef100f89f1
commit 410d298272
14 changed files with 273 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

35
airtime_mvc/application/forms/GeneralPreferences.php
View file

@ -12,11 +12,9 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
array('ViewScript', array('viewScript' => 'form/preferences_general.phtml'))
));
$defaultFade = Application_Model_Preference::GetDefaultFade();
if ($defaultFade == "") {
$defaultFade = '0.5';
}
$defaultFadeIn = Application_Model_Preference::GetDefaultFadeIn();
$defaultFadeOut = Application_Model_Preference::GetDefaultFadeOut();
//Station name
$this->addElement('text', 'stationName', array(
'class' => 'input_text',
@ -29,10 +27,10 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
)
));
//Default station fade
$this->addElement('text', 'stationDefaultFade', array(
//Default station fade in
$this->addElement('text', 'stationDefaultFadeIn', array(
'class' => 'input_text',
'label' => _('Default Fade (s):'),
'label' => _('Default Fade In (s):'),
'required' => true,
'filters' => array('StringTrim'),
'validators' => array(
@ -42,11 +40,30 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
)
),
'value' => $defaultFade,
'value' => $defaultFadeIn,
'decorators' => array(
'ViewHelper'
)
));
//Default station fade out
$this->addElement('text', 'stationDefaultFadeOut', array(
'class' => 'input_text',
'label' => _('Default Fade Out (s):'),
'required' => true,
'filters' => array('StringTrim'),
'validators' => array(
array(
$rangeValidator,
$notEmptyValidator,
'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
)
),
'value' => $defaultFadeOut,
'decorators' => array(
'ViewHelper'
)
));
$third_party_api = new Zend_Form_Element_Radio('thirdPartyApi');
$third_party_api->setLabel(