Merge branch 'CC-4417-opus-support'

Conflicts:
	python_apps/pypo/airtime-liquidsoap
This commit is contained in:
Martin Konecny 2013-04-25 18:23:37 -04:00
commit 5b2e8e221f
7 changed files with 350 additions and 198 deletions

View file

@ -8,12 +8,10 @@ api_client_path="/usr/lib/airtime/"
ls_path="/usr/bin/airtime-liquidsoap --verbose -f -d"
ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
exec 2>&1
export PYTHONPATH=${api_client_path}
cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts
python generate_liquidsoap_cfg.py
exec ${ls_path} ${ls_param}
exec ${ls_path} ${ls_param} 2>&1
# EOF