From b8cc526aad48e14370b9c7e7ab707a15ec1d73e7 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Fri, 11 Jan 2019 13:36:49 +0200 Subject: [PATCH] schedule as playlist --- liq/schedule.pls | 1 + liq/view.liq | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 liq/schedule.pls diff --git a/liq/schedule.pls b/liq/schedule.pls new file mode 100644 index 0000000..261f82b --- /dev/null +++ b/liq/schedule.pls @@ -0,0 +1 @@ +annotate:width=300,height=400,x=900,y=80:schedule.png diff --git a/liq/view.liq b/liq/view.liq index 1142fa5..6122709 100644 --- a/liq/view.liq +++ b/liq/view.liq @@ -12,22 +12,27 @@ set("frame.video.width",confint("liquidsoap.output.width", 1280)) set("frame.video.height",confint("liquidsoap.output.height", 720)) set("frame.video.samplerate",confint("liquidsoap.output.samplerate", 25)) +# Schedule image video_no_queue = single(confstr("liquidsoap.fallback",""), conservative=true) -video_base = video.add_image( - width=confint("calendar.width", 300),height=confint("calendar.height", 400), - x=900,y=80, - file="schedule.png", - video_no_queue) -add_skip_command(command="schedule.reload", video_base) +image_schedule = playlist("schedule.pls",reload_mode="watch") +image_schedule = mux_audio(audio=blank(),image_schedule) +add_skip_command(command="schedule.reload", image_schedule) + +video_base = add([video_no_queue,image_schedule]) + +# Queue queue1 = request.equeue(id="queue", conservative=true, length=60., timeout=1000.) add_skip_command(command="queue.skip", queue1) +# Fallback to queue source = fallback([queue1, video_base],track_sensitive=false) add_skip_command(command="skip", source) +# Add file cleanup source = on_end(delay=0., file_end_cleanup, source) +# Output to RTMP output.rtmp.live( key=confstr("rtmp.key",""), url=confstr("rtmp.url","rtmp://localhost/live"),