Updates to handle a newer build of Liquidsoap 2.x

This commit is contained in:
Buster "Silver Eagle" Neece 2021-12-09 05:35:46 -06:00
parent fec3fa2524
commit fe4cdaaae8
No known key found for this signature in database
GPG Key ID: 9CCCDD66FED79429
1 changed files with 10 additions and 12 deletions

View File

@ -436,7 +436,7 @@ class ConfigWriter implements EventSubscriberInterface
autodj_ping_attempts := !autodj_ping_attempts + 1 autodj_ping_attempts := !autodj_ping_attempts + 1
delay = ref(0.5) delay = ref(0.5)
if source.is_ready(!autodj) then if source.is_ready(autodj) then
log("AutoDJ is ready!") log("AutoDJ is ready!")
autodj_is_loading := false autodj_is_loading := false
@ -468,7 +468,7 @@ class ConfigWriter implements EventSubscriberInterface
radio = fallback(id="autodj_fallback", track_sensitive = true, [dynamic_startup, radio]) radio = fallback(id="autodj_fallback", track_sensitive = true, [dynamic_startup, radio])
ref_dynamic = ref(dynamic); ref_dynamic = ref(dynamic);
thread.run.recurrent(delay=0.25, { wait_for_next_song(ref_dynamic) }) thread.run.recurrent(delay=0.25, { wait_for_next_song(!ref_dynamic) })
EOF EOF
); );
} }
@ -845,15 +845,6 @@ class ConfigWriter implements EventSubscriberInterface
$event->appendBlock( $event->appendBlock(
<<< EOF <<< EOF
# Record Live Broadcasts # Record Live Broadcasts
def recording_stopped(tempPath) =
path = string.replace(pattern=".tmp$", (fun(_) -> ""), tempPath)
log("Recording stopped: Switching from #{tempPath} to #{path}")
process.run("mv #{tempPath} #{path}")
()
end
output.file( output.file(
{$formatString}, {$formatString},
fun () -> begin fun () -> begin
@ -866,7 +857,14 @@ class ConfigWriter implements EventSubscriberInterface
end, end,
live, live,
fallible=true, fallible=true,
on_close=recording_stopped on_close=fun (tempPath) -> begin
path = string.replace(pattern=".tmp$", (fun(_) -> ""), tempPath)
log("Recording stopped: Switching from #{tempPath} to #{path}")
process.run("mv #{tempPath} #{path}")
()
end
) )
EOF EOF
); );