Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
d8c6b722ac
8 changed files with 2322 additions and 2865 deletions
|
@ -1,6 +1,6 @@
|
|||
def notify(m)
|
||||
log("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
|
||||
system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
|
||||
print("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
|
||||
end
|
||||
|
||||
# A function applied to each metadata chunk
|
||||
|
@ -55,7 +55,6 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
|
|||
end
|
||||
output = output.icecast(host = host,
|
||||
port = port,
|
||||
encoding = "UTF-8",
|
||||
password = pass,
|
||||
mount = mount_point,
|
||||
fallible = true,
|
||||
|
|
|
@ -10,4 +10,4 @@ SCRIPT=`readlink -f $0`
|
|||
# Absolute path this script is in
|
||||
SCRIPTPATH=`dirname $SCRIPT`
|
||||
|
||||
cd ${SCRIPTPATH}/../ && ./pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &
|
||||
cd ${SCRIPTPATH}/../ && python pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue