From 99a0ce37cc2286e43d53f7e8cf4292d9f3e79943 Mon Sep 17 00:00:00 2001 From: Lucas Bickel Date: Mon, 13 Mar 2017 14:30:51 +0100 Subject: [PATCH] Fix fix_cue_in to work with liquidsoap 1.2 The previous syntax only worked with 1.1, this one should work on both. --- python_apps/pypo/liquidsoap/ls_script.liq | 34 +++++++++++++---------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/python_apps/pypo/liquidsoap/ls_script.liq b/python_apps/pypo/liquidsoap/ls_script.liq index 7db04d417..43f58ff7e 100644 --- a/python_apps/pypo/liquidsoap/ls_script.liq +++ b/python_apps/pypo/liquidsoap/ls_script.liq @@ -45,26 +45,30 @@ def check_version(~version=liquidsoap.version, major, minor) = list.nth(v,0) > major or list.nth(v,0) == major and list.nth(v,1) >= minor end +# cue cut fix for liquidsoap <1.2.2 +# +# This was most likely broken on 1.1.1 (debian) as well. +# +# adapted from https://github.com/savonet/liquidsoap/issues/390#issuecomment-277562081 +# +def fix_cue_in(~cue_in_metadata='liq_cue_in', m) = + # 0.04 might need to be adjusted according to your frame size + if float_of_string(m[cue_in_metadata]) < 0.04 then + [(cue_in_metadata, "0")] + else + [] + end +end + def create_source() l = request.equeue(id="s#{!source_id}", length=0.5) l = audio_to_stereo(id="queue_src", l) - # cue cut fix for liquidsoap <1.2.2 - # - # This was most likely broken on 1.1.1 (debian) as well. - # - # adapted from https://github.com/savonet/liquidsoap/issues/390#issuecomment-277562081 - # - if not check_version(1, 3) then - l = map_metadata(fun (~cue_in_metadata='liq_cue_in', m) -> - # 0.04 might need to be adjusted according to your frame size - if float_of_string(m[cue_in_metadata]) < 0.04 then - [(cue_in_metadata, "0")] - else - [] - end - end) + l = if not check_version(1, 3) then + map_metadata(fix_cue_in, l) + else + l end l = cue_cut(l) l = amplify(1., override="replay_gain", l)