From 801fb3b39187ae7f4b5b1aa20b46b3df1f0138fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Mon, 15 Oct 2018 19:00:03 +0200 Subject: [PATCH] conservative try --- state/liquidsoap/config/main.liq | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/state/liquidsoap/config/main.liq b/state/liquidsoap/config/main.liq index 258de37..483a011 100644 --- a/state/liquidsoap/config/main.liq +++ b/state/liquidsoap/config/main.liq @@ -113,62 +113,62 @@ Halloween = "/playlists/events/Halloween.m3u" ## END PLAYLISTS -randomsong = playlist(JoakimDiverse) +randomsong = random(playlist(conservative=true, JoakimDiverse)) count = list.length(playlist.parse(JoakimDiverse)) -randomsong = random(weights=[list.length(playlist.parse(AlternativeJoa)), count], [playlist(AlternativeJoa), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(AlternativeJoa)), count], [playlist(conservative=true, AlternativeJoa), randomsong]) count = count + list.length(playlist.parse(AlternativeJoa)) -randomsong = random(weights=[list.length(playlist.parse(DanAwesome)), count], [playlist(DanAwesome), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(DanAwesome)), count], [playlist(conservative=true, DanAwesome), randomsong]) count = count + list.length(playlist.parse(DanAwesome)) -randomsong = random(weights=[list.length(playlist.parse(DanDontStarve1)), count], [playlist(DanDontStarve1), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(DanDontStarve1)), count], [playlist(conservative=true, DanDontStarve1), randomsong]) count = count + list.length(playlist.parse(DanDontStarve1)) -randomsong = random(weights=[list.length(playlist.parse(DanDubstepThingies)), count], [playlist(DanDubstepThingies), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(DanDubstepThingies)), count], [playlist(conservative=true, DanDubstepThingies), randomsong]) count = count + list.length(playlist.parse(DanDubstepThingies)) -randomsong = random(weights=[list.length(playlist.parse(DanEdgyMusicYT)), count], [playlist(DanEdgyMusicYT), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(DanEdgyMusicYT)), count], [playlist(conservative=true, DanEdgyMusicYT), randomsong]) count = count + list.length(playlist.parse(DanEdgyMusicYT)) -randomsong = random(weights=[list.length(playlist.parse(DanElectronicRealMusic)), count], [playlist(DanElectronicRealMusic), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(DanElectronicRealMusic)), count], [playlist(conservative=true,DanElectronicRealMusic), randomsong]) count = count + list.length(playlist.parse(DanElectronicRealMusic)) -randomsong = random(weights=[list.length(playlist.parse(TaylorSwift)), count], [playlist(TaylorSwift), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(TaylorSwift)), count], [playlist(conservative=true, TaylorSwift), randomsong]) count = count + list.length(playlist.parse(TaylorSwift)) -randomsong = random(weights=[list.length(playlist.parse(AstridS)), count], [playlist(AstridS), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(AstridS)), count], [playlist(conservative=true, AstridS), randomsong]) count = count + list.length(playlist.parse(AstridS)) -randomsong = random(weights=[list.length(playlist.parse(Coldplay)), count], [playlist(Coldplay), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(Coldplay)), count], [playlist(conservative=true, Coldplay), randomsong]) count = count + list.length(playlist.parse(Coldplay)) -randomsong = random(weights=[list.length(playlist.parse(DemiLovato)), count], [playlist(DemiLovato), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(DemiLovato)), count], [playlist(conservative=true, DemiLovato), randomsong]) count = count + list.length(playlist.parse(DemiLovato)) -randomsong = random(weights=[list.length(playlist.parse(KatyPerry)), count], [playlist(KatyPerry), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(KatyPerry)), count], [playlist(conservative=true, KatyPerry), randomsong]) count = count + list.length(playlist.parse(KatyPerry)) -randomsong = random(weights=[list.length(playlist.parse(SelenaGomez)), count], [playlist(SelenaGomez), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(SelenaGomez)), count], [playlist(conservative=true, SelenaGomez), randomsong]) count = count + list.length(playlist.parse(SelenaGomez)) -randomsong = random(weights=[list.length(playlist.parse(ShawnMendes)), count], [playlist(ShawnMendes), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(ShawnMendes)), count], [playlist(conservative=true, ShawnMendes), randomsong]) count = count + list.length(playlist.parse(ShawnMendes)) -randomsong = random(weights=[list.length(playlist.parse(ZaraLarsson)), count], [playlist(ZaraLarsson), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(ZaraLarsson)), count], [playlist(conservative=true, ZaraLarsson), randomsong]) count = count + list.length(playlist.parse(ZaraLarsson)) -randomsong = random(weights=[list.length(playlist.parse(Musicals)), count], [playlist(Musicals), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(Musicals)), count], [playlist(conservative=true, Musicals), randomsong]) count = count + list.length(playlist.parse(Musicals)) -randomsong = random(weights=[list.length(playlist.parse(Soundtracks)), count], [playlist(Soundtracks), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(Soundtracks)), count], [playlist(conservative=true, Soundtracks), randomsong]) count = count + list.length(playlist.parse(Soundtracks)) -randomsong = random(weights=[list.length(playlist.parse(JoakimRemixes)), count], [playlist(JoakimRemixes), randomsong]) +randomsong = random(weights=[list.length(playlist.parse(JoakimRemixes)), count], [playlist(conservative=true, JoakimRemixes), randomsong]) count = count + list.length(playlist.parse(JoakimRemixes)) -randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(Halloween), randomsong]) -count = count + list.length(playlist.parse(Halloween)) +#randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(conservative=true, Halloween), randomsong]) +#count = count + list.length(playlist.parse(Halloween)) randomsong = audio_to_stereo(randomsong) @@ -179,8 +179,8 @@ requests = audio_to_stereo(drop_video(request.queue(id="request"))) mix = blank() mix = fallback(track_sensitive=false, [randomsong, mix]) mix = fallback(track_sensitive=true, transitions=[crossfade], [requests,mix]) -mix = normalize(mix) mix = fallback(track_sensitive=false, transitions=[crossfade], [live, mix]) +mix = normalize(mix) # OUTPUTS output.icecast(