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

CC-5180: Now Playing: No crossfading effects if inserting tracks one by one

Browse source
This commit is contained in:
denise 2013-05-29 09:41:06 -04:00
parent 1e9829e85c
commit be59810810
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -612,6 +612,11 @@ class Application_Model_Scheduler
$instanceId); $instanceId);
$pos++; $pos++;
/* Show is not empty so we need to apply crossfades
* for the first inserted item
*/
$applyCrossfades = true;
} }
//selected empty row to add after //selected empty row to add after
else { else {
@ -620,6 +625,11 @@ class Application_Model_Scheduler
//first item in show so start position counter at 0 //first item in show so start position counter at 0
$pos = 0; $pos = 0;
/* Show is empty so we don't need to calculate crossfades
* for the first inserted item
*/
$applyCrossfades = false;
} }
if (!in_array($instanceId, $affectedShowInstances)) { if (!in_array($instanceId, $affectedShowInstances)) {
@ -714,6 +724,15 @@ class Application_Model_Scheduler
default: break; default: break;
} }
if ($applyCrossfades) {
$nextStartDT = $this->findTimeDifference($nextStartDT,
$this->crossfadeDuration);
/* Set it to false because the rest of the crossfades
* will be applied after we insert each item
*/
$applyCrossfades = false;
}
if ($doInsert) { if ($doInsert) {
$values[] = "(". $values[] = "(".
"'{$nextStartDT->format("Y-m-d H:i:s")}', ". "'{$nextStartDT->format("Y-m-d H:i:s")}', ".