tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Minor refactor of adjusted now on Queue.

This commit is contained in:
Buster "Silver Eagle" Neece 2021-02-09 17:01:27 -06:00
parent 4344d0ee6e
commit 4adcde551c
No known key found for this signature in database
GPG Key ID: 6D9E12FF03411F4E
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Radio/AutoDJ.php
View File

@ -159,12 +159,12 @@ class AutoDJ
$this->logger->popProcessor();
}
protected function getAdjustedNow(Entity\Station $station, CarbonInterface $now, int $duration): CarbonInterface
protected function getAdjustedNow(Entity\Station $station, CarbonInterface $now, ?int $duration): CarbonInterface
{
$backendConfig = $station->getBackendConfig();
$startNext = $backendConfig->getCrossfadeDuration();
$now = $now->addSeconds($duration);
$now = $now->addSeconds($duration ?? 1);
return ($duration >= $startNext)
? $now->subMilliseconds((int)($startNext * 1000))
: $now;
@ -183,17 +183,7 @@ class AutoDJ
$startTimestamp = $currentSong->getTimestampStart();
$started = CarbonImmutable::createFromTimestamp($startTimestamp, $stationTz);
$currentSongDuration = ($currentSong->getDuration() ?? 1);
$adjustedNow = $this->getAdjustedNow($station, $started, $currentSongDuration);
$this->logger->debug(
'Got currently playing song. Using start time and duration for initial value of now.',
[
'song' => $currentSong->getText(),
'started' => (string)$started,
'duration' => $currentSongDuration,
]
);
$adjustedNow = $this->getAdjustedNow($station, $started, $currentSong->getDuration());
// Return either the current timestamp (if it's later) or the scheduled end time.
return max($now, $adjustedNow);
@ -222,8 +212,7 @@ class AutoDJ
$queueRow->setLog($testHandler->getRecords());
$this->em->persist($queueRow);
$duration = $queueRow->getDuration() ?? 1;
$now = $this->getAdjustedNow($station, $now, $duration);
$now = $this->getAdjustedNow($station, $now, $queueRow->getDuration());
}
return $now;