Skip to content
Snippets Groups Projects
Commit 310073dc authored by David Trattnig's avatar David Trattnig
Browse files

Fixed filename reference.

parent 05bb20a2
No related branches found
No related tags found
No related merge requests found
...@@ -232,6 +232,7 @@ class LiquidSoapCommunicator(ExceptionLogger): ...@@ -232,6 +232,7 @@ class LiquidSoapCommunicator(ExceptionLogger):
if fade_in_time > 0: if fade_in_time > 0:
self.fade_in_active = True self.fade_in_active = True
target_volume = new_entry.volume target_volume = new_entry.volume
step = fade_in_time / target_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)) 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): ...@@ -289,7 +290,10 @@ class LiquidSoapCommunicator(ExceptionLogger):
# grab the actual active entry # grab the actual active entry
(show, old_entry) = self.scheduler.get_active_entry() (show, old_entry) = self.scheduler.get_active_entry()
# determine its type # 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: try:
# enable transaction # enable transaction
...@@ -319,7 +323,7 @@ class LiquidSoapCommunicator(ExceptionLogger): ...@@ -319,7 +323,7 @@ class LiquidSoapCommunicator(ExceptionLogger):
# push to fs or stream # push to fs or stream
if entry.type == ScheduleEntryType.FILESYSTEM: if entry.type == ScheduleEntryType.FILESYSTEM:
self.playlist_push(entry.source) self.playlist_push(entry.filename)
self.active_channel = entry.type self.active_channel = entry.type
elif entry.type == ScheduleEntryType.STREAM: elif entry.type == ScheduleEntryType.STREAM:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment