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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-07-26 10:49:38 -04:00
parent 9bd823ee2c 077cc735d7
commit 40bd33df11
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/models/Scheduler.php
View File

@ -233,7 +233,7 @@ class Application_Model_Scheduler
$nextDT = $this->nowDT; $nextDT = $this->nowDT;
$length = bcsub($nEpoch , $sEpoch , 6); $length = bcsub($nEpoch , $sEpoch , 6);
$cliplength = Application_Model_Playlist::secondsToPlaylistTime($length); $cliplength = Application_Common_DateHelper::secondsToPlaylistTime($length);
//fillers are for only storing a chunk of time space that has already passed. //fillers are for only storing a chunk of time space that has already passed.
$filler = new CcSchedule(); $filler = new CcSchedule();
@ -574,11 +574,11 @@ class Application_Model_Scheduler
$sEpoch = $removedItem->getDbStarts('U.u'); $sEpoch = $removedItem->getDbStarts('U.u');
$length = bcsub($nEpoch , $sEpoch , 6); $length = bcsub($nEpoch , $sEpoch , 6);
$cliplength = Application_Model_Playlist::secondsToPlaylistTime($length); $cliplength = Application_Common_DateHelper::secondsToPlaylistTime($length);
$cueinSec = Application_Model_Playlist::playlistTimeToSeconds($removedItem->getDbCueIn()); $cueinSec = Application_Model_Playlist::playlistTimeToSeconds($removedItem->getDbCueIn());
$cueOutSec = bcadd($cueinSec , $length, 6); $cueOutSec = bcadd($cueinSec , $length, 6);
$cueout = Application_Model_Playlist::secondsToPlaylistTime($cueOutSec); $cueout = Application_Common_DateHelper::secondsToPlaylistTime($cueOutSec);
$removedItem->setDbCueOut($cueout) $removedItem->setDbCueOut($cueout)
->setDbClipLength($cliplength) ->setDbClipLength($cliplength)

2
airtime_mvc/application/models/formatters/TimeFilledFormatter.php
View File

@ -21,7 +21,7 @@ class TimeFilledFormatter {
$sign = ($this->_seconds < 0) ? "-" : "+"; $sign = ($this->_seconds < 0) ? "-" : "+";
$perfect = true; $perfect = true;
$time = Application_Model_Playlist::secondsToPlaylistTime(abs($this->_seconds)); $time = Application_Common_DateHelper::secondsToPlaylistTime(abs($this->_seconds));
$info = explode(":", $time); $info = explode(":", $time);
$formatted .= $sign; $formatted .= $sign;