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

CC-2301 : running dos2unix on 3 files.

Browse source
This commit is contained in:
Naomi 2013-04-29 17:01:08 -04:00
parent 410d298272
commit 58957cc919
3 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,23 +46,23 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
) )
)); ));
//Default station fade out //Default station fade out
$this->addElement('text', 'stationDefaultFadeOut', array( $this->addElement('text', 'stationDefaultFadeOut', array(
'class' => 'input_text', 'class' => 'input_text',
'label' => _('Default Fade Out (s):'), 'label' => _('Default Fade Out (s):'),
'required' => true, 'required' => true,
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
array( array(
$rangeValidator, $rangeValidator,
$notEmptyValidator, $notEmptyValidator,
'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}')) 'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
) )
), ),
'value' => $defaultFadeOut, 'value' => $defaultFadeOut,
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
) )
)); ));
$third_party_api = new Zend_Form_Element_Radio('thirdPartyApi'); $third_party_api = new Zend_Form_Element_Radio('thirdPartyApi');

8
airtime_mvc/application/models/Block.php
View file

@ -99,7 +99,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable
$this->block->save(); $this->block->save();
} }
$this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn(); $this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn();
$this->blockItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut(); $this->blockItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut();
$this->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME); $this->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME);
@ -230,9 +230,9 @@ SQL;
$clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']); $clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
$row['trackSec'] = $clipSec; $row['trackSec'] = $clipSec;
$row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']); $row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
$row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']); $row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
$offset += $clipSec; $offset += $clipSec;

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

@ -195,38 +195,38 @@ class Application_Model_Preference
} }
} }
public static function SetDefaultFadeIn($fade) public static function SetDefaultFadeIn($fade)
{ {
self::setValue("default_fade_in", $fade); self::setValue("default_fade_in", $fade);
}
public static function GetDefaultFadeIn()
{
$fade = self::getValue("default_fade_in");
if ($fade === "") {
// the default value of the fade is 00.5
return "00.5";
}
return $fade;
} }
public static function SetDefaultFadeOut($fade) public static function GetDefaultFadeIn()
{ {
self::setValue("default_fade_out", $fade); $fade = self::getValue("default_fade_in");
}
if ($fade === "") {
public static function GetDefaultFadeOut() // the default value of the fade is 00.5
{ return "00.5";
$fade = self::getValue("default_fade_out"); }
if ($fade === "") { return $fade;
// the default value of the fade is 00.5 }
return "00.5";
} public static function SetDefaultFadeOut($fade)
{
return $fade; self::setValue("default_fade_out", $fade);
}
public static function GetDefaultFadeOut()
{
$fade = self::getValue("default_fade_out");
if ($fade === "") {
// the default value of the fade is 00.5
return "00.5";
}
return $fade;
} }
public static function SetDefaultFade($fade) public static function SetDefaultFade($fade)