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

CC-1665: Scheduled stream rebroadcasting and recording

Browse source 
-reduce liquidsoap CPU percentage from 20 -> 17%.
This commit is contained in:
Martin Konecny 2012-08-17 16:32:26 -04:00
parent d8c48a53fe
commit 84b616cd28
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/pypo/airtime-liquidsoap
View file

@ -6,7 +6,7 @@ virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
ls_user="pypo" ls_user="pypo"
export HOME="/var/tmp/airtime/pypo/" export HOME="/var/tmp/airtime/pypo/"
api_client_path="/usr/lib/airtime/" api_client_path="/usr/lib/airtime/"
ls_path="/usr/bin/airtime-liquidsoap --verbose" ls_path="/usr/bin/airtime-liquidsoap --verbose -f"
ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq" ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
exec 2>&1 exec 2>&1

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

@ -39,7 +39,7 @@ just_switched = ref false
%include "ls_lib.liq" %include "ls_lib.liq"
web_stream = mksafe(input.harbor("test-harbor", port=8999, password="hackme")) web_stream = input.harbor("test-harbor", port=8999, password="hackme")
web_stream = on_metadata(notify_stream, web_stream) web_stream = on_metadata(notify_stream, web_stream)
queue = on_metadata(notify, queue) queue = on_metadata(notify, queue)
@ -48,8 +48,8 @@ queue = map_metadata(update=false, append_title, queue)
queue = crossfade(queue) queue = crossfade(queue)
#make sure we are clearing all buffered data even when the source isn't being actively used #make sure we are clearing all buffered data even when the source isn't being actively used
output.dummy(queue, fallible=true) #output.dummy(queue, fallible=true)
output.dummy(web_stream, fallible=true) #output.dummy(web_stream, fallible=true)
stream_queue = switch(id="stream_queue_switch", track_sensitive=false, transitions=[transition, transition], [({!webstream_enabled},web_stream), ({true}, queue)]) stream_queue = switch(id="stream_queue_switch", track_sensitive=false, transitions=[transition, transition], [({!webstream_enabled},web_stream), ({true}, queue)])
@ -328,4 +328,4 @@ if s3_enable == true then
output_to(s3_output, s3_type, s3_bitrate, s3_host, s3_port, s3_pass, s3_mount, s3_url, s3_description, s3_genre, s3_user, s, "3", s3_connected, s3_description) output_to(s3_output, s3_type, s3_bitrate, s3_host, s3_port, s3_pass, s3_mount, s3_url, s3_description, s3_genre, s3_user, s, "3", s3_connected, s3_description)
end end
ignore(output.dummy(blank())) #ignore(output.dummy(blank()))