DODSORFAS
/
Radio-dodsorfas
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Develop #4

Merged
Dandellion merged 1 commits from develop into master 2018-10-15 19:01:12 +02:00
Conversation 2 Commits 1 Files Changed 1 +21 -21
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
state/liquidsoap/config/main.liq
View File

@ -113,62 +113,62 @@ Halloween = "/playlists/events/Halloween.m3u"
## END PLAYLISTS ## END PLAYLISTS
randomsong = playlist(JoakimDiverse) randomsong = random(playlist(conservative=true, JoakimDiverse))
count = list.length(playlist.parse(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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) 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)) count = count + list.length(playlist.parse(JoakimRemixes))
randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(Halloween), randomsong]) #randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(conservative=true, Halloween), randomsong])
count = count + list.length(playlist.parse(Halloween)) #count = count + list.length(playlist.parse(Halloween))
randomsong = audio_to_stereo(randomsong) randomsong = audio_to_stereo(randomsong)
@ -179,8 +179,8 @@ requests = audio_to_stereo(drop_video(request.queue(id="request")))
mix = blank() mix = blank()
mix = fallback(track_sensitive=false, [randomsong, mix]) mix = fallback(track_sensitive=false, [randomsong, mix])
mix = fallback(track_sensitive=true, transitions=[crossfade], [requests,mix]) mix = fallback(track_sensitive=true, transitions=[crossfade], [requests,mix])
mix = normalize(mix)
mix = fallback(track_sensitive=false, transitions=[crossfade], [live, mix]) mix = fallback(track_sensitive=false, transitions=[crossfade], [live, mix])
mix = normalize(mix)
# OUTPUTS # OUTPUTS
output.icecast( output.icecast(