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

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

Browse source
This commit is contained in:
Martin Konecny 2013-05-29 13:48:01 -04:00
commit 2a2fd45567
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/Scheduler.php
View file

@ -711,8 +711,6 @@ class Application_Model_Scheduler
$doInsert = true; $doInsert = true;
} }
$endTimeDT = $this->findEndTime($nextStartDT, $file['cliplength']);
$endTimeDT = $this->findTimeDifference($endTimeDT, $this->crossfadeDuration);
// default fades are in seconds // default fades are in seconds
// we need to convert to '00:00:00' format // we need to convert to '00:00:00' format
$file['fadein'] = Application_Common_DateHelper::secondsToPlaylistTime($file['fadein']); $file['fadein'] = Application_Common_DateHelper::secondsToPlaylistTime($file['fadein']);
@ -733,12 +731,15 @@ class Application_Model_Scheduler
if ($applyCrossfades) { if ($applyCrossfades) {
$nextStartDT = $this->findTimeDifference($nextStartDT, $nextStartDT = $this->findTimeDifference($nextStartDT,
$this->crossfadeDuration); $this->crossfadeDuration);
$endTimeDT = $this->findEndTime($nextStartDT, $file['cliplength']);
$endTimeDT = $this->findTimeDifference($endTimeDT, $this->crossfadeDuration);
/* Set it to false because the rest of the crossfades /* Set it to false because the rest of the crossfades
* will be applied after we insert each item * will be applied after we insert each item
*/ */
$applyCrossfades = false; $applyCrossfades = false;
} }
$endTimeDT = $this->findEndTime($nextStartDT, $file['cliplength']);
if ($doInsert) { if ($doInsert) {
$values[] = "(". $values[] = "(".
"'{$nextStartDT->format("Y-m-d H:i:s")}', ". "'{$nextStartDT->format("Y-m-d H:i:s")}', ".