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

CC-3551 : Change Cue Out for currently deleted track

This commit is contained in:
Naomi Aro 2012-03-30 12:24:55 +02:00
parent 206a8f111c
commit 9e9ae11725
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Schedule.php
View File

@ -416,6 +416,7 @@ class Application_Model_Schedule {
$predicates = " WHERE st.ends > '$p_startTime'"
." AND st.starts < '$p_endTime'"
." AND st.playout_status > 0"
." ORDER BY st.starts";
$sql = $baseQuery.$predicates;
@ -434,6 +435,7 @@ class Application_Model_Schedule {
$predicates = " WHERE st.ends > '$p_startTime'"
." AND st.starts < '$range_end'"
." AND st.playout_status > 0"
." ORDER BY st.starts"
." LIMIT 3";

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

@ -21,7 +21,7 @@ class Application_Model_Scheduler {
$this->con = Propel::getConnection(CcSchedulePeer::DATABASE_NAME);
$this->epochNow = floatval(microtime(true));
$this->epochNow = microtime(true);
$this->nowDT = DateTime::createFromFormat("U.u", $this->epochNow, new DateTimeZone("UTC"));
$this->user = Application_Model_User::GetCurrentUser();
@ -188,16 +188,16 @@ class Application_Model_Scheduler {
private function findNextStartTime($DT, $instance) {
$sEpoch = floatval($DT->format("U.u"));
$nowEpoch = $this->epochNow;
$sEpoch = $DT->format("U.u");
$nEpoch = $this->epochNow;
//check for if the show has started.
if ($nowEpoch > $sEpoch) {
if (bccomp( $nEpoch , $sEpoch , 6) === 1) {
//need some kind of placeholder for cc_schedule.
//playout_status will be -1.
$nextDT = $this->nowDT;
$length = $nowEpoch - $sEpoch;
$nextDT = $this->nowDT;
$length = bcsub($nEpoch , $sEpoch , 6);
$cliplength = Application_Model_Playlist::secondsToPlaylistTime($length);
//fillers are for only storing a chunk of time space that has already passed.
@ -447,13 +447,14 @@ class Application_Model_Scheduler {
if ($removedItem->isCurrentItem($this->epochNow)) {
$nEpoch = $this->epochNow;
$sEpoch = floatval($removedItem->getDbStarts('U.u'));
$length = $nEpoch - $sEpoch;
$sEpoch = $removedItem->getDbStarts('U.u');
$length = bcsub($nEpoch , $sEpoch , 6);
$cliplength = Application_Model_Playlist::secondsToPlaylistTime($length);
$cueinSec = Application_Model_Playlist::playlistTimeToSeconds($removedItem->getDbCueIn());
$cueOutSec = $cueinSec + $length;
$cueout = Application_Model_Playlist::secondsToPlaylistTime($length);
$cueOutSec = bcadd($cueinSec , $length, 6);
$cueout = Application_Model_Playlist::secondsToPlaylistTime($cueOutSec);
Logging::log('$nEpoch: '. $nEpoch);
Logging::log('$sEpoch: '. $sEpoch);
@ -462,7 +463,7 @@ class Application_Model_Scheduler {
$removedItem->setDbCueOut($cueout)
->setDbClipLength($cliplength)
->setDbEnds($now)
->setDbEnds($this->nowDT)
->save($this->con);
}
else {