Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
This commit is contained in:
james 2011-08-26 12:56:10 -04:00
commit 56ad8c6b3d
17 changed files with 545 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View file

@ -6,9 +6,8 @@ set("log.stdout", true)
set("server.telnet", true)
set("server.telnet.port", 1234)
queue = request.queue(id="queue", length=0.5)
queue = audio_to_stereo(request.queue(id="queue", length=0.5))
queue = cue_cut(queue)
queue = audio_to_stereo(queue)
pypo_data = ref '0'
web_stream_enabled = ref false
@ -51,7 +50,6 @@ s = crossfade(s)
add_skip_command(s)
s = map_metadata(append_title, s)
if output_sound_device then
ignore(output.alsa(s))
end