CC-2301 : running dos2unix on 3 files.
This commit is contained in:
parent
410d298272
commit
58957cc919
3 changed files with 51 additions and 51 deletions
|
@ -99,7 +99,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable
|
|||
$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->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME);
|
||||
|
@ -230,9 +230,9 @@ SQL;
|
|||
|
||||
$clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
|
||||
|
||||
$row['trackSec'] = $clipSec;
|
||||
|
||||
$row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
|
||||
$row['trackSec'] = $clipSec;
|
||||
|
||||
$row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
|
||||
$row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
|
||||
|
||||
$offset += $clipSec;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue