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

CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set

Browse source
This commit is contained in:
denise 2013-05-29 13:14:44 -04:00
parent 4a7a08a119
commit 4c2de70256
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -711,8 +711,8 @@ class Application_Model_Scheduler
$doInsert = true; $doInsert = true;
} }
$endTimeDT = $this->findEndTime($nextStartDT, $file['cliplength']); //$endTimeDT = $this->findEndTime($nextStartDT, $file['cliplength']);
$endTimeDT = $this->findTimeDifference($endTimeDT, $this->crossfadeDuration); //$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 +733,14 @@ class Application_Model_Scheduler
if ($applyCrossfades) { if ($applyCrossfades) {
$nextStartDT = $this->findTimeDifference($nextStartDT, $nextStartDT = $this->findTimeDifference($nextStartDT,
$this->crossfadeDuration); $this->crossfadeDuration);
$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")}', ".