From 310073dc6641a2b7b4d02377be040bf14f185b07 Mon Sep 17 00:00:00 2001
From: David Trattnig <david.trattnig@o94.at>
Date: Thu, 21 Nov 2019 02:33:34 +0100
Subject: [PATCH] Fixed filename reference.
---
modules/communication/liquidsoap/communicator.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules/communication/liquidsoap/communicator.py b/modules/communication/liquidsoap/communicator.py
index b9ec5ae7..d5a37a9f 100644
--- a/modules/communication/liquidsoap/communicator.py
+++ b/modules/communication/liquidsoap/communicator.py
@@ -232,6 +232,7 @@ class LiquidSoapCommunicator(ExceptionLogger):
if fade_in_time > 0:
self.fade_in_active = True
target_volume = new_entry.volume
+
step = fade_in_time / target_volume
self.logger.info("Starting to fading " + new_entry.type.value + " in. step is " + str(step) + "s. target volume is " + str(target_volume))
@@ -289,7 +290,10 @@ class LiquidSoapCommunicator(ExceptionLogger):
# grab the actual active entry
(show, old_entry) = self.scheduler.get_active_entry()
# determine its type
- old_type = old_entry.type
+ # FIXME Move to <get_active_entry>
+ old_type = ScheduleEntryType.FILESYSTEM
+ if old_entry:
+ old_type = old_entry.type
try:
# enable transaction
@@ -319,7 +323,7 @@ class LiquidSoapCommunicator(ExceptionLogger):
# push to fs or stream
if entry.type == ScheduleEntryType.FILESYSTEM:
- self.playlist_push(entry.source)
+ self.playlist_push(entry.filename)
self.active_channel = entry.type
elif entry.type == ScheduleEntryType.STREAM:
--
GitLab