diff --git a/conjurer_musician/radio_conjurer.liq b/conjurer_musician/radio_conjurer.liq index 71bcced..2b7f9a3 100644 --- a/conjurer_musician/radio_conjurer.liq +++ b/conjurer_musician/radio_conjurer.liq @@ -41,18 +41,9 @@ let json.parse credentials = file.contents("/home/pi/Conjurer/icecast_credentia end # Randomly select a playlist with weights - s = random(id="randomizer", weights=[1, 3, 2], [s1, s2, s3]) - #s = delay(duration=5., s) - #radio = add([delay(1800., jingles), music]) - #radio = fallback([delay(1800., jingles), music]) - #p = predicate.signal() - #radio = switch([(p, jingles), ({true}, music)]) - #thread.run(every=1200., {p.signal()}) -# def cmd(_) -# p.signal() -# "Jingle inserted!" -# end -# server.register("insert_jingle", cmd) + s4 = random(id="randomizer", weights=[1, 3, 2], [s1, s2, s3]) + jingles = (playlist(reload_mode="watch", "/home/pi/Conjurer/jingles.playlist")) + s = rotate(id="randomizer", weights=[20, 1], [s4, jingles]) # Set up an interactive harbor for controlling the stream interactive.harbor(port = 9999)